forked from qt-creator/qt-creator
Clang: Connect alive timer
You had to set the no alive timer environment variable. Change-Id: I1994087a68d8293963f9f48fa1632f7c6822b146 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -73,6 +73,7 @@ bool ClangRefactoringPlugin::initialize(const QStringList & /*arguments*/, QStri
|
||||
d.reset(new ClangRefactoringPluginData);
|
||||
|
||||
d->refactoringClient.setRefactoringEngine(&d->engine);
|
||||
d->refactoringClient.setRefactoringConnectionClient(&d->connectionClient);
|
||||
ExtensionSystem::PluginManager::addObject(&d->qtCreatorfindFilter);
|
||||
|
||||
connectBackend();
|
||||
@@ -89,6 +90,7 @@ void ClangRefactoringPlugin::extensionsInitialized()
|
||||
ExtensionSystem::IPlugin::ShutdownFlag ClangRefactoringPlugin::aboutToShutdown()
|
||||
{
|
||||
ExtensionSystem::PluginManager::removeObject(&d->qtCreatorfindFilter);
|
||||
d->refactoringClient.setRefactoringConnectionClient(nullptr);
|
||||
d->refactoringClient.setRefactoringEngine(nullptr);
|
||||
|
||||
d.reset();
|
||||
|
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "refactoringclient.h"
|
||||
|
||||
#include <refactoringconnectionclient.h>
|
||||
#include <sourcelocationsforrenamingmessage.h>
|
||||
#include <sourcerangesanddiagnosticsforquerymessage.h>
|
||||
|
||||
@@ -32,7 +33,8 @@ namespace ClangRefactoring {
|
||||
|
||||
void RefactoringClient::alive()
|
||||
{
|
||||
|
||||
if (connectionClient)
|
||||
connectionClient->resetProcessAliveTimer();
|
||||
}
|
||||
|
||||
void RefactoringClient::sourceLocationsForRenamingMessage(
|
||||
@@ -96,6 +98,12 @@ uint RefactoringClient::resultCounter() const
|
||||
return resultCounter_;
|
||||
}
|
||||
|
||||
void RefactoringClient::setRefactoringConnectionClient(
|
||||
ClangBackEnd::RefactoringConnectionClient *connectionClient)
|
||||
{
|
||||
this->connectionClient = connectionClient;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
Utils::SmallString concatenateFilePath(const ClangBackEnd::FilePath &filePath)
|
||||
|
@@ -35,6 +35,7 @@
|
||||
|
||||
namespace ClangBackEnd {
|
||||
class FilePath;
|
||||
class RefactoringConnectionClient;
|
||||
class SourceRangesContainer;
|
||||
class SourceRangeWithTextContainer;
|
||||
}
|
||||
@@ -65,6 +66,7 @@ public:
|
||||
uint expectedResultCount() const;
|
||||
uint resultCounter() const;
|
||||
|
||||
void setRefactoringConnectionClient(ClangBackEnd::RefactoringConnectionClient *connectionClient);
|
||||
|
||||
UNIT_TEST_PUBLIC:
|
||||
void addSearchResult(const ClangBackEnd::SourceRangeWithTextContainer &sourceRange,
|
||||
@@ -78,6 +80,7 @@ private:
|
||||
|
||||
private:
|
||||
CppTools::RefactoringEngineInterface::RenameCallback localRenamingCallback;
|
||||
ClangBackEnd::RefactoringConnectionClient *connectionClient = nullptr;
|
||||
ClangRefactoring::SearchHandle *searchHandle_ = nullptr;
|
||||
ClangRefactoring::RefactoringEngine *refactoringEngine = nullptr;
|
||||
uint expectedResultCount_ = 0;
|
||||
|
Reference in New Issue
Block a user