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.

llvm-svn: 222423
This commit is contained in:
Daniel Jasper 2014-11-20 09:48:11 +00:00
parent 5a83192570
commit caf8685958
2 changed files with 8 additions and 0 deletions

View File

@ -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 &&

View File

@ -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) {