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

Clang: Add clang query pane

Browse Source 
We now support highlighting for an example text and for the query.

Change-Id: I88c415ff871cf3e4c2d4fc83d60a8555bf0ce08a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-03 12:35:58 +02:00
committed by Tim Jenssen
parent 8c4127ebac
commit a31eae4d0a
75 changed files with 2950 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/tools/clangrefactoringbackend/source/clangquerygatherer.cpp
View File

@@ -41,8 +41,8 @@ ClangQueryGatherer::ClangQueryGatherer(StringCache<Utils::PathString, std::mutex
{
}
SourceRangesAndDiagnosticsForQueryMessage
ClangQueryGatherer::createSourceRangesAndDiagnosticsForSource(
SourceRangesForQueryMessage
ClangQueryGatherer::createSourceRangesForSource(
StringCache<Utils::PathString, std::mutex> *filePathCache,
V2::FileContainer &&source,
const std::vector<V2::FileContainer> &unsaved,
@@ -59,29 +59,29 @@ ClangQueryGatherer::createSourceRangesAndDiagnosticsForSource(
clangQuery.findLocations();
return {clangQuery.takeSourceRanges(), clangQuery.takeDiagnosticContainers()};
return {clangQuery.takeSourceRanges()};
}
bool ClangQueryGatherer::canCreateSourceRangesAndDiagnostics() const
bool ClangQueryGatherer::canCreateSourceRanges() const
{
return !m_sources.empty();
}
SourceRangesAndDiagnosticsForQueryMessage ClangQueryGatherer::createNextSourceRangesAndDiagnostics()
SourceRangesForQueryMessage ClangQueryGatherer::createNextSourceRanges()
{
auto message = createSourceRangesAndDiagnosticsForSource(m_filePathCache,
std::move(m_sources.back()),
m_unsaved,
m_query.clone());
auto message = createSourceRangesForSource(m_filePathCache,
std::move(m_sources.back()),
m_unsaved,
m_query.clone());
m_sources.pop_back();
return message;
}
ClangQueryGatherer::Future ClangQueryGatherer::startCreateNextSourceRangesAndDiagnosticsMessage()
ClangQueryGatherer::Future ClangQueryGatherer::startCreateNextSourceRangesMessage()
{
Future future = std::async(std::launch::async,
createSourceRangesAndDiagnosticsForSource,
createSourceRangesForSource,
m_filePathCache,
std::move(m_sources.back()),
m_unsaved,
@@ -92,12 +92,12 @@ ClangQueryGatherer::Future ClangQueryGatherer::startCreateNextSourceRangesAndDia
return future;
}
void ClangQueryGatherer::startCreateNextSourceRangesAndDiagnosticsMessages()
void ClangQueryGatherer::startCreateNextSourceRangesMessages()
{
std::vector<ClangQueryGatherer::Future> futures;
while (!m_sources.empty() && m_sourceFutures.size() < m_processingSlotCount)
m_sourceFutures.push_back(startCreateNextSourceRangesAndDiagnosticsMessage());
m_sourceFutures.push_back(startCreateNextSourceRangesMessage());
}
void ClangQueryGatherer::waitForFinished()
@@ -121,9 +121,9 @@ const std::vector<ClangQueryGatherer::Future> &ClangQueryGatherer::sourceFutures
return m_sourceFutures;
}
std::vector<SourceRangesAndDiagnosticsForQueryMessage> ClangQueryGatherer::allCurrentProcessedMessages()
std::vector<SourceRangesForQueryMessage> ClangQueryGatherer::allCurrentProcessedMessages()
{
std::vector<SourceRangesAndDiagnosticsForQueryMessage> messages;
std::vector<SourceRangesForQueryMessage> messages;
for (Future &future : m_sourceFutures)
messages.push_back(m_sourceRangeFilter.removeDuplicates(future.get()));
@@ -131,9 +131,9 @@ std::vector<SourceRangesAndDiagnosticsForQueryMessage> ClangQueryGatherer::allCu
return messages;
}
std::vector<SourceRangesAndDiagnosticsForQueryMessage> ClangQueryGatherer::finishedMessages()
std::vector<SourceRangesForQueryMessage> ClangQueryGatherer::finishedMessages()
{
std::vector<SourceRangesAndDiagnosticsForQueryMessage> messages;
std::vector<SourceRangesForQueryMessage> messages;
for (auto &&future : finishedFutures())
messages.push_back(m_sourceRangeFilter.removeDuplicates(future.get()));