From b64eca09dd3bcd18eb1a5cca2b123b169340bdd5 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 22 Mar 2013 10:01:29 +0000 Subject: [PATCH] Make clang-format understand more line comments. Apparently one needs to set LangOptions.LineComment. Before "//* */" got reformatted to "/ /* */" as the lexer was returning the token sequence (slash, comment). This could also lead to weird other stuff, e.g. for people that like to using comments like: //**************** git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177720 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/Format.cpp | 1 + unittests/Format/FormatTest.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 040fb39fb9..40e980f67d 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1643,6 +1643,7 @@ LangOptions getFormattingLangOpts() { LangOptions LangOpts; LangOpts.CPlusPlus = 1; LangOpts.CPlusPlus11 = 1; + LangOpts.LineComment = 1; LangOpts.Bool = 1; LangOpts.ObjC1 = 1; LangOpts.ObjC2 = 1; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 29988d35c4..dc77c77e45 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -490,6 +490,7 @@ TEST_F(FormatTest, FormatsLabels) { //===----------------------------------------------------------------------===// TEST_F(FormatTest, UnderstandsSingleLineComments) { + verifyFormat("//* */"); verifyFormat("// line 1\n" "// line 2\n" "void f() {}\n"); -- 2.40.0