Author: Marek Kurdej Date: 2022-03-13T21:56:22+01:00 New Revision: 36d13d3f8adb3d1a6bae71370afa23d11a94dc78
URL: https://github.com/llvm/llvm-project/commit/36d13d3f8adb3d1a6bae71370afa23d11a94dc78 DIFF: https://github.com/llvm/llvm-project/commit/36d13d3f8adb3d1a6bae71370afa23d11a94dc78.diff LOG: [clang-format] Add space to comments starting with '#'. Fixes https://github.com/llvm/llvm-project/issues/35116. Reviewed By: MyDeveloperDay, HazardyKnusperkeks, owenpan Differential Revision: https://reviews.llvm.org/D121451 Added: Modified: clang/lib/Format/BreakableToken.cpp clang/unittests/Format/FormatTestComments.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/BreakableToken.cpp b/clang/lib/Format/BreakableToken.cpp index 967ddeb82383a..ae084e9e14544 100644 --- a/clang/lib/Format/BreakableToken.cpp +++ b/clang/lib/Format/BreakableToken.cpp @@ -779,11 +779,14 @@ BreakableLineCommentSection::BreakableLineCommentSection( const char FirstCommentChar = Lines[i][IndentPrefix.size()]; const unsigned FirstCharByteSize = encoding::getCodePointNumBytes(FirstCommentChar, Encoding); - return encoding::columnWidth( - Lines[i].substr(IndentPrefix.size(), FirstCharByteSize), - Encoding) == 1 && - (FirstCommentChar == '\\' || isPunctuation(FirstCommentChar) || - isHorizontalWhitespace(FirstCommentChar)); + if (encoding::columnWidth( + Lines[i].substr(IndentPrefix.size(), FirstCharByteSize), + Encoding) != 1) + return false; + if (FirstCommentChar == '#') + return false; + return FirstCommentChar == '\\' || isPunctuation(FirstCommentChar) || + isHorizontalWhitespace(FirstCommentChar); }; // On the first line of the comment section we calculate how many spaces diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp index f83ffb393ac2f..27cc6013611c2 100644 --- a/clang/unittests/Format/FormatTestComments.cpp +++ b/clang/unittests/Format/FormatTestComments.cpp @@ -91,6 +91,9 @@ TEST_F(FormatTestComments, UnderstandsSingleLineComments) { "// line 2\n" "void f() {}\n"); + EXPECT_EQ("// comment\n", format("//comment\n")); + EXPECT_EQ("// #comment\n", format("//#comment\n")); + EXPECT_EQ("// comment\n" "// clang-format on\n", format("//comment\n" @@ -3302,6 +3305,7 @@ TEST_F(FormatTestComments, SpaceAtLineCommentBegin) { format(NoTextInComment, Style)); Style.SpacesInLineCommentPrefix.Minimum = 0; + EXPECT_EQ("//#comment", format("//#comment", Style)); EXPECT_EQ("//\n" "\n" "void foo() { //\n" @@ -3310,6 +3314,7 @@ TEST_F(FormatTestComments, SpaceAtLineCommentBegin) { format(NoTextInComment, Style)); Style.SpacesInLineCommentPrefix.Minimum = 5; + EXPECT_EQ("// #comment", format("//#comment", Style)); EXPECT_EQ("//\n" "\n" "void foo() { //\n" @@ -3463,6 +3468,7 @@ TEST_F(FormatTestComments, SpaceAtLineCommentBegin) { format(Code, Style)); Style.SpacesInLineCommentPrefix = {0, 0}; + EXPECT_EQ("//#comment", format("// #comment", Style)); EXPECT_EQ("//Free comment without space\n" "\n" "//Free comment with 3 spaces\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits