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

ClangFormat: Rework clangformatconfigwidget

Browse Source 
- Move logic work with clang-format file to
additional class to make clangformatconfigwidget
responsible only for work with ui elements.
- Fix functionality: when new BasedOnStyle was
chosen all fields were empty or set in default,
now it fills with the corresponding value.

Change-Id: I2ee42a502e87da761274d293a7f0a38fda98804d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-09-28 10:26:34 +02:00
parent ec74c36a8c
commit 8b263b4ae5
7 changed files with 217 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "clangformatconstants.h"
#include "clangformatindenter.h"
#include "clangformatfile.h"
#include "clangformatsettings.h"
#include "clangformatutils.h"
#include "ui_clangformatchecks.h"
@@ -121,6 +122,12 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(ProjectExplorer::Project *proje
{
m_ui->setupUi(this);
Utils::FilePath filePath = Core::ICore::userResourcePath();
if (m_project)
filePath = filePath / "clang-format/" / currentProjectUniqueId();
filePath = filePath / QLatin1String(Constants::SETTINGS_FILE_NAME);
m_config = std::make_unique<ClangFormatFile>(filePath);
initChecksAndPreview();
if (m_project) {
@@ -147,6 +154,8 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(ProjectExplorer::Project *proje
connectChecks();
}
ClangFormatConfigWidget::~ClangFormatConfigWidget() = default;
void ClangFormatConfigWidget::initChecksAndPreview()
{
m_checksScrollArea = new QScrollArea();
@@ -191,7 +200,7 @@ void ClangFormatConfigWidget::connectChecks()
continue;
}
auto button = qobject_cast<QPushButton *>(child);
const auto button = qobject_cast<QPushButton *>(child);
if (button != nullptr)
connect(button, &QPushButton::clicked, this, &ClangFormatConfigWidget::onTableChanged);
}
@@ -202,15 +211,7 @@ void ClangFormatConfigWidget::onTableChanged()
if (m_disableTableUpdate)
return;
const std::string newConfig = tableToString(sender());
if (newConfig.empty())
return;
const std::string oldConfig = m_project ? currentProjectConfigText()
: currentGlobalConfigText();
saveConfig(newConfig);
fillTable();
updatePreview();
saveConfig(oldConfig);
saveChanges(sender());
}
void ClangFormatConfigWidget::hideGlobalCheckboxes()
@@ -379,16 +380,20 @@ void ClangFormatConfigWidget::fillTable()
}
}
std::string ClangFormatConfigWidget::tableToString(QObject *sender)
void ClangFormatConfigWidget::saveChanges(QObject *sender)
{
std::stringstream content;
content << "---";
if (sender->objectName() == "BasedOnStyle") {
auto *basedOnStyle = m_checksWidget->findChild<QComboBox *>("BasedOnStyle");
content << "\nBasedOnStyle: " << basedOnStyle->currentText().toStdString() << '\n';
const auto *basedOnStyle = m_checksWidget->findChild<QComboBox *>("BasedOnStyle");
m_config->setBasedOnStyle(basedOnStyle->currentText());
} else {
QList<ClangFormatFile::Field> fields;
for (QObject *child : m_checksWidget->children()) {
if (child->objectName() == "BasedOnStyle")
continue;
auto *label = qobject_cast<QLabel *>(child);
if (!label)
continue;
@@ -396,7 +401,7 @@ std::string ClangFormatConfigWidget::tableToString(QObject *sender)
QWidget *valueWidget = m_checksWidget->findChild<QWidget *>(label->text().trimmed());
if (!valueWidget) {
// Currently BraceWrapping only.
content << '\n' << label->text().toStdString() << ":";
fields.append({label->text(), ""});
continue;
}
@@ -410,46 +415,34 @@ std::string ClangFormatConfigWidget::tableToString(QObject *sender)
if (plainText->toPlainText().trimmed().isEmpty())
continue;
content << '\n' << label->text().toStdString() << ":";
std::stringstream content;
QStringList list = plainText->toPlainText().split('\n');
for (const QString &line : list)
content << "\n " << line.toStdString();
fields.append({label->text(), QString::fromStdString(content.str())});
} else {
auto *comboBox = qobject_cast<QComboBox *>(valueWidget);
std::string text;
if (comboBox) {
text = comboBox->currentText().toStdString();
QString text;
if (auto *comboBox = qobject_cast<QComboBox *>(valueWidget)) {
text = comboBox->currentText();
} else {
auto *lineEdit = qobject_cast<QLineEdit *>(valueWidget);
QTC_ASSERT(lineEdit, continue;);
text = lineEdit->text().toStdString();
text = lineEdit->text();
}
if (!text.empty() && text != "Default")
content << '\n' << label->text().toStdString() << ": " << text;
if (!text.isEmpty() && text != "Default")
fields.append({label->text(), text});
}
}
content << '\n';
m_config->changeFields(fields);
}
std::string text = content.str();
clang::format::FormatStyle style;
style.Language = clang::format::FormatStyle::LK_Cpp;
const std::error_code error = clang::format::parseConfiguration(text, &style);
if (error.value() != static_cast<int>(clang::format::ParseError::Success)) {
QMessageBox::warning(this,
tr("Error in ClangFormat configuration"),
QString::fromStdString(error.message()));
fillTable();
updatePreview();
return std::string();
}
return text;
fillTable();
updatePreview();
}
ClangFormatConfigWidget::~ClangFormatConfigWidget() = default;
void ClangFormatConfigWidget::apply()
{
ClangFormatSettings &settings = ClangFormatSettings::instance();
@@ -466,28 +459,7 @@ void ClangFormatConfigWidget::apply()
if (!m_checksWidget->isVisible())
return;
const std::string config = tableToString(this);
if (config.empty())
return;
saveConfig(config);
fillTable();
updatePreview();
}
void ClangFormatConfigWidget::saveConfig(const std::string &text) const
{
QString filePath = Core::ICore::userResourcePath().toString();
if (m_project)
filePath += "/clang-format/" + currentProjectUniqueId();
filePath += "/" + QLatin1String(Constants::SETTINGS_FILE_NAME);
QFile file(filePath);
if (!file.open(QFile::WriteOnly))
return;
file.write(text.c_str());
file.close();
saveChanges(this);
}
} // namespace ClangFormat