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

ClangRefactoring: Move generated files to own messages

Browse Source 
There must be a management about it but this will be added in a different
change set.

Change-Id: I47b6ce7f671f1c8ae07083d6d99c534069e3cc1a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-08-06 19:14:00 +02:00
parent 613db15cea
commit 0bef7610a1
35 changed files with 470 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,12 +97,22 @@ void RefactoringServer::requestSourceRangesForQueryMessage(RequestSourceRangesFo
void RefactoringServer::updateProjectParts(UpdateProjectPartsMessage &&message)
{
m_symbolIndexing.updateProjectParts(message.takeProjectsParts(), message.takeGeneratedFiles());
m_symbolIndexing.updateProjectParts(message.takeProjectsParts(), m_generatedFiles);
}
void RefactoringServer::updateGeneratedFiles(UpdateGeneratedFilesMessage &&message)
{
m_generatedFiles = message.takeGeneratedFiles();
}
void RefactoringServer::removeProjectParts(RemoveProjectPartsMessage &&)
{
// TODO
}
void RefactoringServer::removeGeneratedFiles(RemoveGeneratedFilesMessage &&message)
{
// TODO
}
void RefactoringServer::cancel()

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

@@ -62,7 +62,10 @@ public:
void requestSourceRangesAndDiagnosticsForQueryMessage(RequestSourceRangesAndDiagnosticsForQueryMessage &&message) override;
void requestSourceRangesForQueryMessage(RequestSourceRangesForQueryMessage &&message) override;
void updateProjectParts(UpdateProjectPartsMessage &&message) override;
void updateGeneratedFiles(UpdateGeneratedFilesMessage &&message) override;
void removeProjectParts(RemoveProjectPartsMessage &&message) override;
void removeGeneratedFiles(RemoveGeneratedFilesMessage &&message) override;
void cancel() override;
bool isCancelingJobs() const;
@@ -81,6 +84,7 @@ private:
private:
ClangQueryGatherer m_gatherer;
V2::FileContainers m_generatedFiles;
QTimer m_pollTimer;
SymbolIndexingInterface &m_symbolIndexing;
FilePathCachingInterface &m_filePathCache;

2
src/tools/clangrefactoringbackend/source/symbolindexer.cpp
View File

@@ -43,7 +43,7 @@ SymbolIndexer::SymbolIndexer(SymbolsCollectorInterface &symbolsCollector,
pathWatcher.setNotifier(this);
}
void SymbolIndexer::updateProjectParts(V2::ProjectPartContainers &&projectParts, V2::FileContainers &&generatedFiles)
void SymbolIndexer::updateProjectParts(V2::ProjectPartContainers &&projectParts, const V2::FileContainers &generatedFiles)
{
for (V2::ProjectPartContainer &projectPart : projectParts)
updateProjectPart(std::move(projectPart), generatedFiles);

2
src/tools/clangrefactoringbackend/source/symbolindexer.h
View File

@@ -46,7 +46,7 @@ public:
Sqlite::TransactionInterface &transactionInterface);
void updateProjectParts(V2::ProjectPartContainers &&projectParts,
V2::FileContainers &&generatedFiles);
const V2::FileContainers &generatedFiles);
void updateProjectPart(V2::ProjectPartContainer &&projectPart,
const V2::FileContainers &generatedFiles);

5
src/tools/clangrefactoringbackend/source/symbolindexing.cpp
View File

@@ -27,9 +27,10 @@
namespace ClangBackEnd {
void SymbolIndexing::updateProjectParts(V2::ProjectPartContainers &&projectParts, V2::FileContainers &&generatedFiles)
void SymbolIndexing::updateProjectParts(V2::ProjectPartContainers &&projectParts,
const V2::FileContainers &generatedFiles)
{
m_indexer.updateProjectParts(std::move(projectParts), std::move(generatedFiles));
m_indexer.updateProjectParts(std::move(projectParts), generatedFiles);
}
} // namespace ClangBackEnd

2
src/tools/clangrefactoringbackend/source/symbolindexing.h
View File

@@ -62,7 +62,7 @@ public:
}
void updateProjectParts(V2::ProjectPartContainers &&projectParts,
V2::FileContainers &&generatedFiles);
const V2::FileContainers &generatedFiles) override;
private:
FilePathCachingInterface &m_filePathCache;

2
src/tools/clangrefactoringbackend/source/symbolindexinginterface.h
View File

@@ -38,7 +38,7 @@ public:
SymbolIndexingInterface &operator=(const SymbolIndexingInterface&) = delete;
virtual void updateProjectParts(V2::ProjectPartContainers &&projectParts,
V2::FileContainers &&generatedFiles) = 0;
const V2::FileContainers &generatedFiles) = 0;
protected:
~SymbolIndexingInterface() = default;