commit 1991e5d67330f3d02a5440937a2d0df106c0eda7
author Cameron Desrochers <cameron@moodycamel.com> Tue Nov 15 15:07:07 2016 +0000
committer Cameron Desrochers <cameron@moodycamel.com> Tue Nov 15 15:07:07 2016 +0000
tree a3e181f60894f3a59da509c50e392643cca51edd
parent 6a49aad177753474b0834c42ca319682af0befc5

[clang-format] Fixed line merging of more than two lines

Differential Revision: https://reviews.llvm.org/D19063

llvm-svn: 286973

clang/lib/Format/UnwrappedLineFormatter.cpp

diff --git a/clang/lib/Format/UnwrappedLineFormatter.cpp b/clang/lib/Format/UnwrappedLineFormatter.cpp
index 07bfe3e..d7f1c42 100644
--- a/clang/lib/Format/UnwrappedLineFormatter.cpp
+++ b/clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -151,7 +151,7 @@
           MergedLines = 0;
     if (!DryRun)
       for (unsigned i = 0; i < MergedLines; ++i)
-        join(*Next[i], *Next[i + 1]);
+        join(*Next[0], *Next[i + 1]);
     Next = Next + MergedLines + 1;
     return Current;
   }