intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 16:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Add SFS_Empty to only empty functions on a single line.

Browse Source 
Activated for and tested by Google's Java style.

This fixes llvm.org/PR21667.

llvm-svn: 222819
This commit is contained in:
Daniel Jasper
2014-11-26 10:43:58 +00:00
parent 3e4542eac4
commit 9e709351c5
4 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,13 +105,11 @@ TEST_F(FormatTestJava, ClassDeclarations) {
getStyleWithColumns(60));
verifyFormat("@SomeAnnotation()\n"
"abstract class aaaaaaaaaaaa\n"
" extends bbbbbbbbbbbbbbb implements cccccccccccc {\n"
"}",
" extends bbbbbbbbbbbbbbb implements cccccccccccc {}",
getStyleWithColumns(76));
verifyFormat("@SomeAnnotation()\n"
"abstract class aaaaaaaaa<a>\n"
" extends bbbbbbbbbbbb<b> implements cccccccccccc {\n"
"}",
" extends bbbbbbbbbbbb<b> implements cccccccccccc {}",
getStyleWithColumns(76));
verifyFormat("interface SomeInterface<A> extends Foo, Bar {\n"
" void doStuff(int theStuff);\n"
@@ -139,31 +137,26 @@ TEST_F(FormatTestJava, EnumDeclarations) {
"}");
verifyFormat("public class SomeClass {\n"
" enum SomeThing { ABC, CDE }\n"
" void f() {\n"
" }\n"
" void f() {}\n"
"}");
verifyFormat("public class SomeClass implements SomeInterface {\n"
" enum SomeThing { ABC, CDE }\n"
" void f() {\n"
" }\n"
" void f() {}\n"
"}");
verifyFormat("enum SomeThing {\n"
" ABC,\n"
" CDE;\n"
" void f() {\n"
" }\n"
" void f() {}\n"
"}");
verifyFormat("enum SomeThing {\n"
" ABC(1, \"ABC\"),\n"
" CDE(2, \"CDE\");\n"
" Something(int i, String s) {\n"
" }\n"
" Something(int i, String s) {}\n"
"}");
verifyFormat("enum SomeThing {\n"
" ABC(new int[] {1, 2}),\n"
" CDE(new int[] {2, 3});\n"
" Something(int[] i) {\n"
" }\n"
" Something(int[] i) {}\n"
"}");
verifyFormat("public enum SomeThing {\n"
" ABC {\n"
@@ -177,8 +170,7 @@ TEST_F(FormatTestJava, EnumDeclarations) {
" return \"CDE\";\n"
" }\n"
" };\n"
" public void f() {\n"
" }\n"
" public void f() {}\n"
"}");
verifyFormat("private enum SomeEnum implements Foo<?, B> {\n"
" ABC {\n"
@@ -205,30 +197,28 @@ TEST_F(FormatTestJava, ArrayInitializers) {
TEST_F(FormatTestJava, ThrowsDeclarations) {
verifyFormat("public void doSooooooooooooooooooooooooooomething()\n"
" throws LooooooooooooooooooooooooooooongException {\n}");
" throws LooooooooooooooooooooooooooooongException {}");
}
TEST_F(FormatTestJava, Annotations) {
verifyFormat("@Override\n"
"public String toString() {\n}");
"public String toString() {}");
verifyFormat("@Override\n"
"@Nullable\n"
"public String getNameIfPresent() {\n}");
"public String getNameIfPresent() {}");
verifyFormat("@SuppressWarnings(value = \"unchecked\")\n"
"public void doSomething() {\n}");
"public void doSomething() {}");
verifyFormat("@SuppressWarnings(value = \"unchecked\")\n"
"@Author(name = \"abc\")\n"
"public void doSomething() {\n}");
"public void doSomething() {}");
verifyFormat("DoSomething(new A() {\n"
" @Override\n"
" public String toString() {\n"
" }\n"
" public String toString() {}\n"
"});");
verifyFormat("void SomeFunction(@Nullable String something) {\n"
"}");
verifyFormat("void SomeFunction(@Nullable String something) {}");
verifyFormat("@Partial @Mock DataLoader loader;");
verifyFormat("@SuppressWarnings(value = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\")\n"
@@ -246,13 +236,13 @@ TEST_F(FormatTestJava, Generics) {
verifyFormat("A.<B>doSomething();");
verifyFormat("@Override\n"
"public Map<String, ?> getAll() {\n}");
"public Map<String, ?> getAll() {}");
verifyFormat("public <R> ArrayList<R> get() {\n}");
verifyFormat("protected <R> ArrayList<R> get() {\n}");
verifyFormat("private <R> ArrayList<R> get() {\n}");
verifyFormat("public static <R> ArrayList<R> get() {\n}");
verifyFormat("public final <X> Foo foo() {\n}");
verifyFormat("public <R> ArrayList<R> get() {}");
verifyFormat("protected <R> ArrayList<R> get() {}");
verifyFormat("private <R> ArrayList<R> get() {}");
verifyFormat("public static <R> ArrayList<R> get() {}");
verifyFormat("public final <X> Foo foo() {}");
verifyFormat("public abstract <X> Foo foo();");
verifyFormat("<T extends B> T getInstance(Class<T> type);");
verifyFormat("Function<F, ? extends T> function;");
@@ -312,12 +302,10 @@ TEST_F(FormatTestJava, ImportDeclarations) {
TEST_F(FormatTestJava, MethodDeclarations) {
verifyFormat("void methodName(Object arg1,\n"
" Object arg2, Object arg3) {\n"
"}",
" Object arg2, Object arg3) {}",
getStyleWithColumns(40));
verifyFormat("void methodName(\n"
" Object arg1, Object arg2) {\n"
"}",
" Object arg1, Object arg2) {}",
getStyleWithColumns(40));
}