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

Clang: Clean up TidyMode/ClazyMode enumerators

Browse Source 
Change-Id: Ie3ff0d629fd3c115df9c527e9ae8d7962fcfa156
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-24 11:31:42 +02:00
parent 7d851c12ed
commit dcb35676df
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -155,7 +155,7 @@ bool isDiagnosticConfigChangable(ProjectExplorer::Project *project,
const QSharedPointer<CppCodeModelSettings> globalSettings = codeModelSettings(); const QSharedPointer<CppCodeModelSettings> globalSettings = codeModelSettings();
const ClangDiagnosticConfig config = diagnosticConfig(projectSettings, *globalSettings); const ClangDiagnosticConfig config = diagnosticConfig(projectSettings, *globalSettings);
if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::File if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::UseConfigFile
&& diagnosticType(diagnostic) == DiagnosticType::Tidy) { && diagnosticType(diagnostic) == DiagnosticType::Tidy) {
return false; return false;
} }

4
src/plugins/clangtools/clangtidyclazyrunner.cpp
View File

@@ -76,9 +76,9 @@ static QStringList tidyChecksArguments(const ClangDiagnosticConfig diagnosticCon
{ {
const ClangDiagnosticConfig::TidyMode tidyMode = diagnosticConfig.clangTidyMode(); const ClangDiagnosticConfig::TidyMode tidyMode = diagnosticConfig.clangTidyMode();
// The argument "-config={}" stops stating/evaluating the .clang-tidy file. // The argument "-config={}" stops stating/evaluating the .clang-tidy file.
if (tidyMode == ClangDiagnosticConfig::TidyMode::Default) if (tidyMode == ClangDiagnosticConfig::TidyMode::UseDefaultChecks)
return {"-config={}"}; return {"-config={}"};
if (tidyMode == ClangDiagnosticConfig::TidyMode::ChecksPrefixList) if (tidyMode == ClangDiagnosticConfig::TidyMode::UseCustomChecks)
return {"-config={}", "-checks=" + diagnosticConfig.clangTidyChecks()}; return {"-config={}", "-checks=" + diagnosticConfig.clangTidyChecks()};
return {}; return {};
} }

2
src/plugins/clangtools/clangtoolsunittests.cpp
View File

@@ -87,7 +87,7 @@ static ClangDiagnosticConfig configFor(const QString &tidyChecks,
config.setDisplayName("Test"); config.setDisplayName("Test");
config.setIsReadOnly(true); config.setIsReadOnly(true);
config.setClangOptions(QStringList{QStringLiteral("-Wno-everything")}); config.setClangOptions(QStringList{QStringLiteral("-Wno-everything")});
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList); config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
const QString theTidyChecks = tidyChecks.isEmpty() ? tidyChecks : "-*," + tidyChecks; const QString theTidyChecks = tidyChecks.isEmpty() ? tidyChecks : "-*," + tidyChecks;
config.setClangTidyChecks(theTidyChecks); config.setClangTidyChecks(theTidyChecks);
config.setClazyChecks(clazyChecks); config.setClazyChecks(clazyChecks);

4
src/plugins/clangtools/clangtoolsutils.cpp
View File

@@ -173,8 +173,8 @@ static void addBuiltinConfigs(ClangDiagnosticConfigsModel &model)
"Default Clang-Tidy and Clazy checks")); "Default Clang-Tidy and Clazy checks"));
config.setIsReadOnly(true); config.setIsReadOnly(true);
config.setClangOptions({"-w"}); // Do not emit any clang-only warnings config.setClangOptions({"-w"}); // Do not emit any clang-only warnings
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::Default); config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseDefaultChecks);
config.setClazyMode(ClangDiagnosticConfig::ClazyMode::Default); config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseDefaultChecks);
model.appendOrUpdate(config); model.appendOrUpdate(config);
} }

24
src/plugins/clangtools/diagnosticconfigswidget.cpp
View File

@@ -814,13 +814,13 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig &
const ClangDiagnosticConfig::TidyMode tidyMode = config.clangTidyMode(); const ClangDiagnosticConfig::TidyMode tidyMode = config.clangTidyMode();
switch (tidyMode) { switch (tidyMode) {
case ClangDiagnosticConfig::TidyMode::File: case ClangDiagnosticConfig::TidyMode::UseConfigFile:
m_tidyChecks->tidyMode->setCurrentIndex(1); m_tidyChecks->tidyMode->setCurrentIndex(1);
m_tidyChecks->plainTextEditButton->setVisible(false); m_tidyChecks->plainTextEditButton->setVisible(false);
m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage);
break; break;
case ClangDiagnosticConfig::TidyMode::ChecksPrefixList: case ClangDiagnosticConfig::TidyMode::UseCustomChecks:
case ClangDiagnosticConfig::TidyMode::Default: case ClangDiagnosticConfig::TidyMode::UseDefaultChecks:
m_tidyChecks->tidyMode->setCurrentIndex(0); m_tidyChecks->tidyMode->setCurrentIndex(0);
if (m_tidyInfo.supportedChecks.isEmpty()) { if (m_tidyInfo.supportedChecks.isEmpty()) {
m_tidyChecks->plainTextEditButton->setVisible(false); m_tidyChecks->plainTextEditButton->setVisible(false);
@@ -856,7 +856,8 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
m_clazyChecks->stackedWidget->setCurrentIndex(ClazyPages::ChecksPage); m_clazyChecks->stackedWidget->setCurrentIndex(ClazyPages::ChecksPage);
disconnectClazyItemChanged(); disconnectClazyItemChanged();
const QStringList checkNames = config.clazyMode() == ClangDiagnosticConfig::ClazyMode::Default const QStringList checkNames = config.clazyMode()
== ClangDiagnosticConfig::ClazyMode::UseDefaultChecks
? m_clazyInfo.defaultChecks ? m_clazyInfo.defaultChecks
: config.clazyChecks().split(',', QString::SkipEmptyParts); : config.clazyChecks().split(',', QString::SkipEmptyParts);
m_clazyTreeModel->enableChecks(checkNames); m_clazyTreeModel->enableChecks(checkNames);
@@ -875,7 +876,8 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
void DiagnosticConfigsWidget::syncTidyChecksToTree(const ClangDiagnosticConfig &config) void DiagnosticConfigsWidget::syncTidyChecksToTree(const ClangDiagnosticConfig &config)
{ {
const QString checks = config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::Default const QString checks = config.clangTidyMode()
== ClangDiagnosticConfig::TidyMode::UseDefaultChecks
? m_tidyInfo.defaultChecks.join(',') ? m_tidyInfo.defaultChecks.join(',')
: config.clangTidyChecks(); : config.clangTidyChecks();
m_tidyTreeModel->selectChecks(checks); m_tidyTreeModel->selectChecks(checks);
@@ -922,8 +924,8 @@ void DiagnosticConfigsWidget::disconnectClazyItemChanged()
void DiagnosticConfigsWidget::onClangTidyModeChanged(int index) void DiagnosticConfigsWidget::onClangTidyModeChanged(int index)
{ {
const ClangDiagnosticConfig::TidyMode tidyMode const ClangDiagnosticConfig::TidyMode tidyMode
= index == 0 ? ClangDiagnosticConfig::TidyMode::ChecksPrefixList = index == 0 ? ClangDiagnosticConfig::TidyMode::UseCustomChecks
: ClangDiagnosticConfig::TidyMode::File; : ClangDiagnosticConfig::TidyMode::UseConfigFile;
ClangDiagnosticConfig config = currentConfig(); ClangDiagnosticConfig config = currentConfig();
config.setClangTidyMode(tidyMode); config.setClangTidyMode(tidyMode);
@@ -934,8 +936,8 @@ void DiagnosticConfigsWidget::onClangTidyModeChanged(int index)
void DiagnosticConfigsWidget::onClangTidyTreeChanged() void DiagnosticConfigsWidget::onClangTidyTreeChanged()
{ {
ClangDiagnosticConfig config = currentConfig(); ClangDiagnosticConfig config = currentConfig();
if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::Default) if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::UseDefaultChecks)
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList); config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
config.setClangTidyChecks(m_tidyTreeModel->selectedChecks()); config.setClangTidyChecks(m_tidyTreeModel->selectedChecks());
updateConfig(config); updateConfig(config);
} }
@@ -945,8 +947,8 @@ void DiagnosticConfigsWidget::onClazyTreeChanged()
syncClazyChecksGroupBox(); syncClazyChecksGroupBox();
ClangDiagnosticConfig config = currentConfig(); ClangDiagnosticConfig config = currentConfig();
if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::Default) if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks)
config.setClazyMode(ClangDiagnosticConfig::ClazyMode::SpecifiedChecks); config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseCustomChecks);
config.setClazyChecks(m_clazyTreeModel->enabledChecks().join(",")); config.setClazyChecks(m_clazyTreeModel->enabledChecks().join(","));
updateConfig(config); updateConfig(config);
} }

2
src/plugins/cpptools/clangdiagnosticconfig.cpp
View File

@@ -192,7 +192,7 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList()); config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList());
const int tidyModeValue = s->value(diagnosticConfigsTidyModeKey).toInt(); const int tidyModeValue = s->value(diagnosticConfigsTidyModeKey).toInt();
if (tidyModeValue == 0) { // Convert from settings of <= Qt Creator 4.10 if (tidyModeValue == 0) { // Convert from settings of <= Qt Creator 4.10
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList); config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
config.setClangTidyChecks("-*"); config.setClangTidyChecks("-*");
} else { } else {
config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(tidyModeValue)); config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(tidyModeValue));

14
src/plugins/cpptools/clangdiagnosticconfig.h
View File

@@ -61,9 +61,9 @@ public:
enum class TidyMode enum class TidyMode
{ {
// Disabled, // Used by Qt Creator 4.10 and below. // Disabled, // Used by Qt Creator 4.10 and below.
ChecksPrefixList = 1, UseCustomChecks = 1,
File, UseConfigFile,
Default, UseDefaultChecks,
}; };
TidyMode clangTidyMode() const; TidyMode clangTidyMode() const;
void setClangTidyMode(TidyMode mode); void setClangTidyMode(TidyMode mode);
@@ -74,8 +74,8 @@ public:
// Clazy // Clazy
enum class ClazyMode enum class ClazyMode
{ {
Default, UseDefaultChecks,
SpecifiedChecks, UseCustomChecks,
}; };
ClazyMode clazyMode() const; ClazyMode clazyMode() const;
void setClazyMode(const ClazyMode &clazyMode); void setClazyMode(const ClazyMode &clazyMode);
@@ -90,10 +90,10 @@ private:
Core::Id m_id; Core::Id m_id;
QString m_displayName; QString m_displayName;
QStringList m_clangOptions; QStringList m_clangOptions;
TidyMode m_clangTidyMode = TidyMode::Default; TidyMode m_clangTidyMode = TidyMode::UseDefaultChecks;
QString m_clangTidyChecks; QString m_clangTidyChecks;
QString m_clazyChecks; QString m_clazyChecks;
ClazyMode m_clazyMode = ClazyMode::Default; ClazyMode m_clazyMode = ClazyMode::UseDefaultChecks;
bool m_isReadOnly = false; bool m_isReadOnly = false;
bool m_useBuildSystemWarnings = false; bool m_useBuildSystemWarnings = false;
}; };