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

ClangRefactoring: Integrate generated files

Browse Source 
This is an intermediate step to handle the indexing of the project parts
completely. The generated files are now independently handled from the
project parts. We still not handle the case the a file is indexed but the
generated file is not provided. This will be done in a different patch.
All provided data is now sorted too to improve merging.

Change-Id: I09712b99217a881ec0a233d09aea8659fb787324
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-08-07 19:01:01 +02:00
parent f6b228842c
commit 4195fce68f
13 changed files with 212 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/clangrefactoringbackend/source/refactoringserver.cpp
View File

@@ -97,12 +97,13 @@ void RefactoringServer::requestSourceRangesForQueryMessage(RequestSourceRangesFo
void RefactoringServer::updateProjectParts(UpdateProjectPartsMessage &&message)
{
m_symbolIndexing.updateProjectParts(message.takeProjectsParts(), m_generatedFiles);
m_symbolIndexing.updateProjectParts(message.takeProjectsParts(),
m_generatedFiles.fileContainers());
}
void RefactoringServer::updateGeneratedFiles(UpdateGeneratedFilesMessage &&message)
{
m_generatedFiles = message.takeGeneratedFiles();
m_generatedFiles.update(message.takeGeneratedFiles());
}
void RefactoringServer::removeProjectParts(RemoveProjectPartsMessage &&)
@@ -112,7 +113,7 @@ void RefactoringServer::removeProjectParts(RemoveProjectPartsMessage &&)
void RefactoringServer::removeGeneratedFiles(RemoveGeneratedFilesMessage &&message)
{
// TODO
m_generatedFiles.remove(message.generatedFiles);
}
void RefactoringServer::cancel()

3
src/tools/clangrefactoringbackend/source/refactoringserver.h
View File

@@ -31,6 +31,7 @@
#include <ipcclientprovider.h>
#include <filepathcachinginterface.h>
#include <generatedfiles.h>
#include <utils/smallstring.h>
@@ -84,7 +85,7 @@ private:
private:
ClangQueryGatherer m_gatherer;
V2::FileContainers m_generatedFiles;
GeneratedFiles m_generatedFiles;
QTimer m_pollTimer;
SymbolIndexingInterface &m_symbolIndexing;
FilePathCachingInterface &m_filePathCache;