diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-06 16:00:26 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-06 16:00:26 +0000 |
| commit | 9e9e6e0297a96e237b53e6be433749065bcea5f8 (patch) | |
| tree | c9df3b668eaa31309ae74ad1cea978c5bea243d9 | |
| parent | b8b1ce12362860e55590c55fd43db875c9193357 (diff) | |
Fix formatting of ObjC method calls.
This fixes llvm.org/PR15165.
We now correctly align:
[image_rep drawInRect:drawRect
fromRect:NSZeroRect
operation:NSCompositeCopy
fraction:1.0
ssssssssdd:NO
hints:nil];
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174513 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index eac822c5b7..3660b4ac03 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -488,7 +488,7 @@ private: State.Stack.back().Indent + Current.LongestObjCSelectorName; else State.Stack.back().ColonPos = - State.Column + Spaces + Current.LongestObjCSelectorName; + State.Column + Spaces + Current.FormatTok.TokenLength; } // FIXME: Do we need to do this for assignments nested in other diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index fc95acca52..c2e845b9be 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -2381,6 +2381,12 @@ TEST_F(FormatTest, FormatObjCMethodExpr) { " selector:@selector(willEnterFullscreen)\n" " name:kWillEnterFullscreenNotification\n" " object:nil];"); + verifyFormat("[image_rep drawInRect:drawRect\n" + " fromRect:NSZeroRect\n" + " operation:NSCompositeCopy\n" + " fraction:1.0\n" + " respectFlipped:NO\n" + " hints:nil];"); } TEST_F(FormatTest, ObjCAt) { |