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

Beautifier: Fix formatting with AStyle and make it more robust

Browse Source 
Only version 2.04 added an extra newline. Later versions are fixed, so
the should not remove a newline.
In addition if piping is enabled we stream "\n" line endings so tell
AStyle this explicitly by passing -z2. This disables the automatic
detection which can be faulty with short code fragments.

Task-number: QTCREATORBUG-17546
Change-Id: Ib90526234bfbc4d3530fd9c3a15bdfb3af02bebd
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Lorenz Haas
2017-02-28 19:10:01 +01:00
parent 126a031ee2
commit 2ce4bbc458
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/beautifier/artisticstyle/artisticstyle.cpp
View File

@@ -160,10 +160,13 @@ Command ArtisticStyle::command(const QString &cfgFile) const
command.addOption("-q");
command.addOption("--options=" + cfgFile);
if (m_settings->version() > ArtisticStyleSettings::Version_2_03) {
const int version = m_settings->version();
if (version > ArtisticStyleSettings::Version_2_03) {
command.setProcessing(Command::PipeProcessing);
command.setPipeAddsNewline(true);
if (version == ArtisticStyleSettings::Version_2_04)
command.setPipeAddsNewline(true);
command.setReturnsCRLF(Utils::HostOsInfo::isWindowsHost());
command.addOption("-z2");
} else {
command.addOption("%file");
}

3
src/plugins/beautifier/artisticstyle/artisticstylesettings.h
View File

@@ -40,7 +40,8 @@ class ArtisticStyleSettings : public AbstractSettings
public:
enum ArtisticStyleVersion {
Version_2_03 = 203
Version_2_03 = 203,
Version_2_04 = 204
};
ArtisticStyleSettings();