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

clang-format: [Java] Space before array initializers. 

Before:
  new int[]{1, 2, 3, 4};

After:
  new int[] {1, 2, 3, 4};

llvm-svn: 222640
This commit is contained in:
Daniel Jasper 2014-11-23 20:54:37 +00:00
parent bb86d847ba
commit a0143fab5e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1712,6 +1712,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
if (Left.is(Keywords.kw_var))
return true;
} else if (Style.Language == FormatStyle::LK_Java) {
if (Left.is(tok::r_square) && Right.is(tok::l_brace))
return true;
if (Left.is(TT_LambdaArrow) || Right.is(TT_LambdaArrow))
return true;
if (Left.is(Keywords.kw_synchronized) && Right.is(tok::l_paren))

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

@ -144,8 +144,8 @@ TEST_F(FormatTestJava, EnumDeclarations) {
" }\n"
"}");
verifyFormat("enum SomeThing {\n"
" ABC(new int[]{1, 2}),\n"
" CDE(new int[]{2, 3});\n"
" ABC(new int[] {1, 2}),\n"
" CDE(new int[] {2, 3});\n"
" Something(int[] i) {\n"
" }\n"
"}");
@ -180,6 +180,13 @@ TEST_F(FormatTestJava, EnumDeclarations) {
"}");
}
TEST_F(FormatTestJava, ArrayInitializers) {
verifyFormat("new int[] {1, 2, 3, 4};");
verifyFormat("new int[] {\n"
" 1, 2, 3, 4,\n"
"};");
}
TEST_F(FormatTestJava, ThrowsDeclarations) {
verifyFormat("public void doSooooooooooooooooooooooooooomething()\n"
" throws LooooooooooooooooooooooooooooongException {\n}");