aboutsummaryrefslogtreecommitdiff
path: root/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-01-23 15:55:19 +0000
committerDaniel Jasper <djasper@google.com>2013-01-23 15:55:19 +0000
commit13cb7c2c46bca6f52fd217091ef2922a3eca46f5 (patch)
treef5d76666feb2e5987bb99e70c3141baf3817e4f9 /lib/Format/Format.cpp
parent7ccbc2156bfe473f080b585130d70e51c4b62bb0 (diff)
Don't try to do a hanging ident after assignments.
Before: bool aaaa = aaaaaaaaaaa( aaaaaaaaaaaaaaaaa); After: bool aaaa = aaaaaaaaaaa( aaaaaaaaaaaaaaaaa); The other indentation was a nice attempt but doesn't work in many cases. Not sure what the right long term solution is as the "After: " is still not nice. We either need to figure out what to do in the cases where it "doesn't work" or come up with a third solution, e.g. falling back to: bool aaaa = aaaaaaaaaaa( aaaaaaaaaaaaaaaaa); which should always work and nicely highlight the structure. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173268 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
-rw-r--r--lib/Format/Format.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 2952067c39..9b6067c37b 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -596,12 +596,9 @@ private:
Current.isNot(tok::comment))
State.Stack[ParenLevel].HasMultiParameterLine = true;
-
- // Top-level spaces that are not part of assignments are exempt as that
- // mostly leads to better results.
+ // Top-level spaces are exempt as that mostly leads to better results.
State.Column += Spaces;
- if (Spaces > 0 &&
- (ParenLevel != 0 || getPrecedence(Previous) == prec::Assignment))
+ if (Spaces > 0 && ParenLevel != 0)
State.Stack[ParenLevel].LastSpace = State.Column;
}