This is an archive of the discontinued LLVM Phabricator instance.

Differential D115070

[clang-format][NFC] Early return when nothing to do
ClosedPublic

Authored by HazardyKnusperkeks on Dec 3 2021, 12:03 PM.

Details

Reviewers
MyDeveloperDay
owenpan
curdeius
Commits
rG4041f16bb489: [clang-format][NFC] Early return when nothing to do
Summary

Do not compute SkipFirstExtraIndent just to see that there are no fake l parens.

Diff Detail

Event Timeline

HazardyKnusperkeks requested review of this revision.Dec 3 2021, 12:03 PM
HazardyKnusperkeks created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 3 2021, 12:03 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
curdeius accepted this revision.Dec 3 2021, 12:41 PM

LGTM.

This revision is now accepted and ready to land.Dec 3 2021, 12:41 PM
Harbormaster completed remote builds in B137409: Diff 391704.Dec 3 2021, 1:01 PM
owenpan accepted this revision.Dec 3 2021, 7:07 PM
Closed by commit rG4041f16bb489: [clang-format][NFC] Early return when nothing to do (authored by HazardyKnusperkeks). · Explain WhyDec 4 2021, 12:30 PM
This revision was automatically updated to reflect the committed changes.
HazardyKnusperkeks added a commit: rG4041f16bb489: [clang-format][NFC] Early return when nothing to do.

Revision Contents

PathSize
clang/
lib/
Format/
3 lines

Diff 391864

clang/lib/Format/ContinuationIndenter.cpp

Show First 20 Lines • Show All 1,331 Lines • ▼ Show 20 Lines if (Previous && Previous->Role)
Penalty += Previous->Role->formatAfterToken(State, this, DryRun); Penalty += Previous->Role->formatAfterToken(State, this, DryRun);
return Penalty; return Penalty;
} }
void ContinuationIndenter::moveStatePastFakeLParens(LineState &State, void ContinuationIndenter::moveStatePastFakeLParens(LineState &State,
bool Newline) { bool Newline) {
const FormatToken &Current = *State.NextToken; const FormatToken &Current = *State.NextToken;
if (Current.FakeLParens.empty())
return;
const FormatToken *Previous = Current.getPreviousNonComment(); const FormatToken *Previous = Current.getPreviousNonComment();
// Don't add extra indentation for the first fake parenthesis after // Don't add extra indentation for the first fake parenthesis after
// 'return', assignments or opening <({[. The indentation for these cases // 'return', assignments or opening <({[. The indentation for these cases
// is special cased. // is special cased.
bool SkipFirstExtraIndent = bool SkipFirstExtraIndent =
(Previous && (Previous->opensScope() || (Previous && (Previous->opensScope() ||
Previous->isOneOf(tok::semi, tok::kw_return) || Previous->isOneOf(tok::semi, tok::kw_return) ||
▲ Show 20 Lines • Show All 1,063 Lines • Show Last 20 Lines