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

ClangFormat: Warn about invalid option and restore the last style

Browse Source 
Do not save the configuration which contains errors.

Change-Id: I050b22f7e589e5c39909fe1f611e56ead03d49ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-02-21 10:26:08 +01:00
parent 8a93074d0e
commit 1a65acf639
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@
#include <projectexplorer/session.h>
#include <QFile>
#include <QMessageBox>
#include <sstream>
@@ -219,6 +220,17 @@ void ClangFormatConfigWidget::apply()
}
const QByteArray text = tableToYAML(m_ui->clangFormatOptionsTable);
clang::format::FormatStyle style;
style.Language = clang::format::FormatStyle::LK_Cpp;
const std::error_code error = clang::format::parseConfiguration(text.data(), &style);
if (error.value() != static_cast<int>(clang::format::ParseError::Success)) {
QMessageBox::warning(this,
tr("Error in ClangFormat configuration"),
QString::fromStdString(error.message()));
fillTable();
return;
}
QString filePath;
if (m_project)
filePath = m_project->projectDirectory().appendPath(Constants::SETTINGS_FILE_NAME).toString();