maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Don't insert spaces in front of :: for Java 8 Method References. 

The existing code kept the space if it was there for identifiers, and it didn't
handle `this`. After this patch, for Java `this` is handled in addition to
identifiers, and existing space is always stripped between identifier and `::`.

Also accept `::` in addition to `.` in front of `<` in `foo::<T>bar` generic
calls.

Differential Revision: https://reviews.llvm.org/D52842

llvm-svn: 343872
This commit is contained in:
Nico Weber 2018-10-05 18:22:21 +00:00
parent 0ed892da70
commit 208661b206
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Format/TokenAnnotator.cpp
View File

@ -2555,8 +2555,11 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
return false; return false;
if (Left.is(TT_TemplateCloser) && Left.MatchingParen && if (Left.is(TT_TemplateCloser) && Left.MatchingParen &&
Left.MatchingParen->Previous && Left.MatchingParen->Previous &&
Left.MatchingParen->Previous->is(tok::period)) (Left.MatchingParen->Previous->is(tok::period) ||
Left.MatchingParen->Previous->is(tok::coloncolon)))
// Java call to generic function with explicit type:
// A.<B<C<...>>>DoSomething(); // A.<B<C<...>>>DoSomething();
// A::<B<C<...>>>DoSomething(); // With a Java 8 method reference.
return false; return false;
if (Left.is(TT_TemplateCloser) && Right.is(tok::l_square)) if (Left.is(TT_TemplateCloser) && Right.is(tok::l_square))
return false; return false;
@ -2776,6 +2779,9 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
if (!Style.SpaceBeforeAssignmentOperators && if (!Style.SpaceBeforeAssignmentOperators &&
Right.getPrecedence() == prec::Assignment) Right.getPrecedence() == prec::Assignment)
return false; return false;
if (Style.Language == FormatStyle::LK_Java && Right.is(tok::coloncolon) &&
(Left.is(tok::identifier) || Left.is(tok::kw_this)))
return false;
if (Right.is(tok::coloncolon) && Left.is(tok::identifier)) if (Right.is(tok::coloncolon) && Left.is(tok::identifier))
// Generally don't remove existing spaces between an identifier and "::". // Generally don't remove existing spaces between an identifier and "::".
// The identifier might actually be a macro name such as ALWAYS_INLINE. If // The identifier might actually be a macro name such as ALWAYS_INLINE. If

16
clang/unittests/Format/FormatTestJava.cpp
View File

@ -443,6 +443,22 @@ TEST_F(FormatTestJava, MethodDeclarations) {
getStyleWithColumns(40)); getStyleWithColumns(40));
} }
TEST_F(FormatTestJava, MethodReference) {
EXPECT_EQ(
"private void foo() {\n"
" f(this::methodReference);\n"
" f(C.super::methodReference);\n"
" Consumer<String> c = System.out::println;\n"
" Iface<Integer> mRef = Ty::<Integer>meth;\n"
"}",
format("private void foo() {\n"
" f(this ::methodReference);\n"
" f(C.super ::methodReference);\n"
" Consumer<String> c = System.out ::println;\n"
" Iface<Integer> mRef = Ty :: <Integer> meth;\n"
"}"));
}
TEST_F(FormatTestJava, CppKeywords) { TEST_F(FormatTestJava, CppKeywords) {
verifyFormat("public void union(Type a, Type b);"); verifyFormat("public void union(Type a, Type b);");
verifyFormat("public void struct(Object o);"); verifyFormat("public void struct(Object o);");