replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format: [Java] Fix incorrect detection of cast. 

After:
  return (a instanceof List<?>) ? aaaaaaaaaaaaaaaaaaaaaaa(
                                      aaaaaaaaaaaaaaaaaaaaa)
                                : aaaaaaaaaaaaaaaaaaaaaaa;

After:
  return (a instanceof List<?>)
      ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)
      : aaaaaaaaaaaaaaaaaaaaaaa;

llvm-svn: 225161
This commit is contained in:
Daniel Jasper 2015-01-05 10:33:39 +00:00
parent d3c02f177a
commit 77ef2be2e4
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -927,6 +927,8 @@ private:
LeftOfParens->MatchingParen->is(TT_LambdaLSquare))
return false;
if (Tok.Next) {
if (Tok.Next->is(tok::question))
return false;
if (Style.Language == FormatStyle::LK_JavaScript &&
Tok.Next->is(Keywords.kw_in))
return false;

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

@ -289,6 +289,10 @@ TEST_F(FormatTestJava, Generics) {
verifyFormat("private Foo<X, Y>[] foos;");
verifyFormat("Foo<X, Y>[] foos = this.foos;");
verifyFormat("return (a instanceof List<?>)\n"
" ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n"
" : aaaaaaaaaaaaaaaaaaaaaaa;",
getStyleWithColumns(60));
verifyFormat(
"SomeLoooooooooooooooooooooongType name =\n"