commit ac5c97e36b589926d6883cf4a246ec2ba94d35ee
author Daniel Jasper <djasper@google.com> Mon Mar 09 08:13:55 2015 +0000
committer Daniel Jasper <djasper@google.com> Mon Mar 09 08:13:55 2015 +0000
tree 0c2f55a3ca16eb6fd46d17875028a6222165e3a4
parent 65b07b8e1b73816dc7f339e2c461f1bc72443319

clang-format: Don't remove newline if macro ends in access specifier.

I.e.:

  #define A public:

  // The new line before this line would be removed.
  int a;

llvm-svn: 231636

clang/lib/Format/UnwrappedLineFormatter.cpp

diff --git a/clang/lib/Format/UnwrappedLineFormatter.cpp b/clang/lib/Format/UnwrappedLineFormatter.cpp
index 8e6809f..71e8b3f 100644
--- a/clang/lib/Format/UnwrappedLineFormatter.cpp
+++ b/clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -512,7 +512,8 @@
     ++Newlines;
 
   // Remove empty lines after access specifiers.
-  if (PreviousLine && PreviousLine->First->isAccessSpecifier())
+  if (PreviousLine && PreviousLine->First->isAccessSpecifier() &&
+      (!PreviousLine->InPPDirective || !RootToken.HasUnescapedNewline))
     Newlines = std::min(1u, Newlines);
 
   Whitespaces->replaceWhitespace(RootToken, Newlines, IndentLevel, Indent,