[cfe-commits] r173290 - in /cfe/trunk: lib/Format/Format.cpp unittests/Format/FormatTest.cpp
Daniel Jasper
djasper at google.com
Wed Jan 23 12:41:06 PST 2013
Author: djasper
Date: Wed Jan 23 14:41:06 2013
New Revision: 173290
URL: http://llvm.org/viewvc/llvm-project?rev=173290&view=rev
Log:
Add extra indent for nested calls inside if's.
Before:
if (aaaaaaaaaa(
aaaaaaaaaa)) {}
After:
if (aaaaaaaaaa(
aaaaaaaaaa)) {}
Modified:
cfe/trunk/lib/Format/Format.cpp
cfe/trunk/unittests/Format/FormatTest.cpp
Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=173290&r1=173289&r2=173290&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Wed Jan 23 14:41:06 2013
@@ -604,10 +604,14 @@
Current.isNot(tok::comment))
State.Stack[ParenLevel].HasMultiParameterLine = true;
- // Top-level spaces are exempt as that mostly leads to better results.
State.Column += Spaces;
- if (Spaces > 0 && ParenLevel != 0)
- State.Stack[ParenLevel].LastSpace = State.Column;
+ if (Current.is(tok::l_paren) && Previous.is(tok::kw_if))
+ // Treat the condition inside an if as if it was a second function
+ // parameter, i.e. let nested calls have an indent of 4.
+ State.Stack.back().LastSpace = State.Column + 1; // 1 is length of "(".
+ else if (Spaces > 0 && ParenLevel != 0)
+ // Top-level spaces are exempt as that mostly leads to better results.
+ State.Stack.back().LastSpace = State.Column;
}
// If we break after an {, we should also break before the corresponding }.
Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=173290&r1=173289&r2=173290&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Jan 23 14:41:06 2013
@@ -928,6 +928,9 @@
verifyFormat("if (aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
" aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
" aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa)) {\n}");
+ verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
+ " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)) {\n"
+ "}");
verifyFormat(
"aaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
More information about the cfe-commits
mailing list