]> granicus.if.org Git - clang/commitdiff
clang-format: [Java] Understand string literal concatenation.
authorDaniel Jasper <djasper@google.com>
Tue, 21 Oct 2014 11:34:53 +0000 (11:34 +0000)
committerDaniel Jasper <djasper@google.com>
Tue, 21 Oct 2014 11:34:53 +0000 (11:34 +0000)
Before:
  String someString = "abc" + "cde";

After:
  String someString = "abc"
                      + "cde";

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@220287 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/TokenAnnotator.cpp
unittests/Format/FormatTestJava.cpp

index db0e93165981f00138bc8a9e005ddec059651238..1949510af7b4a8fd46501a2e797af0ad8fadc525 100644 (file)
@@ -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;
index d38a8070bdce68c4e5cbd60fb188a685d629bd4d..f114ca28610cf07de165ba75646743681712a6fe 100644 (file)
@@ -97,5 +97,10 @@ TEST_F(FormatTestJava, Generics) {
   verifyFormat("A.<B>doSomething();");
 }
 
+TEST_F(FormatTestJava, StringConcatenation) {
+  verifyFormat("String someString = \"abc\"\n"
+               "                    + \"cde\";");
+}
+
 } // end namespace tooling
 } // end namespace clang