commit 3f2cde91d8b66d2d086fa08ee874535ba3b6a4ec
author Daniel Jasper <djasper@google.com> Mon Sep 26 15:14:24 2016 +0000
committer Daniel Jasper <djasper@google.com> Mon Sep 26 15:14:24 2016 +0000
tree 185b69834f961b75a1ff392127937b514b98690f
parent 160572855dec877a5aa153130f9a3b40c722f839

clang-format: Only special-case top-level */& in multivar-declstmts.

Before (even with PointerAlignment: Left):
  vector<int *> a, b;

After:
  vector<int*> a, b;

llvm-svn: 282410

clang/lib/Format/TokenAnnotator.cpp

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 75eb137..72d8697 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2015,7 +2015,7 @@
                                      Left.Previous->is(tok::r_paren)) ||
             (!Left.isOneOf(TT_PointerOrReference, tok::l_paren) &&
              (Style.PointerAlignment != FormatStyle::PAS_Left ||
-              Line.IsMultiVariableDeclStmt)));
+              (Line.IsMultiVariableDeclStmt && Left.NestingLevel == 0))));
   if (Right.is(TT_FunctionTypeLParen) && Left.isNot(tok::l_paren) &&
       (!Left.is(TT_PointerOrReference) ||
        (Style.PointerAlignment != FormatStyle::PAS_Right &&