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

Clangd: Handle settings changes

Browse Source 
Users no longer have to re-load a project for settings changes to take
effect.

Change-Id: I86dccccac14a30514c8dac292c7765ee4806f6ba
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-07-01 04:17:54 +02:00
parent b52f2d198a
commit f4a3310059
8 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cpptools/cppcodemodelsettings.cpp
View File

@@ -303,18 +303,6 @@ void CppCodeModelSettings::setEnableLowerClazyLevels(bool yesno)
}
static bool operator==(const ClangdSettings::Data &s1, const ClangdSettings::Data &s2)
{
return s1.useClangd == s2.useClangd
&& s1.executableFilePath == s2.executableFilePath
&& s1.workerThreadLimit == s2.workerThreadLimit
&& s1.enableIndexing == s2.enableIndexing;
}
static bool operator!=(const ClangdSettings::Data &s1, const ClangdSettings::Data &s2)
{
return !(s1 == s2);
}
ClangdSettings &ClangdSettings::instance()
{
static ClangdSettings settings;
@@ -338,6 +326,7 @@ void ClangdSettings::setData(const Data &data)
if (this == &instance() && data != m_data) {
m_data = data;
saveSettings();
emit changed();
}
}
@@ -364,23 +353,25 @@ ClangdProjectSettings::ClangdProjectSettings(ProjectExplorer::Project *project)
loadSettings();
}
ClangdSettings ClangdProjectSettings::settings() const
ClangdSettings::Data ClangdProjectSettings::settings() const
{
if (m_useGlobalSettings)
return ClangdSettings::instance();
return ClangdSettings(m_customSettings);
return ClangdSettings::instance().data();
return m_customSettings;
}
void ClangdProjectSettings::setSettings(const ClangdSettings::Data &data)
{
m_customSettings = data;
saveSettings();
emit ClangdSettings::instance().changed();
}
void ClangdProjectSettings::setUseGlobalSettings(bool useGlobal)
{
m_useGlobalSettings = useGlobal;
saveSettings();
emit ClangdSettings::instance().changed();
}
void ClangdProjectSettings::loadSettings()