Skip to content

[clang-format][NFC] AlignTokens: Rename Changes[i] to CurrentChange #68152

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
Oct 4, 2023
Merged

[clang-format][NFC] AlignTokens: Rename Changes[i] to CurrentChange #68152

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
25 changes: 13 additions & 12 deletions clang/lib/Format/WhitespaceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,16 +579,17 @@ static unsigned AlignTokens(const FormatStyle &Style, F &&Matches,

unsigned i = StartAt;
for (unsigned e = Changes.size(); i != e; ++i) {
if (Changes[i].indentAndNestingLevel() < IndentAndNestingLevel)
auto &CurrentChange = Changes[i];
if (CurrentChange.indentAndNestingLevel() < IndentAndNestingLevel)
break;

if (Changes[i].NewlinesBefore != 0) {
if (CurrentChange.NewlinesBefore != 0) {
CommasBeforeMatch = 0;
EndOfSequence = i;

// Whether to break the alignment sequence because of an empty line.
bool EmptyLineBreak =
(Changes[i].NewlinesBefore > 1) && !ACS.AcrossEmptyLines;
(CurrentChange.NewlinesBefore > 1) && !ACS.AcrossEmptyLines;

// Whether to break the alignment sequence because of a line without a
// match.
Expand All @@ -600,27 +601,27 @@ static unsigned AlignTokens(const FormatStyle &Style, F &&Matches,

// A new line starts, re-initialize line status tracking bools.
// Keep the match state if a string literal is continued on this line.
if (i == 0 || Changes[i].Tok->isNot(tok::string_literal) ||
if (i == 0 || CurrentChange.Tok->isNot(tok::string_literal) ||
Changes[i - 1].Tok->isNot(tok::string_literal)) {
FoundMatchOnLine = false;
}
LineIsComment = true;
}

if (Changes[i].Tok->isNot(tok::comment))
if (CurrentChange.Tok->isNot(tok::comment))
LineIsComment = false;

if (Changes[i].Tok->is(tok::comma)) {
if (CurrentChange.Tok->is(tok::comma)) {
++CommasBeforeMatch;
} else if (Changes[i].indentAndNestingLevel() > IndentAndNestingLevel) {
} else if (CurrentChange.indentAndNestingLevel() > IndentAndNestingLevel) {
// Call AlignTokens recursively, skipping over this scope block.
unsigned StoppedAt =
AlignTokens(Style, Matches, Changes, i, ACS, RightJustify);
i = StoppedAt - 1;
continue;
}

if (!Matches(Changes[i]))
if (!Matches(CurrentChange))
continue;

// If there is more than one matching token per line, or if the number of
Expand All @@ -634,16 +635,16 @@ static unsigned AlignTokens(const FormatStyle &Style, F &&Matches,
if (StartOfSequence == 0)
StartOfSequence = i;

unsigned ChangeWidthLeft = Changes[i].StartOfTokenColumn;
unsigned ChangeWidthLeft = CurrentChange.StartOfTokenColumn;
unsigned ChangeWidthAnchor = 0;
unsigned ChangeWidthRight = 0;
if (RightJustify)
if (ACS.PadOperators)
ChangeWidthAnchor = Changes[i].TokenLength;
ChangeWidthAnchor = CurrentChange.TokenLength;
else
ChangeWidthLeft += Changes[i].TokenLength;
ChangeWidthLeft += CurrentChange.TokenLength;
else
ChangeWidthRight = Changes[i].TokenLength;
ChangeWidthRight = CurrentChange.TokenLength;
for (unsigned j = i + 1; j != e && Changes[j].NewlinesBefore == 0; ++j) {
ChangeWidthRight += Changes[j].Spaces;
// Changes are generally 1:1 with the tokens, but a change could also be
Expand Down