This is an archive of the discontinued LLVM Phabricator instance.

Differential D6331

clang-format: don't force break before generic type method
ClosedPublic

Authored by het on Nov 19 2014, 5:38 PM.

Details

Reviewers
djasper
Summary

Before

Foo.bar()
    .<X>
    baz();

After

Foo.bar()
    .<X>baz();

Diff Detail

Event Timeline

het updated this revision to Diff 16407.Nov 19 2014, 5:38 PM
het retitled this revision from to clang-format: don't force break before generic type method.
het updated this object.
het edited the test plan for this revision. (Show Details)
het added a reviewer: djasper.
het set the repository for this revision to rL LLVM.
het added a subscriber: Unknown Object (MLST).
Herald added a subscriber: klimek. · View Herald TranscriptNov 19 2014, 5:38 PM
djasper accepted this revision.Nov 20 2014, 1:48 AM
djasper edited edge metadata.

Submitted as r222423.

This revision is now accepted and ready to land.Nov 20 2014, 1:48 AM
djasper closed this revision.Nov 20 2014, 1:48 AM

Revision Contents

PathSize
lib/
Format/
1 line
unittests/
Format/
7 lines

Diff 16407

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 872 Lines • ▼ Show 20 Lines bool isStartOfName(const FormatToken &Tok) {
bool IsPPKeyword = PreviousNotConst->is(tok::identifier) && bool IsPPKeyword = PreviousNotConst->is(tok::identifier) &&
PreviousNotConst->Previous && PreviousNotConst->Previous &&
PreviousNotConst->Previous->is(tok::hash); PreviousNotConst->Previous->is(tok::hash);
if (PreviousNotConst->Type == TT_TemplateCloser) if (PreviousNotConst->Type == TT_TemplateCloser)
return PreviousNotConst && PreviousNotConst->MatchingParen && return PreviousNotConst && PreviousNotConst->MatchingParen &&
PreviousNotConst->MatchingParen->Previous && PreviousNotConst->MatchingParen->Previous &&
PreviousNotConst->MatchingParen->Previous->isNot(tok::period) &&
PreviousNotConst->MatchingParen->Previous->isNot(tok::kw_template); PreviousNotConst->MatchingParen->Previous->isNot(tok::kw_template);
if (PreviousNotConst->is(tok::r_paren) && PreviousNotConst->MatchingParen && if (PreviousNotConst->is(tok::r_paren) && PreviousNotConst->MatchingParen &&
PreviousNotConst->MatchingParen->Previous && PreviousNotConst->MatchingParen->Previous &&
PreviousNotConst->MatchingParen->Previous->is(tok::kw_decltype)) PreviousNotConst->MatchingParen->Previous->is(tok::kw_decltype))
return true; return true;
return (!IsPPKeyword && PreviousNotConst->is(tok::identifier)) || return (!IsPPKeyword && PreviousNotConst->is(tok::identifier)) ||
▲ Show 20 Lines • Show All 1,137 Lines • Show Last 20 Lines

unittests/Format/FormatTestJava.cpp

Show First 20 Lines • Show All 228 Lines • ▼ Show 20 LinesTEST_F(FormatTestJava, Generics) {
verifyFormat("protected <R> ArrayList<R> get() {\n}"); verifyFormat("protected <R> ArrayList<R> get() {\n}");
verifyFormat("private <R> ArrayList<R> get() {\n}"); verifyFormat("private <R> ArrayList<R> get() {\n}");
verifyFormat("public static <R> ArrayList<R> get() {\n}"); verifyFormat("public static <R> ArrayList<R> get() {\n}");
verifyFormat("<T extends B> T getInstance(Class<T> type);"); verifyFormat("<T extends B> T getInstance(Class<T> type);");
verifyFormat("Function<F, ? extends T> function;"); verifyFormat("Function<F, ? extends T> function;");
verifyFormat("private Foo<X, Y>[] foos;"); verifyFormat("private Foo<X, Y>[] foos;");
verifyFormat("Foo<X, Y>[] foos = this.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) { TEST_F(FormatTestJava, StringConcatenation) {
verifyFormat("String someString = \"abc\"\n" verifyFormat("String someString = \"abc\"\n"
" + \"cde\";"); " + \"cde\";");
} }
TEST_F(FormatTestJava, TryCatchFinally) { TEST_F(FormatTestJava, TryCatchFinally) {
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines