diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-28 07:35:34 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-28 07:35:34 +0000 |
| commit | 986e17ff3bd3df2762f88569cab3fdfbabc08bb1 (patch) | |
| tree | d85a2294d2313a5c74f8ecfbe95f601cf2a510a3 /unittests/Format/FormatTest.cpp | |
| parent | 3e335c118140c40b264a26b13e44af368514cb87 (diff) | |
Avoid confusing identations for multi-parameter functions.
Before:
aaaaaaaa(aaaaaaaaa(
aaaaaaaaaa(),
aaaaaaaaa);
After:
aaaaaaaa(aaaaaaaaa(
aaaaaaaaaa(),
aaaaaaaaa);
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173673 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 7d274832a3..d877dc29e5 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -796,13 +796,15 @@ TEST_F(FormatTest, LayoutStatementsAroundPreprocessorDirectives) { " a;", format("int\n#define A\na;")); verifyFormat( - "functionCallTo(someOtherFunction(\n" - " withSomeParameters, whichInSequence,\n" - " areLongerThanALine(andAnotherCall,\n" + "functionCallTo(\n" + " someOtherFunction(\n" + " withSomeParameters, whichInSequence,\n" + " areLongerThanALine(andAnotherCall,\n" "#define A B\n" - " withMoreParamters,\n" - " whichStronglyInfluenceTheLayout),\n" - " andMoreParameters), trailing);", getLLVMStyleWithColumns(69)); + " withMoreParamters,\n" + " whichStronglyInfluenceTheLayout),\n" + " andMoreParameters), trailing);", + getLLVMStyleWithColumns(69)); } TEST_F(FormatTest, LayoutBlockInsideParens) { @@ -849,11 +851,29 @@ TEST_F(FormatTest, FormatsFunctionDefinition) { TEST_F(FormatTest, FormatsAwesomeMethodCall) { verifyFormat( - "SomeLongMethodName(SomeReallyLongMethod(\n" - " CallOtherReallyLongMethod(parameter, parameter, parameter)),\n" + "SomeLongMethodName(SomeReallyLongMethod(CallOtherReallyLongMethod(\n" + " parameter, parameter, parameter)),\n" " SecondLongCall(parameter));"); } +TEST_F(FormatTest, HigherIndentsForDeeperNestedParameters) { + verifyFormat( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" + " aaaaaaaaaaaaaaaaaaaaaaaa(\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n" + " aaaaaaaaaaaaaaaaaaaaaaaa);"); + verifyFormat( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[\n" + " aaaaaaaaaaaaaaaaaaaaaaaa[\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa],\n" + " aaaaaaaaaaaaaaaaaaaaaaaa];"); + verifyFormat( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n" + " aaaaaaaaaaaaaaaaaaaaaaaa<\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>,\n" + " aaaaaaaaaaaaaaaaaaaaaaaa>;"); +} + TEST_F(FormatTest, ConstructorInitializers) { verifyFormat("Constructor() : Initializer(FitsOnTheLine) {}"); verifyFormat("Constructor() : Inttializer(FitsOnTheLine) {}", |