[PATCH] clang-format: [Java] support Java modifiers

[Harry Terkelsen]

Hi djasper,

Before
```
public final<X> Foo foo() {
}

public abstract<X> Foo foo();
```

After
```
public final <X> Foo foo() {
}

public abstract <X> Foo foo();
```

http://reviews.llvm.org/D6345

Files:
  lib/Format/FormatToken.h
  lib/Format/TokenAnnotator.cpp
  unittests/Format/FormatTestJava.cpp

Index: lib/Format/FormatToken.h
===================================================================
--- lib/Format/FormatToken.h
+++ lib/Format/FormatToken.h
@@ -543,7 +543,9 @@
     kw_function = &IdentTable.get("function");
     kw_var = &IdentTable.get("var");
 
+    kw_abstract = &IdentTable.get("abstract");
     kw_extends = &IdentTable.get("extends");
+    kw_final = &IdentTable.get("final");
     kw_implements = &IdentTable.get("implements");
     kw_interface = &IdentTable.get("interface");
     kw_synchronized = &IdentTable.get("synchronized");
@@ -566,7 +568,9 @@
   IdentifierInfo *kw_var;
 
   // Java keywords.
+  IdentifierInfo *kw_abstract;
   IdentifierInfo *kw_extends;
+  IdentifierInfo *kw_final;
   IdentifierInfo *kw_implements;
   IdentifierInfo *kw_interface;
   IdentifierInfo *kw_synchronized;
Index: lib/Format/TokenAnnotator.cpp
===================================================================
--- lib/Format/TokenAnnotator.cpp
+++ lib/Format/TokenAnnotator.cpp
@@ -1703,8 +1703,9 @@
   } else if (Style.Language == FormatStyle::LK_Java) {
     if (Left.is(Keywords.kw_synchronized) && Right.is(tok::l_paren))
       return Style.SpaceBeforeParens != FormatStyle::SBPO_Never;
-    if (Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private,
-                     tok::kw_protected) &&
+    if ((Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private,
+                      tok::kw_protected) ||
+         Left.isOneOf(Keywords.kw_final, Keywords.kw_abstract)) &&
         Right.Type == TT_TemplateOpener)
       return true;
   }
Index: unittests/Format/FormatTestJava.cpp
===================================================================
--- unittests/Format/FormatTestJava.cpp
+++ unittests/Format/FormatTestJava.cpp
@@ -229,6 +229,8 @@
   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 abstract <X> Foo foo();");
   verifyFormat("<T extends B> T getInstance(Class<T> type);");
   verifyFormat("Function<F, ? extends T> function;");
 

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits