feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Clean up some IPC names

Browse Source 
This is long overdue since some names were simply wrong and/or
misleading. Also, some of the old names were long enough to almost get
crazy.

The renaming starts from ClangCodeModelServerInterface and
ClangCodeModelClientInterface and affects usages and related functions.

For the ClangCodeModelServerInterface, categorize the messages in
 - messages that require a response (request*)
 - notification messages (the remaining ones)

Change-Id: I5342ed8e0d87404ee72f3c3766fd8ef7505defb1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-31 15:21:53 +02:00
parent 4e4bd4909a
commit f01fbcb789
96 changed files with 1229 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
tests/unit/unittest/clangjobqueue-test.cpp
View File

@@ -90,7 +90,7 @@ protected:
TEST_F(JobQueue, AddJob)
{
const JobRequest jobRequest = createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations);
JobRequest::Type::UpdateAnnotations);
jobQueue.add(jobRequest);
@@ -100,7 +100,7 @@ TEST_F(JobQueue, AddJob)
TEST_F(JobQueue, DoNotAddDuplicate)
{
const JobRequest request = createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations);
JobRequest::Type::UpdateAnnotations);
jobQueue.add(request);
const bool added = jobQueue.add(request);
@@ -115,7 +115,7 @@ TEST_F(JobQueue, DoNotAddDuplicateForWhichAJobIsAlreadyRunning)
});
const bool added = jobQueue.add(createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations));
JobRequest::Type::UpdateAnnotations));
ASSERT_FALSE(added);
}
@@ -127,7 +127,7 @@ TEST_F(JobQueue, DoNotAddForNotExistingDocument)
});
const bool added = jobQueue.add(createJobRequest(Utf8StringLiteral("notExistingDocument.cpp"),
JobRequest::Type::UpdateDocumentAnnotations));
JobRequest::Type::UpdateAnnotations));
ASSERT_FALSE(added);
}
@@ -136,7 +136,7 @@ TEST_F(JobQueue, DoNotAddForNotIntactDocument)
{
document.setHasParseOrReparseFailed(true);
const bool added = jobQueue.add(createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations));
JobRequest::Type::UpdateAnnotations));
ASSERT_FALSE(added);
}
@@ -150,7 +150,7 @@ TEST_F(JobQueue, CancelDuringAddForNotIntactDocument)
});
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
ASSERT_TRUE(canceled);
}
@@ -164,7 +164,7 @@ TEST_F(JobQueue, ProcessEmpty)
TEST_F(JobQueue, ProcessSingleJob)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -174,7 +174,7 @@ TEST_F(JobQueue, ProcessSingleJob)
TEST_F(JobQueue, ProcessUntilEmpty)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::ParseSupportiveTranslationUnit));
JobRequests jobsToRun;
@@ -191,7 +191,7 @@ TEST_F(JobQueue, ProcessUntilEmpty)
TEST_F(JobQueue, RemoveRequestsForClosedDocuments)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
removeDocument();
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -202,7 +202,7 @@ TEST_F(JobQueue, RemoveRequestsForClosedDocuments)
TEST_F(JobQueue, RemoveRequestsForClosedProject)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
removeProject();
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -213,7 +213,7 @@ TEST_F(JobQueue, RemoveRequestsForClosedProject)
TEST_F(JobQueue, RemoveRequestsForOudatedUnsavedFiles)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
updateUnsavedFiles();
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -224,7 +224,7 @@ TEST_F(JobQueue, RemoveRequestsForOudatedUnsavedFiles)
TEST_F(JobQueue, RemoveRequestsForChangedDocumentRevision)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
updateDocumentRevision();
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -235,7 +235,7 @@ TEST_F(JobQueue, RemoveRequestsForChangedDocumentRevision)
TEST_F(JobQueue, RemoveRequestsForOudatedProject)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
updateProject();
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -247,7 +247,7 @@ TEST_F(JobQueue, RemoveRequestsForOudatedProject)
TEST_F(JobQueue, RemoveRequestsForNotIntactDocuments)
{
const Utf8String filePath = createTranslationUnitForDeletedFile();
jobQueue.add(createJobRequest(filePath, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath, JobRequest::Type::UpdateAnnotations));
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -257,7 +257,7 @@ TEST_F(JobQueue, RemoveRequestsForNotIntactDocuments)
TEST_F(JobQueue, CancelRequestsForNotIntactDocuments)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
document.setHasParseOrReparseFailed(true);
bool canceled = false;
jobQueue.setCancelJobRequest([&canceled](const JobRequest &) {
@@ -272,8 +272,8 @@ TEST_F(JobQueue, CancelRequestsForNotIntactDocuments)
TEST_F(JobQueue, PrioritizeCurrentDocumentOverNotCurrent)
{
resetVisibilityAndCurrentEditor();
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateAnnotations));
documents.setUsedByCurrentEditor(filePath2);
jobQueue.prioritizeRequests();
@@ -284,8 +284,8 @@ TEST_F(JobQueue, PrioritizeCurrentDocumentOverNotCurrent)
TEST_F(JobQueue, PrioritizeVisibleDocumentsOverNotVisible)
{
resetVisibilityAndCurrentEditor();
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateAnnotations));
documents.setVisibleInEditors({filePath2});
jobQueue.prioritizeRequests();
@@ -296,8 +296,8 @@ TEST_F(JobQueue, PrioritizeVisibleDocumentsOverNotVisible)
TEST_F(JobQueue, PrioritizeCurrentDocumentOverVisible)
{
resetVisibilityAndCurrentEditor();
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
jobQueue.add(createJobRequest(filePath2, JobRequest::Type::UpdateAnnotations));
documents.setVisibleInEditors({filePath1, filePath2});
documents.setUsedByCurrentEditor(filePath2);
@@ -308,7 +308,7 @@ TEST_F(JobQueue, PrioritizeCurrentDocumentOverVisible)
TEST_F(JobQueue, RunNothingForNotCurrentOrVisibleDocument)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
documents.setVisibleInEditors({});
documents.setUsedByCurrentEditor(Utf8StringLiteral("aNonExistingFilePath"));
@@ -319,8 +319,8 @@ TEST_F(JobQueue, RunNothingForNotCurrentOrVisibleDocument)
TEST_F(JobQueue, RunOnlyOneJobPerTranslationUnitIfMultipleAreInQueue)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestAnnotations));
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -335,10 +335,10 @@ TEST_F(JobQueue, RunJobsForDistinctTranslationUnits)
const TranslationUnit alternativeTu = document.translationUnits().createAndAppend();
document.translationUnits().updateParseTimePoint(alternativeTu.id(), Clock::now());
jobQueue.add(createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations,
JobRequest::Type::UpdateAnnotations,
PreferredTranslationUnit::RecentlyParsed));
jobQueue.add(createJobRequest(filePath1,
JobRequest::Type::UpdateDocumentAnnotations,
JobRequest::Type::UpdateAnnotations,
PreferredTranslationUnit::PreviouslyParsed));
const JobRequests jobsToRun = jobQueue.processQueue();
@@ -348,7 +348,7 @@ TEST_F(JobQueue, RunJobsForDistinctTranslationUnits)
}
TEST_F(JobQueue, DoNotRunJobForTranslationUnittThatIsBeingProcessed)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
JobRequests jobsToRun = jobQueue.processQueue();
jobQueue.setIsJobRunningForTranslationUnitHandler([](const Utf8String &) {
return true;
@@ -359,9 +359,9 @@ TEST_F(JobQueue, DoNotRunJobForTranslationUnittThatIsBeingProcessed)
ASSERT_THAT(jobsToRun.size(), Eq(0));
}
TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByUnsavedFileChange)
TEST_F(JobQueue, RequestUpdateAnnotationsOutdatableByUnsavedFileChange)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
updateUnsavedFiles();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -369,9 +369,9 @@ TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByUnsavedFileChange)
ASSERT_THAT(jobsToStart.size(), Eq(0));
}
TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByProjectRemoval)
TEST_F(JobQueue, RequestUpdateAnnotationsOutdatableByProjectRemoval)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
removeProject();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -379,9 +379,9 @@ TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByProjectRemoval)
ASSERT_THAT(jobsToStart.size(), Eq(0));
}
TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByProjectChange)
TEST_F(JobQueue, RequestUpdateAnnotationsOutdatableByProjectChange)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
updateProject();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -389,9 +389,9 @@ TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByProjectChange)
ASSERT_THAT(jobsToStart.size(), Eq(0));
}
TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByDocumentClose)
TEST_F(JobQueue, RequestUpdateAnnotationsOutdatableByDocumentClose)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
removeDocument();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -399,9 +399,9 @@ TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByDocumentClose)
ASSERT_THAT(jobsToStart.size(), Eq(0));
}
TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByNotIntactDocument)
TEST_F(JobQueue, RequestUpdateAnnotationsOutdatableByNotIntactDocument)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::UpdateAnnotations));
document.setHasParseOrReparseFailed(true);
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -411,7 +411,7 @@ TEST_F(JobQueue, RequestUpdateDocumentAnnotationsOutdatableByNotIntactDocument)
TEST_F(JobQueue, RequestCompleteCodeOutdatableByDocumentClose)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::CompleteCode));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestCompletions));
removeDocument();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -422,7 +422,7 @@ TEST_F(JobQueue, RequestCompleteCodeOutdatableByDocumentClose)
TEST_F(JobQueue, RequestCompleteCodeNotOutdatableByUnsavedFilesChange)
{
pretendParsedTranslationUnit();
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::CompleteCode));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestCompletions));
updateUnsavedFiles();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -433,7 +433,7 @@ TEST_F(JobQueue, RequestCompleteCodeNotOutdatableByUnsavedFilesChange)
TEST_F(JobQueue, RequestCompleteCodeNotOutdatableByDocumentRevisionChange)
{
pretendParsedTranslationUnit();
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::CompleteCode));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestCompletions));
updateDocumentRevision();
const JobRequests jobsToStart = jobQueue.processQueue();
@@ -443,7 +443,7 @@ TEST_F(JobQueue, RequestCompleteCodeNotOutdatableByDocumentRevisionChange)
TEST_F(JobQueue, RequestCompleteCodeOutdatableByDocumentRevisionChange)
{
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestDocumentAnnotations));
jobQueue.add(createJobRequest(filePath1, JobRequest::Type::RequestAnnotations));
updateDocumentRevision();
const JobRequests jobsToStart = jobQueue.processQueue();