Skip to content

[clang-format] Set Change.TokenLength to ColumnWidth #90378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2024
Merged

[clang-format] Set Change.TokenLength to ColumnWidth #90378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions clang/lib/Format/WhitespaceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ void WhitespaceManager::calculateLineBreakInformation() {
for (unsigned I = 1, e = Changes.size(); I != e; ++I) {
auto &C = Changes[I];
auto &P = Changes[I - 1];
auto &PrevTokLength = P.TokenLength;
SourceLocation OriginalWhitespaceStart =
C.OriginalWhitespaceRange.getBegin();
SourceLocation PreviousOriginalWhitespaceEnd =
Expand Down Expand Up @@ -169,21 +170,23 @@ void WhitespaceManager::calculateLineBreakInformation() {
// line of the token.
auto NewlinePos = Text.find_first_of('\n');
if (NewlinePos == StringRef::npos) {
P.TokenLength = OriginalWhitespaceStartOffset -
PrevTokLength = OriginalWhitespaceStartOffset -
PreviousOriginalWhitespaceEndOffset +
C.PreviousLinePostfix.size() + P.CurrentLinePrefix.size();
if (!P.IsInsideToken)
PrevTokLength = std::min(PrevTokLength, P.Tok->ColumnWidth);
} else {
P.TokenLength = NewlinePos + P.CurrentLinePrefix.size();
PrevTokLength = NewlinePos + P.CurrentLinePrefix.size();
}

// If there are multiple changes in this token, sum up all the changes until
// the end of the line.
if (P.IsInsideToken && P.NewlinesBefore == 0)
LastOutsideTokenChange->TokenLength += P.TokenLength + P.Spaces;
LastOutsideTokenChange->TokenLength += PrevTokLength + P.Spaces;
else
LastOutsideTokenChange = &P;

C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + P.TokenLength;
C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + PrevTokLength;

P.IsTrailingComment =
(C.NewlinesBefore > 0 || C.Tok->is(tok::eof) ||
Expand Down
39 changes: 39 additions & 0 deletions clang/unittests/Format/FormatTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27363,6 +27363,45 @@ TEST_F(FormatTest, BreakAdjacentStringLiterals) {
verifyFormat(Code, Style);
}

TEST_F(FormatTest, AlignUTFCommentsAndStringLiterals) {
verifyFormat(
"int rus; // А теперь комментарии, например, на русском, 2-байта\n"
"int long_rus; // Верхний коммент еще не превысил границу в 80, однако\n"
" // уже отодвинут. Перенос, при этом, отрабатывает верно");

auto Style = getLLVMStyle();
Style.ColumnLimit = 15;
verifyNoChange("#define test \\\n"
" /* 测试 */ \\\n"
" \"aa\" \\\n"
" \"bb\"",
Style);

Style.ColumnLimit = 25;
verifyFormat("struct foo {\n"
" int iiiiii; ///< iiiiii\n"
" int b; ///< ыыы\n"
" int c; ///< ыыыы\n"
"};",
Style);

Style.ColumnLimit = 35;
verifyFormat("#define SENSOR_DESC_1 \\\n"
" \"{\" \\\n"
" \"unit_of_measurement: \\\"°C\\\",\" \\\n"
" \"}\"",
Style);

Style.ColumnLimit = 80;
Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
verifyFormat("Languages languages = {\n"
" Language{{'e', 'n'}, U\"Test English\" },\n"
" Language{{'l', 'v'}, U\"Test Latviešu\"},\n"
" Language{{'r', 'u'}, U\"Test Русский\" },\n"
"};",
Style);
}

} // namespace
} // namespace test
} // namespace format
Expand Down