More precisely recognize ObjC method declarations.

Otherwise, +/- and the beginning of constants can be recognized
incorrectly.

Before:  #define A - 1
After:   #define A -1

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177725 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 3578162c3f6980e9b06feda8a26beae9017b6642..7e3ef75d3dc107ca9dde705fe13f10aa899fe0ce 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -313,9 +313,11 @@ private:
     switch (Tok->FormatTok.Tok.getKind()) {
     case tok::plus:
     case tok::minus:
-      // At the start of the line, +/- specific ObjectiveC method
-      // declarations.
-      if (Tok->Parent == NULL)
+      // At the start of the line, +/- specify ObjectiveC method declarations.
+      if (Tok->Children.empty() || Tok->Children[0].Children.empty())
+        break; // Can't be an ObjectiveC method declaration.
+      if (Tok->Parent == NULL && (Tok->Children[0].is(tok::l_paren) ||
+                                  Tok->Children[0].Children[0].is(tok::colon)))
         Tok->Type = TT_ObjCMethodSpecifier;
       break;
     case tok::colon:

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index dc77c77e450332968d317f98bda4980eb3f85e68..051deebc0912924059c5431310c686f8a4e11890 100644 (file)
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -2067,6 +2067,8 @@ TEST_F(FormatTest, UnderstandsUnaryOperators) {
                "case -1:\n"
                "  break;\n"
                "}");
+  verifyFormat("#define X -1");
+  verifyFormat("#define X -kConstant");
 
   verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { -5, +3 };");
   verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { +5, -3 };");