From 79f7453146b517c0c1a8cf466399e5bed2e6d83f Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 5 Jan 2015 10:33:39 +0000 Subject: [PATCH] clang-format: [Java] Fix incorrect detection of cast. After: return (a instanceof List) ? aaaaaaaaaaaaaaaaaaaaaaa( aaaaaaaaaaaaaaaaaaaaa) : aaaaaaaaaaaaaaaaaaaaaaa; After: return (a instanceof List) ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa) : aaaaaaaaaaaaaaaaaaaaaaa; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@225161 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 2 ++ unittests/Format/FormatTestJava.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 2e97ffffbe..331776c59a 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -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; diff --git a/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp index e27e462ae7..99b25dc734 100644 --- a/unittests/Format/FormatTestJava.cpp +++ b/unittests/Format/FormatTestJava.cpp @@ -289,6 +289,10 @@ TEST_F(FormatTestJava, Generics) { verifyFormat("private Foo[] foos;"); verifyFormat("Foo[] foos = this.foos;"); + verifyFormat("return (a instanceof List)\n" + " ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n" + " : aaaaaaaaaaaaaaaaaaaaaaa;", + getStyleWithColumns(60)); verifyFormat( "SomeLoooooooooooooooooooooongType name =\n" -- 2.50.1