commit 35e4122f48e3492073210f91f15fc18b2f52c9f0
author Daniel Jasper <djasper@google.com> Tue Nov 29 09:40:01 2016 +0000
committer Daniel Jasper <djasper@google.com> Tue Nov 29 09:40:01 2016 +0000
tree b7bdb6aaf476ccded19dcdab502cd79b4e2ce836
parent 65abfb110262caccf20302f52283fbde0f94bb20

clang-format: Fix unnnecessary line break.

Before:
  aaaaaaaaaa(aaaa(aaaa,
		  aaaa), //
	     aaaa,
             aaaaa);

After:
  aaaaaaaaaa(aaaa(aaaa,
		  aaaa), //
	     aaaa, aaaaa);

llvm-svn: 288119

clang/lib/Format/ContinuationIndenter.cpp

diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index e74515e..2117a0e 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -523,7 +523,8 @@
           Style.ContinuationIndentWidth;
   }
 
-  if ((Previous.isOneOf(tok::comma, tok::semi) &&
+  if ((PreviousNonComment &&
+       PreviousNonComment->isOneOf(tok::comma, tok::semi) &&
        !State.Stack.back().AvoidBinPacking) ||
       Previous.is(TT_BinaryOperator))
     State.Stack.back().BreakBeforeParameter = false;