From c1404c4993e62113f1e82e72b3000de89c6a020a Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 14 Nov 2014 09:02:28 +0000 Subject: [PATCH] clang-format: [Java] No altnerative operator names in Java. Before: someObject.and (); After: someObject.and(); git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221978 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/Format.cpp | 5 +++-- unittests/Format/FormatTestJava.cpp | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 740adb2b12..52a88e0a78 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -2133,8 +2133,9 @@ LangOptions getFormattingLangOpts(const FormatStyle &Style) { LangOpts.CPlusPlus11 = Style.Standard == FormatStyle::LS_Cpp03 ? 0 : 1; LangOpts.CPlusPlus14 = Style.Standard == FormatStyle::LS_Cpp03 ? 0 : 1; LangOpts.LineComment = 1; - LangOpts.CXXOperatorNames = - Style.Language != FormatStyle::LK_JavaScript ? 1 : 0; + bool AlternativeOperators = Style.Language != FormatStyle::LK_JavaScript && + Style.Language != FormatStyle::LK_Java; + LangOpts.CXXOperatorNames = AlternativeOperators ? 1 : 0; LangOpts.Bool = 1; LangOpts.ObjC1 = 1; LangOpts.ObjC2 = 1; diff --git a/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp index 650c0af0cb..e8e35c85ef 100644 --- a/unittests/Format/FormatTestJava.cpp +++ b/unittests/Format/FormatTestJava.cpp @@ -50,6 +50,10 @@ protected: } }; +TEST_F(FormatTestJava, NoAlternativeOperatorNames) { + verifyFormat("someObject.and();"); +} + TEST_F(FormatTestJava, ClassDeclarations) { verifyFormat("public class SomeClass {\n" " private int a;\n" -- 2.40.0