r222423 - clang-format: [Java] Don't force break before generic type method.
Daniel Jasper
djasper at google.com
Thu Nov 20 01:48:12 PST 2014
Author: djasper
Date: Thu Nov 20 03:48:11 2014
New Revision: 222423
URL: http://llvm.org/viewvc/llvm-project?rev=222423&view=rev
Log:
clang-format: [Java] Don't force break before generic type method.
Before:
Foo.bar()
.<X>
baz();
After:
Foo.bar()
.<X>baz();
Patch by Harry Terkelsen.
Modified:
cfe/trunk/lib/Format/TokenAnnotator.cpp
cfe/trunk/unittests/Format/FormatTestJava.cpp
Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=222423&r1=222422&r2=222423&view=diff
==============================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Thu Nov 20 03:48:11 2014
@@ -878,6 +878,7 @@ private:
if (PreviousNotConst->Type == TT_TemplateCloser)
return PreviousNotConst && PreviousNotConst->MatchingParen &&
PreviousNotConst->MatchingParen->Previous &&
+ PreviousNotConst->MatchingParen->Previous->isNot(tok::period) &&
PreviousNotConst->MatchingParen->Previous->isNot(tok::kw_template);
if (PreviousNotConst->is(tok::r_paren) && PreviousNotConst->MatchingParen &&
Modified: cfe/trunk/unittests/Format/FormatTestJava.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJava.cpp?rev=222423&r1=222422&r2=222423&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTestJava.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTestJava.cpp Thu Nov 20 03:48:11 2014
@@ -234,6 +234,13 @@ TEST_F(FormatTestJava, Generics) {
verifyFormat("private Foo<X, Y>[] foos;");
verifyFormat("Foo<X, Y>[] foos = this.foos;");
+
+ verifyFormat(
+ "SomeLoooooooooooooooooooooongType name =\n"
+ " SomeType.foo(someArgument)\n"
+ " .<X>method()\n"
+ " .aaaaaaaaaaaaaaaaaaa()\n"
+ " .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
}
TEST_F(FormatTestJava, StringConcatenation) {
More information about the cfe-commits
mailing list