summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-12-02 09:19:27 +0000
committerDaniel Jasper <djasper@google.com>2013-12-02 09:19:27 +0000
commit0e81f1ad43e1bf87b70ac6500bd360b00db378fa (patch)
tree888225c12b239d44d3e23c3c075812cb49e3eb88 /clang/lib/Format
parent08b9cf56be30b483f35c0401a8997473f456e025 (diff)
downloadbcm5719-llvm-0e81f1ad43e1bf87b70ac6500bd360b00db378fa.tar.gz
bcm5719-llvm-0e81f1ad43e1bf87b70ac6500bd360b00db378fa.zip
clang-format: Fix excessive formatting caused by r195954.
Due to a bug in the patch, clang-format would more or less simply format all multi-line comments. llvm-svn: 196080
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/Format.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 7f912394778..28ef19e192f 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -1457,6 +1457,7 @@ private:
bool IsContinuedComment = Line->First->is(tok::comment) &&
Line->First->Next == NULL &&
Line->First->NewlinesBefore < 2 && PreviousLine &&
+ PreviousLine->Affected &&
PreviousLine->Last->is(tok::comment);
if (SomeTokenAffected || SomeFirstChildAffected || LineMoved ||
OpenPOWER on IntegriCloud