squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[clang-format] Add space to comments starting with '#'.

Browse source 
Fixes https://github.com/llvm/llvm-project/issues/35116.

Reviewed By: MyDeveloperDay, HazardyKnusperkeks, owenpan

Differential Revision: https://reviews.llvm.org/D121451
This commit is contained in:
Marek Kurdej 2022-03-01 09:42:28 +01:00
parent 596fa2d900
commit 36d13d3f8a
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clang/lib/Format/BreakableToken.cpp
View file

@ -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

6
clang/unittests/Format/FormatTestComments.cpp
View file

@ -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"