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()));

18
src/tools/clangrefactoringbackend/source/clangquerygatherer.h
View File

@@ -27,7 +27,7 @@
#include "sourcerangefilter.h"
#include <sourcerangesanddiagnosticsforquerymessage.h>
#include <sourcerangesforquerymessage.h>
#include <filecontainerv2.h>
#include <stringcache.h>
@@ -38,7 +38,7 @@ namespace ClangBackEnd {
class ClangQueryGatherer
{
public:
using Future = std::future<SourceRangesAndDiagnosticsForQueryMessage>;
using Future = std::future<SourceRangesForQueryMessage>;
ClangQueryGatherer() = default;
ClangQueryGatherer(StringCache<Utils::PathString, std::mutex> *filePathCache,
@@ -46,22 +46,22 @@ public:
std::vector<V2::FileContainer> &&unsaved,
Utils::SmallString &&query);
static SourceRangesAndDiagnosticsForQueryMessage createSourceRangesAndDiagnosticsForSource(
static SourceRangesForQueryMessage createSourceRangesForSource(
StringCache<Utils::PathString, std::mutex> *filePathCache,
V2::FileContainer &&source,
const std::vector<V2::FileContainer> &unsaved,
Utils::SmallString &&query);
bool canCreateSourceRangesAndDiagnostics() const;
SourceRangesAndDiagnosticsForQueryMessage createNextSourceRangesAndDiagnostics();
Future startCreateNextSourceRangesAndDiagnosticsMessage();
void startCreateNextSourceRangesAndDiagnosticsMessages();
bool canCreateSourceRanges() const;
SourceRangesForQueryMessage createNextSourceRanges();
Future startCreateNextSourceRangesMessage();
void startCreateNextSourceRangesMessages();
void waitForFinished();
bool isFinished() const;
const std::vector<V2::FileContainer> &sources() const;
const std::vector<Future> &sourceFutures() const;
std::vector<SourceRangesAndDiagnosticsForQueryMessage> allCurrentProcessedMessages();
std::vector<SourceRangesAndDiagnosticsForQueryMessage> finishedMessages();
std::vector<SourceRangesForQueryMessage> allCurrentProcessedMessages();
std::vector<SourceRangesForQueryMessage> finishedMessages();
void setProcessingSlotCount(uint count);

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

@@ -29,10 +29,7 @@
#include "clangquery.h"
#include <refactoringclientinterface.h>
#include <requestsourcelocationforrenamingmessage.h>
#include <requestsourcerangesanddiagnosticsforquerymessage.h>
#include <sourcelocationsforrenamingmessage.h>
#include <sourcerangesanddiagnosticsforquerymessage.h>
#include <clangrefactoringmessages.h>
#include <QCoreApplication>
@@ -47,7 +44,7 @@ RefactoringServer::RefactoringServer()
QObject::connect(&m_pollTimer,
&QTimer::timeout,
std::bind(&RefactoringServer::pollSourceRangesAndDiagnosticsForQueryMessages, this));
std::bind(&RefactoringServer::pollSourceRangesForQueryMessages, this));
}
void RefactoringServer::end()
@@ -74,7 +71,22 @@ void RefactoringServer::requestSourceLocationsForRenamingMessage(RequestSourceLo
void RefactoringServer::requestSourceRangesAndDiagnosticsForQueryMessage(
RequestSourceRangesAndDiagnosticsForQueryMessage &&message)
{
gatherSourceRangesAndDiagnosticsForQueryMessages(message.takeSources(),
ClangQuery clangQuery(m_filePathCache, message.takeQuery());
clangQuery.addFile(message.source().filePath().directory(),
message.source().filePath().name(),
message.source().unsavedFileContent(),
message.source().commandLineArguments());
clangQuery.findLocations();
client()->sourceRangesAndDiagnosticsForQueryMessage({clangQuery.takeSourceRanges(),
clangQuery.takeDiagnosticContainers()});
}
void RefactoringServer::requestSourceRangesForQueryMessage(RequestSourceRangesForQueryMessage &&message)
{
gatherSourceRangesForQueryMessages(message.takeSources(),
message.takeUnsavedContent(),
message.takeQuery());
}
@@ -91,22 +103,22 @@ bool RefactoringServer::isCancelingJobs() const
return m_gatherer.isFinished();
}
void RefactoringServer::pollSourceRangesAndDiagnosticsForQueryMessages()
void RefactoringServer::pollSourceRangesForQueryMessages()
{
for (auto &&message : m_gatherer.finishedMessages())
client()->sourceRangesAndDiagnosticsForQueryMessage(std::move(message));
client()->sourceRangesForQueryMessage(std::move(message));
if (!m_gatherer.isFinished())
m_gatherer.startCreateNextSourceRangesAndDiagnosticsMessages();
m_gatherer.startCreateNextSourceRangesMessages();
else
m_pollTimer.stop();
}
void RefactoringServer::waitThatSourceRangesAndDiagnosticsForQueryMessagesAreFinished()
void RefactoringServer::waitThatSourceRangesForQueryMessagesAreFinished()
{
while (!m_gatherer.isFinished()) {
m_gatherer.waitForFinished();
pollSourceRangesAndDiagnosticsForQueryMessages();
pollSourceRangesForQueryMessages();
}
}
@@ -120,7 +132,7 @@ void RefactoringServer::setGathererProcessingSlotCount(uint count)
m_gatherer.setProcessingSlotCount(count);
}
void RefactoringServer::gatherSourceRangesAndDiagnosticsForQueryMessages(
void RefactoringServer::gatherSourceRangesForQueryMessages(
std::vector<V2::FileContainer> &&sources,
std::vector<V2::FileContainer> &&unsaved,
Utils::SmallString &&query)

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

@@ -40,7 +40,7 @@
namespace ClangBackEnd {
class SourceRangesAndDiagnosticsForQueryMessage;
class SourceRangesForQueryMessage;
namespace V2 {
class FileContainer;
@@ -48,26 +48,27 @@ class FileContainer;
class RefactoringServer : public RefactoringServerInterface
{
using Future = std::future<SourceRangesAndDiagnosticsForQueryMessage>;
using Future = std::future<SourceRangesForQueryMessage>;
public:
RefactoringServer();
void end() override;
void requestSourceLocationsForRenamingMessage(RequestSourceLocationsForRenamingMessage &&message) override;
void requestSourceRangesAndDiagnosticsForQueryMessage(RequestSourceRangesAndDiagnosticsForQueryMessage &&message) override;
void requestSourceRangesForQueryMessage(RequestSourceRangesForQueryMessage &&message) override;
void cancel() override;
bool isCancelingJobs() const;
void pollSourceRangesAndDiagnosticsForQueryMessages();
void waitThatSourceRangesAndDiagnosticsForQueryMessagesAreFinished();
void pollSourceRangesForQueryMessages();
void waitThatSourceRangesForQueryMessagesAreFinished();
bool pollTimerIsActive() const;
void setGathererProcessingSlotCount(uint count);
private:
void gatherSourceRangesAndDiagnosticsForQueryMessages(std::vector<V2::FileContainer> &&sources,
void gatherSourceRangesForQueryMessages(std::vector<V2::FileContainer> &&sources,
std::vector<V2::FileContainer> &&unsaved,
Utils::SmallString &&query);

41
src/tools/clangrefactoringbackend/source/sourcerangefilter.cpp
View File

@@ -31,29 +31,44 @@ namespace ClangBackEnd {
SourceRangeFilter::SourceRangeFilter(std::size_t sourcesCount)
{
m_collectedSourceRanges.reserve(sourcesCount);
m_collectedSourceRanges.reserve(sourcesCount * 100);
}
SourceRangesAndDiagnosticsForQueryMessage SourceRangeFilter::removeDuplicates(SourceRangesAndDiagnosticsForQueryMessage &&message)
SourceRangesForQueryMessage SourceRangeFilter::removeDuplicates(SourceRangesForQueryMessage &&message)
{
removeDuplicates(message.sourceRanges().sourceRangeWithTextContainers());
auto sourceRanges = removeDuplicates(message.sourceRanges().takeSourceRangeWithTextContainers());
message.sourceRanges().setSourceRangeWithTextContainers(std::move(sourceRanges));
return std::move(message);
}
void SourceRangeFilter::removeDuplicates(SourceRangeWithTextContainers &sourceRanges)
SourceRangeWithTextContainers SourceRangeFilter::removeDuplicates(SourceRangeWithTextContainers &&sourceRanges)
{
auto partitionPoint = std::stable_partition(sourceRanges.begin(),
sourceRanges.end(),
[&] (const SourceRangeWithTextContainer &sourceRange) {
return m_collectedSourceRanges.find(sourceRange) == m_collectedSourceRanges.end();
});
SourceRangeWithTextContainers newSourceRanges;
newSourceRanges.reserve(sourceRanges.size());
sourceRanges.erase(partitionPoint, sourceRanges.end());
std::sort(sourceRanges.begin(), sourceRanges.end());
auto sourceRangesNewEnd = std::unique(sourceRanges.begin(), sourceRanges.end());
std::copy(sourceRanges.begin(),
sourceRanges.end(),
std::inserter(m_collectedSourceRanges, m_collectedSourceRanges.end()));
std::set_difference(sourceRanges.begin(),
sourceRangesNewEnd,
m_collectedSourceRanges.begin(),
m_collectedSourceRanges.end(),
std::back_inserter(newSourceRanges));
V2::SourceRangeContainers collectedSourceRanges;
collectedSourceRanges.reserve(m_collectedSourceRanges.size() + newSourceRanges.size());
std::merge(m_collectedSourceRanges.begin(),
m_collectedSourceRanges.end(),
newSourceRanges.begin(),
newSourceRanges.end(),
std::back_inserter(collectedSourceRanges));
std::swap(m_collectedSourceRanges, collectedSourceRanges);
return newSourceRanges;
}
} // namespace ClangBackEnd

12
src/tools/clangrefactoringbackend/source/sourcerangefilter.h
View File

@@ -25,9 +25,9 @@
#pragma once
#include <unordered_set>
#include <vector>
#include <sourcerangesanddiagnosticsforquerymessage.h>
#include <sourcerangesforquerymessage.h>
namespace ClangBackEnd {
@@ -36,12 +36,12 @@ class SourceRangeFilter
public:
SourceRangeFilter(std::size_t sourcesCount = 0);
SourceRangesAndDiagnosticsForQueryMessage
removeDuplicates(SourceRangesAndDiagnosticsForQueryMessage &&message);
void removeDuplicates(SourceRangeWithTextContainers &sourceRanges);
SourceRangesForQueryMessage
removeDuplicates(SourceRangesForQueryMessage &&message);
SourceRangeWithTextContainers removeDuplicates(SourceRangeWithTextContainers &&sourceRanges);
private:
std::unordered_set<SourceRangeWithTextContainer> m_collectedSourceRanges;
V2::SourceRangeContainers m_collectedSourceRanges;
};
} // namespace ClangBackEnd