From 2c744412606ab3c0733948c3c2fec8e2da5f98b4 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 22 Jan 2018 16:31:05 +0100 Subject: [PATCH] Clang: Use only one ClangProjectSettings instance per project So far we've created ClangProjectSettings objects on demand. To get change notifications there should be only one per project alive (and accessible). Change-Id: I757186ceaa642c6864d02946258cc6eb18064a52 Reviewed-by: David Schulz --- .../clangeditordocumentprocessor.cpp | 11 +++++-- .../clangmodelmanagersupport.cpp | 31 +++++++++++++++++++ .../clangcodemodel/clangmodelmanagersupport.h | 9 ++++++ .../clangprojectsettingswidget.cpp | 3 +- .../clangprojectsettingswidget.h | 2 +- 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index e1a02f453d9..3097d9da883 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -29,6 +29,7 @@ #include "clangdiagnostictooltipwidget.h" #include "clangfixitoperation.h" #include "clangfixitoperationsextractor.h" +#include "clangmodelmanagersupport.h" #include "clangtokeninfosreporter.h" #include "clangprojectsettings.h" #include "clangutils.h" @@ -66,6 +67,12 @@ namespace ClangCodeModel { namespace Internal { +static ClangProjectSettings &getProjectSettings(ProjectExplorer::Project *project) +{ + QTC_CHECK(project); + return ModelManagerSupportClang::instance()->projectSettings(project); +} + ClangEditorDocumentProcessor::ClangEditorDocumentProcessor( BackendCommunicator &communicator, TextEditor::TextDocument *document) @@ -456,7 +463,7 @@ private: void addDiagnosticOptions() { if (m_projectPart.project) { - ClangProjectSettings projectSettings(m_projectPart.project); + ClangProjectSettings &projectSettings = getProjectSettings(m_projectPart.project); if (!projectSettings.useGlobalConfig()) { const Core::Id warningConfigId = projectSettings.warningConfigId(); const CppTools::ClangDiagnosticConfigsModel configsModel( @@ -508,7 +515,7 @@ private: if (!m_projectPart.project) m_options.append(ClangProjectSettings::globalCommandLineOptions()); else - m_options.append(ClangProjectSettings{m_projectPart.project}.commandLineOptions()); + m_options.append(getProjectSettings(m_projectPart.project).commandLineOptions()); addTidyOptions(); addClazyOptions(); diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 4de96c5a0ea..26b01872bf5 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -30,6 +30,7 @@ #include "clangutils.h" #include "clangfollowsymbol.h" #include "clanghoverhandler.h" +#include "clangprojectsettings.h" #include "clangrefactoringengine.h" #include @@ -41,6 +42,7 @@ #include #include +#include #include #include @@ -99,11 +101,18 @@ ModelManagerSupportClang::ModelManagerSupportClang() connect(modelManager, &CppTools::CppModelManager::projectPartsRemoved, this, &ModelManagerSupportClang::onProjectPartsRemoved); + auto *sessionManager = ProjectExplorer::SessionManager::instance(); + connect(sessionManager, &ProjectExplorer::SessionManager::projectAdded, + this, &ModelManagerSupportClang::onProjectAdded); + connect(sessionManager, &ProjectExplorer::SessionManager::aboutToRemoveProject, + this, &ModelManagerSupportClang::onAboutToRemoveProject); + m_communicator.registerFallbackProjectPart(); } ModelManagerSupportClang::~ModelManagerSupportClang() { + QTC_CHECK(m_projectSettings.isEmpty()); m_instance = 0; } @@ -335,6 +344,22 @@ void ModelManagerSupportClang::onTextMarkContextMenuRequested(TextEditor::TextEd } } +void ModelManagerSupportClang::onProjectAdded(ProjectExplorer::Project *project) +{ + QTC_ASSERT(!m_projectSettings.value(project), return); + + auto *settings = new Internal::ClangProjectSettings(project); + m_projectSettings.insert(project, settings); +} + +void ModelManagerSupportClang::onAboutToRemoveProject(ProjectExplorer::Project *project) +{ + ClangProjectSettings * const settings = m_projectSettings.value(project); + QTC_ASSERT(settings, return); + m_projectSettings.remove(project); + delete settings; +} + void ModelManagerSupportClang::onProjectPartsUpdated(ProjectExplorer::Project *project) { QTC_ASSERT(project, return); @@ -397,6 +422,12 @@ QString ModelManagerSupportClang::dummyUiHeaderOnDiskPath(const QString &filePat return m_uiHeaderOnDiskManager.mapPath(filePath); } +ClangProjectSettings &ModelManagerSupportClang::projectSettings( + ProjectExplorer::Project *project) const +{ + return *m_projectSettings.value(project); +} + QString ModelManagerSupportClang::dummyUiHeaderOnDiskDirPath() const { return m_uiHeaderOnDiskManager.directoryPath(); diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h index 3744905b420..d534ffbed89 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h @@ -50,6 +50,8 @@ class RefactoringEngineInterface; namespace ClangCodeModel { namespace Internal { +class ClangProjectSettings; + class ModelManagerSupportClang: public QObject, public CppTools::ModelManagerSupport @@ -71,6 +73,8 @@ public: QString dummyUiHeaderOnDiskDirPath() const; QString dummyUiHeaderOnDiskPath(const QString &filePath) const; + ClangProjectSettings &projectSettings(ProjectExplorer::Project *project) const; + static ModelManagerSupportClang *instance(); private: @@ -93,6 +97,9 @@ private: int lineNumber, QMenu *menu); + void onProjectAdded(ProjectExplorer::Project *project); + void onAboutToRemoveProject(ProjectExplorer::Project *project); + void onProjectPartsUpdated(ProjectExplorer::Project *project); void onProjectPartsRemoved(const QStringList &projectPartIds); @@ -111,6 +118,8 @@ private: ClangCompletionAssistProvider m_completionAssistProvider; std::unique_ptr m_followSymbol; std::unique_ptr m_refactoringEngine; + + QHash m_projectSettings; }; class ModelManagerSupportProviderClang : public CppTools::ModelManagerSupportProvider diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp index 57461779bcd..fcee2b1dd85 100644 --- a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp +++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp @@ -25,6 +25,7 @@ #include "clangprojectsettingswidget.h" +#include "clangmodelmanagersupport.h" #include "clangprojectsettings.h" #include @@ -52,7 +53,7 @@ static Core::Id configIdForProject(ClangProjectSettings &projectSettings) } ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project *project) - : m_projectSettings(project) + : m_projectSettings(ModelManagerSupportClang::instance()->projectSettings(project)) { m_ui.setupUi(this); diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.h b/src/plugins/clangcodemodel/clangprojectsettingswidget.h index 6c2f529f436..57d5d1210bb 100644 --- a/src/plugins/clangcodemodel/clangprojectsettingswidget.h +++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.h @@ -59,7 +59,7 @@ private: private: Ui::ClangProjectSettingsWidget m_ui; - ClangProjectSettings m_projectSettings; + ClangProjectSettings &m_projectSettings; QPointer m_diagnosticConfigWidget; };