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

Beautifier: Add new class Command and option to format text via piping

Browse Source 
The tool's formatting command is now enclosed in Command. For the
formatting itself it can be defined whether to use a temporary file or
the pipe.
Additionally, settings can return the current tool's version - if
needed.

Change-Id: I0e242c3e8016ed77cad92cc97a19fe3384dda858
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Lorenz Haas
2014-05-11 19:59:46 +02:00
committed by David Schulz
parent af5b3246cf
commit ca433d9b2f
14 changed files with 351 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@
**
****************************************************************************/
// Tested with version 3.3, 3.4 and 3.4.1
#include "clangformat.h"
#include "clangformatconstants.h"
@@ -125,22 +127,24 @@ void ClangFormat::formatSelectedText()
}
}
QStringList ClangFormat::command(int offset, int length) const
Command ClangFormat::command(int offset, int length) const
{
QStringList command;
command << m_settings->command();
command << QLatin1String("-i");
Command command;
command.setExecutable(m_settings->command());
command.setProcessing(Command::PipeProcessing);
if (m_settings->usePredefinedStyle()) {
command << QLatin1String("-style=") + m_settings->predefinedStyle();
command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle());
} else {
command << QLatin1String("-style={") + m_settings->style(
m_settings->customStyle()).remove(QLatin1Char('\n')) + QLatin1String("}");
command.addOption(QLatin1String("-style={")
+ m_settings->style(m_settings->customStyle()).remove(QLatin1Char('\n'))
+ QLatin1String("}"));
}
if (offset != -1) {
command << QLatin1String("-offset=") + QString::number(offset);
command << QLatin1String("-length=") + QString::number(length);
command.addOption(QLatin1String("-offset=") + QString::number(offset));
command.addOption(QLatin1String("-length=") + QString::number(length));
}
command << QLatin1String("%file");
return command;
}