Add return missing in r182855.

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

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 316d324f7a4a2f075dd19ae824f6001b0775c2df..3b72bef6012765488972d93819cf85e3ece9a53a 100644 (file)
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -601,6 +601,7 @@ void UnwrappedLineParser::parseStructuralElement() {
                    Text == Text.upper()) {
           // Recognize free-standing macros like Q_OBJECT.
           addUnwrappedLine();
+          return;
         }
       }
       break;

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index eacd189840f1daf8e4baade0228f2278d5364c13..18a1a008582640a3fa2d3f1a589893b21680b607 100644 (file)
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1702,6 +1702,14 @@ TEST_F(FormatTest, MacrosWithoutTrailingSemicolon) {
                    "\n"
                    "  A() {\n}\n"
                    "}  ;"));
+  EXPECT_EQ("SOME_MACRO\n"
+            "namespace {\n"
+            "void f();\n"
+            "}",
+            format("SOME_MACRO\n"
+                   "  namespace    {\n"
+                   "void   f(  );\n"
+                   "}"));
   // Only if the identifier contains at least 5 characters.
   EXPECT_EQ("HTTP f();",
             format("HTTP\nf();"));