summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-10-21 11:34:53 +0000
committerDaniel Jasper <djasper@google.com>2014-10-21 11:34:53 +0000
commitc0126864a0fbcd78e9dcf02faec43891691b77d4 (patch)
treed75c220bed090c25cc95f3181cc9fec5424f4bdb /clang/lib/Format/TokenAnnotator.cpp
parentd78c42237873af0dff693e9f6a691ba877d61b1a (diff)
downloadbcm5719-llvm-c0126864a0fbcd78e9dcf02faec43891691b77d4.tar.gz
bcm5719-llvm-c0126864a0fbcd78e9dcf02faec43891691b77d4.zip
clang-format: [Java] Understand string literal concatenation.
Before: String someString = "abc" + "cde"; After: String someString = "abc" + "cde"; llvm-svn: 220287
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index db0e9316598..1949510af7b 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1805,6 +1805,9 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line,
if (Left.Type == TT_JavaAnnotation && Right.isNot(tok::l_paren) &&
Line.Last->is(tok::l_brace))
return true;
+ if (Right.is(tok::plus) && Left.is(tok::string_literal) && Right.Next &&
+ Right.Next->is(tok::string_literal))
+ return true;
}
return false;
OpenPOWER on IntegriCloud