feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
261a3f1785e69a30c0002818e7b66f634556660a
qt-creator/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp

1139 lines
31 KiB
C++
Raw Normal View History

C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
#include <QtTest>
#include <QObject>
#include <QList>
#include <QTextDocument>
#include <QTextBlock>
#include <cpptools/cppcodeformatter.h>
using namespace CppTools;
class tst_CodeFormatter: public QObject
{
Q_OBJECT
private Q_SLOTS:
void ifStatementWithoutBraces1();
void ifStatementWithoutBraces2();
void ifStatementWithBraces1();
void ifStatementWithBraces2();
void ifStatementMixed();
void ifStatementAndComments();
void ifStatementLongCondition();
void strayElse();
void macrosNoSemicolon();
void oneLineIf();
void doWhile();
void closingCurlies();
void ifdefedInsideIf();
void ifdefs();
void preprocessorContinuation();
void cStyleComments();
void cppStyleComments();
void expressionContinuation();
void classAccess();
void ternary();
void objcAtDeclarations();
C++ indenter: Add another ObjC test.
2010-10-06 15:39:53 +02:00
void objcCall();
C++ indenter: Don't get confused on 'for (a in b)'. Reviewed-by: Roberto Raggi Reviewed-by: Erik Verbruggen
2010-10-06 13:50:04 +02:00
void objcCallAndFor();
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
void braceList();
void bug1();
void bug2();
void switch1();
void memberInitializer();
void templates();
void operatorOverloads();
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
void gnuStyle();
void whitesmithsStyle();
C++ indenter: Enable class, struct, enum, namespace, using in functions. Fixes incorrect indentation we got previously when they were used in a statement context.
2010-07-08 08:35:12 +02:00
void singleLineEnum();
C++ indenter: Don't add continuation indent after function return type. Task-number: QTCREATORBUG-1816
2010-07-08 08:48:36 +02:00
void functionReturnType();
C++ indenter: Respect user indent with stream operators. Reviewed-by: Erik Verbruggen
2010-07-15 16:14:22 +02:00
void streamOp();
C++ indenter: Fix indent of block statements in substatement blocks. Task-number: QTCREATORBUG-1919
2010-07-28 12:37:54 +02:00
void blockStmtInIf();
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
void nestedInitializer();
C++ indenter: Fix for statement indentation and add test.
2010-09-15 10:57:57 +02:00
void forStatement();
C++ indenter: Fix indentation if template and class appear on one line. Task-number: QTCREATORBUG-2427
2010-09-24 15:08:08 +02:00
void templateSingleline();
C++ indenter: Fix error recovery in function definitions. Task-number: QTCREATORBUG-1517
2010-09-24 15:58:23 +02:00
void macrosNoSemicolon2();
C++ indenter: Fix indentation after namespace aliases. Task-number: QTCREATORBUG-2574 Reviewed-by: Roberto Raggi
2010-10-19 12:49:09 +02:00
void renamedNamespace();
C++ indenter: Add autotest for C++0x 'for' statement. Reviewed-by: trustme
2010-10-20 10:48:43 +02:00
void cpp0xFor();
C++ indenter: Fix for GNU and Whitesmiths style switch statement. Task-number: QTCREATORBUG-2994
2010-11-04 14:07:58 +01:00
void gnuStyleSwitch();
void whitesmithsStyleSwitch();
C++ indenter: Align to next token instead of end of current. Task-number: QTCREATORBUG-3136 Reviewed-by: Erik Verbruggen
2010-11-19 18:02:14 +01:00
void indentToNextToken();
C++ indenter: Fix labels. Reviewed-by: Roberto Raggi
2010-12-01 10:19:53 +01:00
void labels();
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
};
struct Line {
Line(QString l)
: line(l)
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
, expectedIndent(-1)
, expectedPadding(0)
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
{
for (int i = 0; i < l.size(); ++i) {
if (!l.at(i).isSpace()) {
expectedIndent = i;
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
break;
}
}
if (expectedIndent == -1)
expectedIndent = l.size();
if (expectedIndent < l.size() && l.at(expectedIndent) == '~') {
line[expectedIndent] = ' ';
for (int i = expectedIndent + 1; i < l.size(); ++i) {
if (!l.at(i).isSpace()) {
expectedPadding = i - expectedIndent;
break;
}
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
}
}
}
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
Line(QString l, int expectIndent, int expectPadding = 0)
: line(l), expectedIndent(expectIndent), expectedPadding(expectPadding)
{
for (int i = 0; i < line.size(); ++i) {
if (line.at(i) == '~') {
line[i] = ' ';
break;
}
if (!line.at(i).isSpace())
break;
}
}
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
QString line;
int expectedIndent;
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
int expectedPadding;
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
};
QString concatLines(QList<Line> lines)
{
QString result;
foreach (const Line &l, lines) {
result += l.line;
result += "\n";
}
return result;
}
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
void checkIndent(QList<Line> data, int style = 0)
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
{
QString text = concatLines(data);
QTextDocument document(text);
QtStyleCodeFormatter formatter;
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
if (style == 1) {// gnu
formatter.setIndentSubstatementBraces(true);
} else if (style == 2) { // whitesmiths
formatter.setIndentSubstatementStatements(false);
formatter.setIndentSubstatementBraces(true);
formatter.setIndentDeclarationMembers(false);
formatter.setIndentDeclarationBraces(true);
}
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
int i = 0;
foreach (const Line &l, data) {
C++ indenter: Add more functions to manage the indenter state.
2010-07-06 14:41:34 +02:00
QTextBlock b = document.findBlockByLineNumber(i);
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
if (l.expectedIndent != -1) {
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
int indent, padding;
formatter.indentFor(b, &indent, &padding);
if (indent != l.expectedIndent) {
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
QFAIL(QString("Wrong indent in line %1 with text '%2', expected indent %3, got %4").arg(
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
QString::number(i+1), l.line, QString::number(l.expectedIndent), QString::number(indent)).toLatin1().constData());
}
if (padding != l.expectedPadding) {
QFAIL(QString("Wrong padding in line %1 with text '%2', expected padding %3, got %4").arg(
QString::number(i+1), l.line, QString::number(l.expectedPadding), QString::number(padding)).toLatin1().constData());
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
}
}
C++ indenter: Add more functions to manage the indenter state.
2010-07-06 14:41:34 +02:00
formatter.updateLineStateChange(b);
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
++i;
}
}
void tst_CodeFormatter::ifStatementWithoutBraces1()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (a)")
<< Line(" if (b)")
<< Line(" foo;")
<< Line(" else if (c)")
<< Line(" foo;")
<< Line(" else")
<< Line(" if (d)")
<< Line(" foo;")
<< Line(" else")
<< Line(" while (e)")
<< Line(" bar;")
<< Line(" else")
<< Line(" foo;")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::ifStatementWithoutBraces2()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (a)")
<< Line(" if (b)")
<< Line(" foo;")
<< Line(" if (a) b();")
<< Line(" if (a) b(); else")
<< Line(" foo;")
<< Line(" if (a)")
<< Line(" if (b)")
<< Line(" foo;")
<< Line(" else if (c)")
<< Line(" foo;")
<< Line(" else")
<< Line(" if (d)")
<< Line(" foo;")
<< Line(" else")
<< Line(" while (e)")
<< Line(" bar;")
<< Line(" else")
<< Line(" foo;")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::ifStatementWithBraces1()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (a) {")
<< Line(" if (b) {")
<< Line(" foo;")
<< Line(" } else if (c) {")
<< Line(" foo;")
<< Line(" } else {")
<< Line(" if (d) {")
<< Line(" foo;")
<< Line(" } else {")
<< Line(" foo;")
<< Line(" }")
<< Line(" }")
<< Line(" } else {")
<< Line(" foo;")
<< Line(" }")
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::ifStatementWithBraces2()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" if (a)")
<< Line(" {")
<< Line(" if (b)")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" else if (c)")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" else")
<< Line(" {")
<< Line(" if (d)")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" else")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" }")
<< Line(" }")
<< Line(" else")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::ifStatementMixed()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" if (foo)")
<< Line(" if (bar)")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" else")
<< Line(" if (car)")
<< Line(" {}")
<< Line(" else doo;")
<< Line(" else abc;")
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::ifStatementAndComments()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" if (foo)")
<< Line(" ; // bla")
<< Line(" else if (bar)")
<< Line(" ;")
<< Line(" if (foo)")
<< Line(" ; /* bla")
<< Line(" bla */")
<< Line(" else if (bar)")
<< Line(" // foobar")
<< Line(" ;")
<< Line(" else if (bar)")
<< Line(" /* bla")
<< Line(" bla */")
<< Line(" ;")
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::ifStatementLongCondition()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" if (foo &&")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ bar")
<< Line(" ~ || (a + b > 4")
<< Line(" ~ && foo(bar)")
<< Line(" ~ )")
<< Line(" ~ ) {")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" foo;")
<< Line(" }")
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::strayElse()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" while( true ) {}")
<< Line(" else", -1)
<< Line(" else {", -1)
<< Line(" }", -1)
<< Line("}");
checkIndent(data);
}
void tst_CodeFormatter::macrosNoSemicolon()
{
QList<Line> data;
data << Line("QT_DECLARE_METATYPE(foo)")
<< Line("int i;")
<< Line("Q_BLABLA")
<< Line("int i;")
<< Line("Q_BLABLA;")
<< Line("int i;")
<< Line("Q_BLABLA();")
<< Line("int i;")
C++: Fix indenting of QML_* macros. Task-number: QTCREATORBUG-2111
2010-08-25 14:54:45 +02:00
<< Line("QML_DECLARE_TYPE(a, b, c, d)")
<< Line("int i;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("Q_PROPERTY(abc)")
<< Line("QDOC_PROPERTY(abc)")
<< Line("void foo() {")
<< Line(" QT_DECLARE_METATYPE(foo)")
<< Line(" int i;")
<< Line(" Q_BLABLA")
<< Line(" int i;")
<< Line(" Q_BLABLA;")
<< Line(" int i;")
<< Line(" Q_BLABLA();")
<< Line(" Q_PROPERTY(abc)")
<< Line(" QDOC_PROPERTY(abc)")
<< Line(" int i;")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::oneLineIf()
{
QList<Line> data;
data << Line("class F {")
<< Line(" void foo()")
<< Line(" { if (showIt) show(); }")
<< Line("};")
;
checkIndent(data);
}
void tst_CodeFormatter::doWhile()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" do { if (c) foo; } while(a);")
<< Line(" do {")
<< Line(" if(a);")
<< Line(" } while(a);")
<< Line(" do")
<< Line(" foo;")
<< Line(" while(a);")
<< Line(" do foo; while(a);")
<< Line("};")
;
checkIndent(data);
}
void tst_CodeFormatter::closingCurlies()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (a)")
<< Line(" if (b) {")
<< Line(" foo;")
<< Line(" }")
<< Line(" {")
<< Line(" foo();")
<< Line(" }")
<< Line(" foo();")
<< Line(" {")
<< Line(" foo();")
<< Line(" }")
<< Line(" while (a) {")
<< Line(" if (a);")
<< Line(" }")
<< Line("};")
;
checkIndent(data);
}
void tst_CodeFormatter::ifdefedInsideIf()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (a) {")
<< Line("#ifndef Q_WS_WINCE")
<< Line(" if (b) {")
<< Line("#else")
<< Line(" if (c) {")
<< Line("#endif")
<< Line(" }")
<< Line(" } else if (d) {")
<< Line(" }")
<< Line(" if (a)")
<< Line(" ;")
<< Line(" else if (type == Qt::Dialog || type == Qt::Sheet)")
<< Line("#ifndef Q_WS_WINCE")
<< Line(" flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint;")
<< Line("#else")
<< Line(" bar;")
<< Line("#endif")
<< Line("};")
;
checkIndent(data);
}
void tst_CodeFormatter::ifdefs()
{
QList<Line> data;
data << Line("#ifdef FOO")
<< Line("#include <bar>")
<< Line("void foo()")
<< Line("{")
<< Line(" if (bar)")
<< Line("#if 1")
<< Line(" foo;")
<< Line(" else")
<< Line("#endif")
<< Line(" foo;")
<< Line("}")
<< Line("#endif")
;
checkIndent(data);
}
void tst_CodeFormatter::preprocessorContinuation()
{
QList<Line> data;
data << Line("#define x \\")
<< Line(" foo(x) + \\")
<< Line(" bar(x)")
<< Line("int i;")
<< Line("void foo() {")
<< Line("#define y y")
<< Line("#define x \\")
<< Line(" foo(x) + \\")
<< Line(" bar(x)")
<< Line(" int j;")
<< Line("};")
;
checkIndent(data);
}
void tst_CodeFormatter::cStyleComments()
{
QList<Line> data;
data << Line("/*")
<< Line(" ")
<< Line(" foo")
<< Line(" ")
<< Line(" foo")
<< Line(" ")
<< Line("*/")
<< Line("void foo() {")
<< Line(" /*")
<< Line(" ")
<< Line(" foo")
<< Line(" ")
<< Line(" */")
<< Line(" /* bar */")
<< Line("}")
<< Line("struct s {")
<< Line(" /* foo */")
<< Line(" /*")
<< Line(" ")
<< Line(" foo")
<< Line(" ")
<< Line(" */")
<< Line(" /* bar */")
;
checkIndent(data);
}
void tst_CodeFormatter::cppStyleComments()
{
QList<Line> data;
data << Line("// abc")
<< Line("class C { ")
<< Line(" // ghij")
<< Line(" // def")
<< Line(" // ghij")
<< Line(" int i; // hik")
<< Line(" // doo")
<< Line("} // ba")
<< Line("// ba")
;
checkIndent(data);
}
void tst_CodeFormatter::expressionContinuation()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" return (a <= b &&")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ c <= d);")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return (qMax <= qMin() &&")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ qMax(r1.top(), r2.top()) <= qMin(r1.bottom(), r2.bottom()));")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ == b && c == d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a ==")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ b && c == d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a == b")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ && c == d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a == b &&")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ c == d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a == b && c")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ == d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a == b && c ==")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ d;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" return a == b && c == d;")
<< Line(" qDebug() << foo")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ << bar << moose")
<< Line(" ~ << bar +")
<< Line(" ~ foo - blah(1)")
<< Line(" ~ << '?'")
<< Line(" ~ << \"\\n\";")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" i += foo(")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ bar,")
<< Line(" ~ 2);")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::classAccess()
{
QList<Line> data;
data << Line("class foo {")
<< Line(" int i;")
<< Line("public:")
<< Line(" class bar {")
<< Line(" private:")
<< Line(" int i;")
<< Line(" public:")
<< Line(" private slots:")
<< Line(" void foo();")
<< Line(" public Q_SLOTS:")
<< Line(" Q_SIGNALS:")
<< Line(" };")
<< Line(" float f;")
<< Line("private:")
<< Line(" void bar(){}")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::ternary()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" int i = a ? b : c;")
<< Line(" foo += a_bigger_condition ?")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ b")
<< Line(" ~ : c;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" int i = a ?")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ b : c;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" int i = a ? b")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ : c +")
<< Line(" ~ 2;")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" int i = (a ? b : c) + (foo")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ bar);")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::bug1()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" if (attribute < int(8*sizeof(uint))) {")
<< Line(" if (on)")
<< Line(" data->widget_attributes |= (1<<attribute);")
<< Line(" else")
<< Line(" data->widget_attributes &= ~(1<<attribute);")
<< Line(" } else {")
<< Line(" const int x = attribute - 8*sizeof(uint);")
<< Line(" }")
<< Line(" int i;")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::bug2()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" const int sourceY = foo(")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ bar(")
<< Line(" ~ car(a,")
<< Line(" ~ b),")
<< Line(" ~ b),")
<< Line(" ~ foo);")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" const int sourceY =")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ foo(")
<< Line(" ~ bar(a,")
<< Line(" ~ b),")
<< Line(" ~ b);")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" int j;")
<< Line(" const int sourceY =")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ (direction == DirectionEast || direction == DirectionWest) ?")
<< Line(" ~ (sourceRect.top() + (sourceRect.bottom() - sourceRect.top()) / 2)")
<< Line(" ~ : (direction == DirectionSouth ? sourceRect.bottom() : sourceRect.top());")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::braceList()
{
QList<Line> data;
data << Line("enum Foo {")
<< Line(" a,")
<< Line(" b,")
<< Line("};")
C++ indenter: Add special case rule for indenting enums. So you now get enum A { a = 2, b = 3, };
2010-07-06 13:54:21 +02:00
<< Line("enum Foo { a = 2,")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ a = 3,")
<< Line(" ~ b = 4")
<< Line("~ };")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("void foo () {")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line(" int a[] = { foo, bar, ")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ car };")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line(" int a[] = {")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ a, b,")
<< Line(" ~ c")
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
<< Line(" };")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" int k;")
;
checkIndent(data);
}
void tst_CodeFormatter::objcAtDeclarations()
{
QList<Line> data;
data << Line("@class Forwarded;")
<< Line("@protocol Forwarded;")
<< Line("int i;")
;
checkIndent(data);
}
C++ indenter: Add another ObjC test.
2010-10-06 15:39:53 +02:00
void tst_CodeFormatter::objcCall()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" [NSApp windows];")
<< Line(" [NSObject class];")
<< Line(" if (a)")
<< Line(" int a = [window drawers];")
<< Line("}")
<< Line("int y;")
;
checkIndent(data);
}
C++ indenter: Don't get confused on 'for (a in b)'. Reviewed-by: Roberto Raggi Reviewed-by: Erik Verbruggen
2010-10-06 13:50:04 +02:00
void tst_CodeFormatter::objcCallAndFor()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" NSArray *windows = [NSApp windows];")
<< Line(" for (NSWindow *window in windows) {")
<< Line(" NSArray *drawers = [window drawers];")
<< Line(" for (NSDrawer *drawer in drawers) {")
<< Line(" NSArray *views = [[drawer contentView] subviews];")
<< Line(" int x;")
<< Line(" }")
<< Line(" }")
<< Line("}")
<< Line("int y;")
;
checkIndent(data);
}
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
void tst_CodeFormatter::switch1()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" switch (a) {")
<< Line(" case 1:")
<< Line(" foo;")
<< Line(" if (a);")
<< Line(" case 2:")
<< Line(" case 3: {")
<< Line(" foo;")
<< Line(" }")
<< Line(" case 4:")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" case bar:")
<< Line(" break;")
<< Line(" }")
<< Line(" case 4:")
<< Line(" {")
<< Line(" if (a) {")
<< Line(" }")
<< Line(" }")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::memberInitializer()
{
QList<Line> data;
data << Line("void foo()")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ : baR()")
<< Line("~ , m_member(23)")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("{")
<< Line("}")
<< Line("class Foo {")
<< Line(" Foo()")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ : baR(),")
<< Line(" ~ moodoo(barR + ")
<< Line(" ~ 42),")
<< Line(" ~ xyz()")
C++ indenter: Indent member initializer lists correctly. Without requiring ',' to be an electric character. Task-number: QTCREATORBUG-1866 Reviewed-by: Roberto Raggi
2010-07-16 10:27:15 +02:00
<< Line(" {}")
<< Line("};")
<< Line("class Foo {")
<< Line(" Foo() :")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ baR(),")
<< Line(" ~ moo(barR)")
<< Line(" ~ , moo(barR)")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line(" {}")
<< Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::templates()
{
QList<Line> data;
data << Line("template <class T, typename F, int i>")
<< Line("class Foo {")
<< Line("private:")
<< Line("};")
<< Line("template <class T,")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ typename F, int i")
<< Line("~ >")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
<< Line("class Foo {")
<< Line("private:")
<< Line("};")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("template <template <class F,")
<< Line("~ class D>,")
<< Line("~ typename F>")
<< Line("class Foo { };")
<< Line("template <")
<< Line("~ template <")
<< Line("~ class F, class D>,")
<< Line("~ typename F>")
<< Line("class Foo { };")
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
;
checkIndent(data);
}
void tst_CodeFormatter::operatorOverloads()
{
QList<Line> data;
data << Line("struct S {")
<< Line(" void operator()() {")
<< Line(" foo;")
<< Line(" }")
<< Line(" void operator<<() {")
<< Line(" foo;")
<< Line(" }")
<< Line("};")
;
checkIndent(data);
}
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
void tst_CodeFormatter::gnuStyle()
{
QList<Line> data;
data << Line("struct S")
<< Line("{")
<< Line(" void foo()")
<< Line(" {")
<< Line(" if (a)")
<< Line(" {")
<< Line(" fpp;")
<< Line(" }")
C++ indenter: Fix 'else' indentation in GNU style.
2010-07-06 09:44:04 +02:00
<< Line(" else if (b)")
<< Line(" {")
<< Line(" fpp;")
<< Line(" }")
<< Line(" else")
<< Line(" {")
<< Line(" }")
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
<< Line(" if (b) {")
<< Line(" fpp;")
<< Line(" }")
C++ indenter: Fix for GNU and Whitesmiths style switch statement. Task-number: QTCREATORBUG-2994
2010-11-04 14:07:58 +01:00
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
<< Line(" }")
<< Line("};")
;
checkIndent(data, 1);
}
void tst_CodeFormatter::whitesmithsStyle()
{
QList<Line> data;
data << Line("struct S")
<< Line(" {")
<< Line(" void foo()")
<< Line(" {")
<< Line(" if (a)")
<< Line(" {")
<< Line(" fpp;")
<< Line(" }")
<< Line(" if (b) {")
<< Line(" fpp;")
<< Line(" }")
C++ indenter: Fix for GNU and Whitesmiths style switch statement. Task-number: QTCREATORBUG-2994
2010-11-04 14:07:58 +01:00
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
C++ indenter: Make building custom styles easier, fix style issues. Keep more information by using enter() instead of turnInto() when moving from a *_start to *_open.
2010-07-05 12:56:37 +02:00
<< Line(" }")
<< Line(" };")
;
checkIndent(data, 2);
}
C++ indenter: Enable class, struct, enum, namespace, using in functions. Fixes incorrect indentation we got previously when they were used in a statement context.
2010-07-08 08:35:12 +02:00
void tst_CodeFormatter::singleLineEnum()
{
QList<Line> data;
data << Line("enum { foo, bar, car = 2 };")
<< Line("void blah() {")
<< Line(" enum { foo, bar, car = 2 };")
<< Line(" int i;")
<< Line("}")
;
checkIndent(data);
}
C++ indenter: Don't add continuation indent after function return type. Task-number: QTCREATORBUG-1816
2010-07-08 08:48:36 +02:00
void tst_CodeFormatter::functionReturnType()
{
QList<Line> data;
data
<< Line("void")
<< Line("foo(int) {}")
<< Line("")
<< Line("const QList<int> &")
<< Line("A::foo() {}")
<< Line("")
<< Line("template <class T>")
<< Line("const QList<QMap<T, T> > &")
<< Line("A::B::foo() {}")
;
checkIndent(data);
}
C++ indenter: Respect user indent with stream operators. Reviewed-by: Erik Verbruggen
2010-07-15 16:14:22 +02:00
void tst_CodeFormatter::streamOp()
{
QList<Line> data;
data
<< Line("void foo () {")
<< Line(" qDebug() << foo")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" ~ << bar << moose")
<< Line(" ~ << bar +")
<< Line(" ~ foo - blah(1)")
<< Line(" ~ << '?'")
<< Line(" ~ << \"\\n\";")
C++ indenter: Respect user indent with stream operators. Reviewed-by: Erik Verbruggen
2010-07-15 16:14:22 +02:00
<< Line(" qDebug() << foo")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line(" << bar << moose", 4, 9)
<< Line(" ~ << bar +")
<< Line(" ~ foo - blah(1)")
<< Line(" ~ << '?'")
<< Line(" ~ << \"\\n\";")
C++ indenter: Respect user indent with stream operators. Reviewed-by: Erik Verbruggen
2010-07-15 16:14:22 +02:00
;
checkIndent(data);
}
C++ indenter: Fix indent of block statements in substatement blocks. Task-number: QTCREATORBUG-1919
2010-07-28 12:37:54 +02:00
void tst_CodeFormatter::blockStmtInIf()
{
QList<Line> data;
data
<< Line("void foo () {")
<< Line(" if (a) {")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
<< Line(" } else {")
<< Line(" {")
<< Line(" foo;")
<< Line(" }")
;
checkIndent(data);
}
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
void tst_CodeFormatter::nestedInitializer()
{
QList<Line> data;
data
<< Line("SomeStruct v[] = {")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ {2}, {3},")
<< Line("~ {4}, {5},")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line("};")
<< Line("S v[] = {{1}, {2},")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ {3}, {4},")
<< Line("~ };")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line("SomeStruct v[] = {")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ {")
<< Line("~ {2, 3,")
<< Line("~ 4, 5},")
<< Line("~ {1},")
<< Line("~ }")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line("};")
<< Line("SomeStruct v[] = {{{2, 3},")
C++ indenter: Separate indent into logical indent and padding.
2010-09-10 14:12:14 +02:00
<< Line("~ {4, 5}")
<< Line("~ },")
<< Line("~ {{2, 3},")
<< Line("~ {4, 5},")
<< Line("~ }")
<< Line("~ };")
C++ indenter: Fix nested array/struct initializers.
2010-08-31 09:45:01 +02:00
<< Line("int i;")
;
checkIndent(data);
}
C++ indenter: Fix for statement indentation and add test.
2010-09-15 10:57:57 +02:00
void tst_CodeFormatter::forStatement()
{
QList<Line> data;
data
<< Line("void foo()")
<< Line("{")
<< Line(" for (a; b; c)")
<< Line(" bar();")
<< Line(" for (a; b; c) {")
<< Line(" bar();")
<< Line(" }")
<< Line(" for (a; b; c)")
<< Line(" {")
<< Line(" bar();")
<< Line(" }")
<< Line(" for (a;")
<< Line(" ~ b;")
<< Line(" ~ c)")
<< Line(" bar();")
<< Line(" for (a;")
<< Line(" ~ b;")
<< Line(" ~ c) {")
<< Line(" bar();")
<< Line(" }")
<< Line(" for (a;")
<< Line(" ~ b;")
<< Line(" ~ c)")
<< Line(" {")
<< Line(" bar();")
<< Line(" }")
;
checkIndent(data);
}
C++ indenter: Fix indentation if template and class appear on one line. Task-number: QTCREATORBUG-2427
2010-09-24 15:08:08 +02:00
void tst_CodeFormatter::templateSingleline()
{
QList<Line> data;
data
<< Line("template <typename T> class Foo")
<< Line("{")
<< Line(" T t;")
<< Line("}")
;
checkIndent(data);
}
C++ indenter: Fix error recovery in function definitions. Task-number: QTCREATORBUG-1517
2010-09-24 15:58:23 +02:00
void tst_CodeFormatter::macrosNoSemicolon2()
{
QList<Line> data;
data
<< Line("FOO(ABC)")
<< Line("{")
<< Line(" BAR(FOO)")
<< Line("}")
<< Line("int i;")
;
checkIndent(data);
}
C++ indenter: Fix indentation after namespace aliases. Task-number: QTCREATORBUG-2574 Reviewed-by: Roberto Raggi
2010-10-19 12:49:09 +02:00
void tst_CodeFormatter::renamedNamespace()
{
QList<Line> data;
data
<< Line("namespace X = Y;")
<< Line("void foo()")
<< Line("{")
<< Line(" return;")
<< Line("}")
<< Line("int i;")
;
checkIndent(data);
}
C++ indenter: Add autotest for C++0x 'for' statement. Reviewed-by: trustme
2010-10-20 10:48:43 +02:00
void tst_CodeFormatter::cpp0xFor()
{
QList<Line> data;
data
<< Line("void foo()")
<< Line("{")
<< Line(" vector<int> x = setup();")
<< Line(" for(int p : x) {")
<< Line(" bar(p);")
<< Line(" }")
<< Line("}")
<< Line("void car()")
<< Line("{")
<< Line(" int i;")
;
checkIndent(data);
}
C++ indenter: Fix for GNU and Whitesmiths style switch statement. Task-number: QTCREATORBUG-2994
2010-11-04 14:07:58 +01:00
void tst_CodeFormatter::gnuStyleSwitch()
{
QList<Line> data;
data << Line("void foo()")
<< Line("{")
<< Line(" switch (a)")
<< Line(" {")
<< Line(" case 1:")
<< Line(" foo;")
<< Line(" break;")
<< Line(" case 2: {")
<< Line(" bar;")
<< Line(" continue;")
<< Line(" }")
<< Line(" case 3:")
<< Line(" {")
<< Line(" bar;")
<< Line(" continue;")
<< Line(" }")
<< Line(" case 4:")
<< Line(" case 5:")
<< Line(" ;")
<< Line(" }")
<< Line("}")
;
checkIndent(data, 1);
}
void tst_CodeFormatter::whitesmithsStyleSwitch()
{
QList<Line> data;
data << Line("void foo()")
<< Line(" {")
<< Line(" switch (a)")
<< Line(" {")
<< Line(" case 1:")
<< Line(" foo;")
<< Line(" break;")
<< Line(" case 2: {")
<< Line(" bar;")
<< Line(" continue;")
<< Line(" }")
<< Line(" case 3:")
<< Line(" {")
<< Line(" bar;")
<< Line(" continue;")
<< Line(" }")
<< Line(" case 4:")
<< Line(" case 5:")
<< Line(" ;")
<< Line(" }")
<< Line(" }")
;
checkIndent(data, 2);
}
C++ indenter: Align to next token instead of end of current. Task-number: QTCREATORBUG-3136 Reviewed-by: Erik Verbruggen
2010-11-19 18:02:14 +01:00
void tst_CodeFormatter::indentToNextToken()
{
QList<Line> data;
data << Line("void foo( int i,")
<< Line("~ int j) {")
<< Line(" a << foo + ")
<< Line(" ~ bar;")
<< Line(" if (a &&")
<< Line(" ~ b) {")
<< Line(" foo; }")
<< Line(" if ( a &&")
<< Line(" ~ b) {")
<< Line(" foo; }")
;
checkIndent(data);
}
C++ indenter: Fix labels. Reviewed-by: Roberto Raggi
2010-12-01 10:19:53 +01:00
void tst_CodeFormatter::labels()
{
QList<Line> data;
data << Line("void foo() {")
<< Line("lab:")
<< Line(" int abc;")
<< Line("def:")
<< Line(" if (a)")
<< Line("boo:")
<< Line(" foo;")
<< Line(" int j;")
;
checkIndent(data);
}
C++: Introduce the new CodeFormatter. Done-with: Erik Verbruggen
2010-07-02 15:43:34 +02:00
QTEST_APPLESS_MAIN(tst_CodeFormatter)
#include "tst_codeformatter.moc"
Copy Permalink