diff options
| author | Daniel Jasper <djasper@google.com> | 2017-02-28 18:28:15 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-02-28 18:28:15 +0000 |
| commit | e154020dc51e90dd20d55bd6371ac395d6422d62 (patch) | |
| tree | b947b4bf520eec6d6375ff46a072c402b7b585f8 /clang/lib | |
| parent | a60cdd38812d2f2cc32a2446b24bca607a1f6341 (diff) | |
| download | bcm5719-llvm-e154020dc51e90dd20d55bd6371ac395d6422d62.tar.gz bcm5719-llvm-e154020dc51e90dd20d55bd6371ac395d6422d62.zip | |
clang-format: [Java] Fix bug in enum formatting.
Before:
public enum VeryLongEnum {
ENUM_WITH_MANY_PARAMETERS("aaaaaaaaaaaaaaaaaaaaaa",
"bbbbbbbbbbbbbbbbbbbbbbbbbbb",
"ccccccccccccccccccc")
,
SECOND_ENUM("a", "b", "c");
private VeryLongEnum(String a, String b, String c) {}
}
After:
public enum VeryLongEnum {
ENUM_WITH_MANY_PARAMETERS("aaaaaaaaaaaaaaaaaaaaaa",
"bbbbbbbbbbbbbbbbbbbbbbbbbbb",
"ccccccccccccccccccc") ,
SECOND_ENUM("a", "b", "c");
private VeryLongEnum(String a, String b, String c) {}
}
llvm-svn: 296499
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index b3dc314dbae..907e173c9e5 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1083,7 +1083,8 @@ private: if (Current.MatchingParen && Current.Next && !Current.Next->isBinaryOperator() && !Current.Next->isOneOf(tok::semi, tok::colon, tok::l_brace, - tok::period, tok::arrow, tok::coloncolon)) + tok::comma, tok::period, tok::arrow, + tok::coloncolon)) if (FormatToken *AfterParen = Current.MatchingParen->Next) { // Make sure this isn't the return type of an Obj-C block declaration if (AfterParen->Tok.isNot(tok::caret)) { |
