Author: nico Date: Mon Sep 25 15:42:49 2017 New Revision: 314172 URL: http://llvm.org/viewvc/llvm-project?rev=314172&view=rev Log: clang-format/java: Always put space after `assert` keyword.
Previously, it was missing if the expression after the assert started with a (. Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTestJava.cpp Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=314172&r1=314171&r2=314172&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Mon Sep 25 15:42:49 2017 @@ -2185,6 +2185,8 @@ bool TokenAnnotator::spaceRequiredBetwee const FormatToken &Right) { if (Left.is(tok::kw_return) && Right.isNot(tok::semi)) return true; + if (Left.is(Keywords.kw_assert) && Style.Language == FormatStyle::LK_Java) + return true; if (Style.ObjCSpaceAfterProperty && Line.Type == LT_ObjCProperty && Left.Tok.getObjCKeywordID() == tok::objc_property) return true; Modified: cfe/trunk/unittests/Format/FormatTestJava.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJava.cpp?rev=314172&r1=314171&r2=314172&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTestJava.cpp (original) +++ cfe/trunk/unittests/Format/FormatTestJava.cpp Mon Sep 25 15:42:49 2017 @@ -412,6 +412,7 @@ TEST_F(FormatTestJava, SynchronizedKeywo TEST_F(FormatTestJava, AssertKeyword) { verifyFormat("assert a && b;"); + verifyFormat("assert (a && b);"); } TEST_F(FormatTestJava, PackageDeclarations) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits