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

Clang: Add combobox with tidy configuration options

Browse Source 
The old way was not flexible enough.
With these options it's possible to just use your
config file or set tidy command line yourself.

Change-Id: I1bace40986668dee5e1b30c9d03090a3fd22e253
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-02-23 11:36:18 +01:00
parent 1e033d8a08
commit 4d153b4f67
7 changed files with 319 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -496,7 +496,7 @@ private:
m_diagnosticConfigId = diagnosticConfig.id();
m_options.append(diagnosticConfig.clangOptions());
addClangTidyOptions(diagnosticConfig.clangTidyChecks());
addClangTidyOptions(diagnosticConfig);
addClazyOptions(diagnosticConfig.clazyChecks());
}
@@ -510,13 +510,26 @@ private:
}
}
void addClangTidyOptions(const QString &checks)
void addClangTidyOptions(const CppTools::ClangDiagnosticConfig &diagnosticConfig)
{
if (checks.isEmpty())
using Mode = CppTools::ClangDiagnosticConfig::TidyMode;
Mode tidyMode = diagnosticConfig.clangTidyMode();
if (tidyMode == Mode::Disabled)
return;
QString checks;
if (tidyMode == Mode::ChecksPrefixList) {
checks = QStringLiteral("-*") + diagnosticConfig.clangTidyChecksPrefixes();
} else if (tidyMode == Mode::ChecksString) {
checks = diagnosticConfig.clangTidyChecksString();
checks = checks.simplified();
checks.replace(" ", "");
}
addXclangArg("-add-plugin", "clang-tidy");
addXclangArg("-plugin-arg-clang-tidy", "-checks='-*" + checks + "'");
if (!checks.isEmpty())
addXclangArg("-plugin-arg-clang-tidy", "-checks=" + checks);
}
void addClazyOptions(const QString &checks)