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

ClangFormat: Add warning for clangformat version

Browse Source 
Added warning when current clangformat major version does not
match with version what checks was generated for.

Change-Id: I818c9a4f79385cba4e492ea5428bb051f329a9d4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-08-04 14:06:39 +02:00
parent 3e9886bd90
commit a7fcb71b90
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/clangformat/clangformatconfigwidget.cpp
View File

@@ -31,6 +31,7 @@
#include <utils/guard.h> #include <utils/guard.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/utilsicons.h>
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>
@@ -39,9 +40,11 @@
#include <QScrollArea> #include <QScrollArea>
#include <QSharedPointer> #include <QSharedPointer>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QVersionNumber>
#include <QWeakPointer> #include <QWeakPointer>
#include <QWidget> #include <QWidget>
#include <clang/Basic/Version.h>
#include <clang/Format/Format.h> #include <clang/Format/Format.h>
#include <sstream> #include <sstream>
@@ -62,6 +65,9 @@ public:
clang::format::FormatStyle style; clang::format::FormatStyle style;
Utils::Guard ignoreChanges; Utils::Guard ignoreChanges;
QLabel *fallbackConfig; QLabel *fallbackConfig;
QLabel *clangVersion;
QLabel *clangWarningText;
QLabel *clangWarningIcon;
}; };
bool ClangFormatConfigWidget::eventFilter(QObject *object, QEvent *event) bool ClangFormatConfigWidget::eventFilter(QObject *object, QEvent *event)
@@ -90,6 +96,28 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(TextEditor::ICodeStylePreferenc
d->checksWidget->setEnabled(!codeStyle->isReadOnly() && !codeStyle->isTemporarilyReadOnly() d->checksWidget->setEnabled(!codeStyle->isReadOnly() && !codeStyle->isTemporarilyReadOnly()
&& !codeStyle->isAdditionalTabDisabled()); && !codeStyle->isAdditionalTabDisabled());
static const int expectedMajorVersion = 16;
d->clangVersion = new QLabel(Tr::tr("Current clang-format version: ") + LLVM_VERSION_STRING,
this);
d->clangWarningText
= new QLabel(Tr::tr("The widget was generated for ClangFormat %1. "
"If you use a different version, the widget may work incorrectly.")
.arg(expectedMajorVersion),
this);
QPalette palette = d->clangWarningText->palette();
palette.setColor(QPalette::WindowText, Qt::red);
d->clangWarningText->setPalette(palette);
d->clangWarningIcon = new QLabel(this);
d->clangWarningIcon->setPixmap(Utils::Icons::WARNING.icon().pixmap(16, 16));
if (LLVM_VERSION_MAJOR == expectedMajorVersion) {
d->clangWarningText->hide();
d->clangWarningIcon->hide();
}
FilePath fileName; FilePath fileName;
if (d->project) if (d->project)
fileName = d->project->projectFilePath().pathAppended("snippet.cpp"); fileName = d->project->projectFilePath().pathAppended("snippet.cpp");
@@ -110,6 +138,8 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(TextEditor::ICodeStylePreferenc
Column { Column {
d->fallbackConfig, d->fallbackConfig,
Row {d->clangWarningIcon, d->clangWarningText, st},
d->clangVersion,
Row { d->checksScrollArea, d->preview }, Row { d->checksScrollArea, d->preview },
}.attachTo(this); }.attachTo(this);