aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangformat/clangformatconfigwidget.cpp
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2019-01-28 12:25:36 +0100
committerIvan Donchevskii <ivan.donchevskii@qt.io>2019-02-05 08:36:16 +0000
commit5792291520fb128764264140497233b5545c375d (patch)
treead34556b02db441e0ae692f0e33d6bfb9a5cd14f /src/plugins/clangformat/clangformatconfigwidget.cpp
parent536b733f2978cf81d72cc01572bf6338248aac2d (diff)
ClangFormat: Format edited chunks of file on save
The similar implementation to the one in Beautifier plugin with the difference that the clangformat indenter logic is used and only modified chunks are formatted. That means that all code which was not touched will stay in the initial condition. Change-Id: I47b11eb99852454ed0031ef6cfc6dbed1ecd390d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/clangformat/clangformatconfigwidget.cpp')
-rw-r--r--src/plugins/clangformat/clangformatconfigwidget.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index bcede8c010..f0d4808cf5 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -131,6 +131,7 @@ void ClangFormatConfigWidget::hideGlobalCheckboxes()
{
m_ui->formatAlways->hide();
m_ui->formatWhileTyping->hide();
+ m_ui->formatOnSave->hide();
}
void ClangFormatConfigWidget::showGlobalCheckboxes()
@@ -140,6 +141,9 @@ void ClangFormatConfigWidget::showGlobalCheckboxes()
m_ui->formatWhileTyping->setChecked(ClangFormatSettings::instance().formatWhileTyping());
m_ui->formatWhileTyping->show();
+
+ m_ui->formatOnSave->setChecked(ClangFormatSettings::instance().formatOnSave());
+ m_ui->formatOnSave->show();
}
void ClangFormatConfigWidget::initialize()
@@ -200,7 +204,6 @@ void ClangFormatConfigWidget::fillTable()
std::string configText = clang::format::configurationAsText(style);
std::istringstream stream(configText);
readTable(m_ui->clangFormatOptionsTable, stream);
-
}
ClangFormatConfigWidget::~ClangFormatConfigWidget() = default;
@@ -211,6 +214,7 @@ void ClangFormatConfigWidget::apply()
ClangFormatSettings &settings = ClangFormatSettings::instance();
settings.setFormatCodeInsteadOfIndent(m_ui->formatAlways->isChecked());
settings.setFormatWhileTyping(m_ui->formatWhileTyping->isChecked());
+ settings.setFormatOnSave(m_ui->formatOnSave->isChecked());
settings.write();
}