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

ClangTools: Finish "disable checks" logic

Browse Source 
- Take project settings into account.
- Fix some bugs in the initial implementation.

Task-number: QTCREATORBUG-24852
Change-Id: I4960fc68ef0b27777a152ca871dfa554fea72c51
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-24 17:02:54 +01:00
parent aabdbb7d9e
commit 16bc10a66f
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/plugins/clangtools/clangtoolsdiagnosticview.cpp
View File

@@ -173,9 +173,9 @@ DiagnosticView::DiagnosticView(QWidget *parent)
connect(m_suppressAction, &QAction::triggered,
this, &DiagnosticView::suppressCurrentDiagnostic);
m_disableGloballyAction = new QAction(this);
connect(m_disableGloballyAction, &QAction::triggered,
this, &DiagnosticView::disableCheckForCurrentDiagnosticGlobally);
m_disableChecksAction = new QAction(this);
connect(m_disableChecksAction, &QAction::triggered,
this, &DiagnosticView::disableCheckForCurrentDiagnostic);
installEventFilter(this);
@@ -239,14 +239,20 @@ void DiagnosticView::suppressCurrentDiagnostic()
filterModel->addSuppressedDiagnostics(diags);
}
void DiagnosticView::disableCheckForCurrentDiagnosticGlobally()
void DiagnosticView::disableCheckForCurrentDiagnostic()
{
ClangToolsSettings * const settings = ClangToolsSettings::instance();
ClangDiagnosticConfigs configs = settings->diagnosticConfigs();
Utils::Id activeConfigId = settings->runSettings().diagnosticConfigId();
ClangToolsProjectSettings::ClangToolsProjectSettingsPtr projectSettings;
if (ProjectExplorer::Project * const project
= static_cast<DiagnosticFilterModel *>(model())->project()) {
projectSettings = ClangToolsProjectSettings::getSettings(project);
if (!projectSettings->useGlobalSettings())
activeConfigId = projectSettings->runSettings().diagnosticConfigId();
}
ClangDiagnosticConfig config = Utils::findOrDefault(configs,
[settings](const ClangDiagnosticConfig &c) {
return c.id() == settings->runSettings().diagnosticConfigId();
});
[activeConfigId](const ClangDiagnosticConfig &c) { return c.id() == activeConfigId; });
const bool defaultWasActive = !config.id().isValid();
if (defaultWasActive) {
QTC_ASSERT(configs.isEmpty(), return);
@@ -255,6 +261,14 @@ void DiagnosticView::disableCheckForCurrentDiagnosticGlobally()
config.setId(Utils::Id::fromString(QUuid::createUuid().toString()));
config.setDisplayName(tr("Custom Configuration"));
configs << config;
RunSettings runSettings = settings->runSettings();
runSettings.setDiagnosticConfigId(config.id());
settings->setRunSettings(runSettings);
if (projectSettings && !projectSettings->useGlobalSettings()) {
runSettings = projectSettings->runSettings();
runSettings.setDiagnosticConfigId(config.id());
projectSettings->setRunSettings(runSettings);
}
}
std::set<QString> handledNames;
@@ -268,10 +282,18 @@ void DiagnosticView::disableCheckForCurrentDiagnosticGlobally()
continue;
if (diag.name.startsWith("clazy-")) {
if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks) {
config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseCustomChecks);
const ClazyStandaloneInfo clazyInfo(clazyStandaloneExecutable());
config.setClazyChecks(clazyInfo.defaultChecks.join(','));
}
config.setClazyChecks(removeClazyCheck(config.clazyChecks(), diag.name));
} else if (config.clangTidyMode() != ClangDiagnosticConfig::TidyMode::UseConfigFile) {
if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::UseDefaultChecks) {
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
const ClangTidyInfo tidyInfo(clangTidyExecutable());
config.setClangTidyChecks(tidyInfo.defaultChecks.join(','));
}
config.setClangTidyChecks(removeClangTidyCheck(config.clangTidyChecks(), diag.name));
}
}
@@ -338,7 +360,7 @@ QModelIndex DiagnosticView::getTopLevelIndex(const QModelIndex &index, Direction
return model()->index(row, 0);
}
bool DiagnosticView::disableGloballyEnabled() const
bool DiagnosticView::disableChecksEnabled() const
{
const QList<QModelIndex> indexes = selectionModel()->selectedIndexes();
if (indexes.isEmpty())
@@ -348,10 +370,15 @@ bool DiagnosticView::disableGloballyEnabled() const
ClangToolsSettings * const settings = ClangToolsSettings::instance();
const ClangDiagnosticConfigs configs = settings->diagnosticConfigs();
Utils::Id activeConfigId = settings->runSettings().diagnosticConfigId();
if (ProjectExplorer::Project * const project
= static_cast<DiagnosticFilterModel *>(model())->project()) {
const auto projectSettings = ClangToolsProjectSettings::getSettings(project);
if (!projectSettings->useGlobalSettings())
activeConfigId = projectSettings->runSettings().diagnosticConfigId();
}
const ClangDiagnosticConfig activeConfig = Utils::findOrDefault(configs,
[settings](const ClangDiagnosticConfig &c) {
return c.id() == settings->runSettings().diagnosticConfigId();
});
[activeConfigId](const ClangDiagnosticConfig &c) { return c.id() == activeConfigId; });
// If the user has not created any custom configuration yet, then we'll do that for
// them as an act of kindness. But if custom configurations exist and the default
@@ -385,9 +412,9 @@ QList<QAction *> DiagnosticView::customActions() const
m_suppressAction->setEnabled(isDiagnosticItem || hasMultiSelection);
m_suppressAction->setText(hasMultiSelection ? tr("Suppress Selected Diagnostics")
: tr("Suppress This Diagnostic"));
m_disableGloballyAction->setEnabled(disableGloballyEnabled());
m_disableGloballyAction->setText(hasMultiSelection ? tr("Disable These Checks Globally")
: tr("Disable This Check Globally"));
m_disableChecksAction->setEnabled(disableChecksEnabled());
m_disableChecksAction->setText(hasMultiSelection ? tr("Disable These Checks")
: tr("Disable This Check"));
return {
m_help,
@@ -398,7 +425,7 @@ QList<QAction *> DiagnosticView::customActions() const
m_filterOutCurrentKind,
m_separator2,
m_suppressAction,
m_disableGloballyAction
m_disableChecksAction
};
}

7
src/plugins/clangtools/clangtoolsdiagnosticview.h
View File

@@ -61,13 +61,12 @@ private:
void openEditorForCurrentIndex();
void suppressCurrentDiagnostic();
void disableCheckForCurrentDiagnosticGlobally();
void disableCheckForCurrentDiagnostic();
enum Direction { Next = 1, Previous = -1 };
QModelIndex getIndex(const QModelIndex &index, Direction direction) const;
QModelIndex getTopLevelIndex(const QModelIndex &index, Direction direction) const;
private:
bool disableGloballyEnabled() const;
bool disableChecksEnabled() const;
QAction *m_help = nullptr;
@@ -77,7 +76,7 @@ private:
QAction *m_filterOutCurrentKind = nullptr;
QAction *m_suppressAction = nullptr;
QAction *m_disableGloballyAction = nullptr;
QAction *m_disableChecksAction = nullptr;
QAction *m_separator = nullptr;
QAction *m_separator2 = nullptr;