commit bcca7e484117f3155ff98f9560996e760ca4f786
author Daniel Jasper <djasper@google.com> Wed Mar 20 10:23:53 2013 +0000
committer Daniel Jasper <djasper@google.com> Wed Mar 20 10:23:53 2013 +0000
tree 5eea66a6ed85122a5b897b95292a05f1f52be259
parent 7c4a9a04b4b2a44259b34078434e087987872095

Don't remove all indentation when in #defines.

Otherwise, this can become hard to read.

Before: #define A \
        case 1:
After:  #define A \
           case 1:

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

lib/Format/UnwrappedLineParser.cpp

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index a438a53..b43cc07 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -574,7 +574,7 @@
     return;
   nextToken();
   unsigned OldLineLevel = Line->Level;
-  if (Line->Level > 0)
+  if (Line->Level > 1 || (!Line->InPPDirective && Line->Level > 0))
     --Line->Level;
   if (CommentsBeforeNextToken.empty() && FormatTok.Tok.is(tok::l_brace)) {
     parseBlock(/*MustBeDeclaration=*/ false);

unittests/Format/FormatTest.cpp

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 18ba143..3253347 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -441,6 +441,11 @@
                "  }\n"
                "  break;\n"
                "}");
+  verifyFormat("#define A          \\\n"
+               "  switch (x) {     \\\n"
+               "  case a:          \\\n"
+               "    foo = b;       \\\n"
+               "  }", getLLVMStyleWithColumns(20));
 
   verifyGoogleFormat("switch (x) {\n"
                      "  case 1:\n"
@@ -1209,7 +1214,7 @@
 
   // FIXME: Improve formatting of case labels in macros.
   verifyFormat("#define SOMECASES  \\\n"
-               "case 1:            \\\n"
+               "  case 1:          \\\n"
                "  case 2\n",
                getLLVMStyleWithColumns(20));