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

Merge remote-tracking branch 'origin/3.6' into 4.0

Browse Source 
Conflicts:
	src/plugins/projectexplorer/applicationlauncher.cpp
	src/plugins/projectexplorer/applicationlauncher.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qtsupport/uicodemodelsupport.cpp
	src/plugins/qtsupport/uicodemodelsupport.h

Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
This commit is contained in:
Eike Ziller
2016-03-03 16:10:04 +01:00
parent 0aeb654685 fc57682120
commit f4e87a7e0c
10 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,9 +44,11 @@
#include <coreplugin/idocument.h>
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/texteditor.h>
#include <utils/algorithm.h>
#include <QAction>
#include <QMenu>
#include <QStringList>
namespace Beautifier {
namespace Internal {
@@ -131,8 +133,14 @@ Command ClangFormat::command(int offset, int length) const
if (m_settings->usePredefinedStyle()) {
command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle());
} else {
command.addOption(QLatin1String("-style={")
+ m_settings->style(m_settings->customStyle()).remove(QLatin1Char('\n'))
// 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('}'));
}