clang-format: ignore C++ keywords in Java

[het]

Summary

Before

public void union
(Object o);

public void struct
(Object o);

public void delete (Object o);

After

public void union(Object o);

public void struct(Object o);

public void delete(Object o);

[het]

Perhaps a more correct way to do this is to transform tok::union, tok::struct, and tok::delete into tok::identifier in the tokenizer if the language is Java

[djasper]

Yeah, the latter seems preferable.

[djasper]

Looks good. I'll submit.

[djasper]

Submitted as r222357.

lib/Format/TokenAnnotator.cpp

if ((Left.is(tok::l_brace) && Left.BlockKind != BK_Block) ||
        Right.MatchingParen->BlockKind != BK_Block))
     return !Style.Cpp11BracedListStyle;
   if (Left.Type == TT_BlockComment)
     return !Left.TokenText.endswith("=*/");
   if (Right.is(tok::l_paren)) {
     if (Left.is(tok::r_paren) && Left.Type == TT_AttributeParen)
       return true;
     return Line.Type == LT_ObjCDecl ||
-           Left.isOneOf(tok::kw_new, tok::kw_delete, tok::semi) ||
+           (Style.Language != FormatStyle::LK_Java &&
+            Left.is(tok::kw_delete)) ||
+           (Left.isOneOf(tok::kw_new, tok::semi)) ||
            (Style.SpaceBeforeParens != FormatStyle::SBPO_Never &&
             (Left.isOneOf(tok::kw_if, tok::kw_for, tok::kw_while,
                           tok::kw_switch, tok::kw_case) ||
              (Left.is(tok::kw_catch) &&
               (!Left.Previous || Left.Previous->isNot(tok::period))) ||
              Left.IsForEachMacro)) ||
            (Style.SpaceBeforeParens == FormatStyle::SBPO_Always &&
             (Left.is(tok::identifier) || Left.isFunctionLikeKeyword()) &&

lib/Format/UnwrappedLineParser.cpp

do {
     case tok::kw_typedef:
       nextToken();
       if (FormatTok->is(Keywords.kw_NS_ENUM))
         parseEnum();
       break;
     case tok::kw_struct:
     case tok::kw_union:
     case tok::kw_class:
+      if (Style.Language == FormatStyle::LK_Java &&
+          FormatTok->Tok.getKind() != tok::kw_class)
+        nextToken();
+      else
         parseRecord();
       // A record declaration or definition is always the start of a structural
       // element.
       break;
     case tok::semi:
       nextToken();
       addUnwrappedLine();
       return;
     case tok::r_brace:

unittests/Format/FormatTestJava.cpp

verifyFormat("void methodName(Object arg1,\n"
                "}",
                getStyleWithColumns(40));
   verifyFormat("void methodName(\n"
                "    Object arg1, Object arg2) {\n"
                "}",
                getStyleWithColumns(40));
 }
 
+TEST_F(FormatTestJava, CppKeywords) {
+  verifyFormat("public void union(Type a, Type b);");
+  verifyFormat("public void struct(Object o);");
+  verifyFormat("public void delete(Object o);");
+}
+
 } // end namespace tooling
 } // end namespace clang