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/Format.cpp

if (FormatTok->Tok.is(tok::comment)) {
       // FIXME: Add the trimmed whitespace to Column.
       StringRef UntrimmedText = FormatTok->TokenText;
       FormatTok->TokenText = FormatTok->TokenText.rtrim(" \t\v\f");
       TrailingWhitespace = UntrimmedText.size() - FormatTok->TokenText.size();
     } else if (FormatTok->Tok.is(tok::raw_identifier)) {
       IdentifierInfo &Info = IdentTable.get(FormatTok->TokenText);
       FormatTok->Tok.setIdentifierInfo(&Info);
       FormatTok->Tok.setKind(Info.getTokenID());
+      if (Style.Language == FormatStyle::LK_Java &&
+          FormatTok->isOneOf(tok::kw_struct, tok::kw_union, tok::kw_delete))
+        FormatTok->Tok.setKind(tok::identifier);
     } else if (FormatTok->Tok.is(tok::greatergreater)) {
       FormatTok->Tok.setKind(tok::greater);
       FormatTok->TokenText = FormatTok->TokenText.substr(0, 1);
       GreaterStashed = true;
     }
 
     // Now FormatTok is the next non-whitespace token.
 

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