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 <david.schulz@qt.io>

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

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 <coreplugin/editormanager/editormanager.h>
@@ -41,6 +42,7 @@
 #include <texteditor/quickfix.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/session.h>
 
 #include <clangsupport/cmbregisterprojectsforeditormessage.h>
 #include <clangsupport/filecontainer.h>
@@ -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();

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<CppTools::FollowSymbolInterface> m_followSymbol;
     std::unique_ptr<CppTools::RefactoringEngineInterface> m_refactoringEngine;
+
+    QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
 };
 
 class ModelManagerSupportProviderClang : public CppTools::ModelManagerSupportProvider

src/plugins/clangcodemodel/clangprojectsettingswidget.cpp

@@ -25,6 +25,7 @@
 
 #include "clangprojectsettingswidget.h"
 
+#include "clangmodelmanagersupport.h"
 #include "clangprojectsettings.h"
 
 #include <coreplugin/icore.h>
@@ -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);
 

src/plugins/clangcodemodel/clangprojectsettingswidget.h

@@ -59,7 +59,7 @@ private:
 
 private:
     Ui::ClangProjectSettingsWidget m_ui;
-    ClangProjectSettings m_projectSettings;
+    ClangProjectSettings &m_projectSettings;
     QPointer<CppTools::ClangDiagnosticConfigsWidget> m_diagnosticConfigWidget;
 };