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

Beautifier: Fix clang-format's custom style handling

Browse Source 
Instead of dealing with clang-format's YAML format use proper command
line parameters.

Task-number: QTCREATORBUG-15604
Change-Id: Ie0b22aff105c8d208d30e2e945b0036b0b8606c1
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Lorenz Haas
2016-03-16 21:17:10 +01:00
committed by Lorenz Haas
parent e63f503592
commit 3310fbc8f2
6 changed files with 70 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -132,23 +132,19 @@ Command ClangFormat::command(int offset, int length) const
if (m_settings->usePredefinedStyle()) {
command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle());
command.addOption(QLatin1String("-assume-filename=%filename"));
} else {
// The clang-format option file is YAML
const QStringList lines = m_settings->style(m_settings->customStyle())
.split(QLatin1Char('\n'), QString::SkipEmptyParts);
const QStringList options = Utils::filtered(lines, [](const QString &s) -> bool {
const QString option = s.trimmed();
return !(option.startsWith(QLatin1Char('#')) || option == QLatin1String("---"));
});
command.addOption(QLatin1String("-style={") + options.join(QLatin1String(", "))
+ QLatin1Char('}'));
command.addOption(QLatin1String("-style=file"));
const QString path =
QFileInfo(m_settings->styleFileName(m_settings->customStyle())).absolutePath();
command.addOption(QLatin1String("-assume-filename=") + path + QDir::separator()
+ QLatin1String("%filename"));
}
if (offset != -1) {
command.addOption(QLatin1String("-offset=") + QString::number(offset));
command.addOption(QLatin1String("-length=") + QString::number(length));
}
command.addOption(QLatin1String("-assume-filename=%file"));
return command;
}