This is an archive of the discontinued LLVM Phabricator instance.

Differential D115068

[clang-format][NFC] Move static variable in scope
ClosedPublic

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

Details

Reviewers
MyDeveloperDay
curdeius
owenpan
Commits
rG8d1c85454daa: [clang-format][NFC] Move static variable in scope
Summary

Let only the JS/TS users pay for the initialistation.

Diff Detail

Event Timeline

HazardyKnusperkeks requested review of this revision.Dec 3 2021, 12:00 PM
HazardyKnusperkeks created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 3 2021, 12:00 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B137407: Diff 391702.Dec 3 2021, 12:49 PM
curdeius accepted this revision.Dec 3 2021, 12:50 PM

LGTM.

This revision is now accepted and ready to land.Dec 3 2021, 12:50 PM
owenpan accepted this revision.Dec 3 2021, 6:08 PM
Closed by commit rG8d1c85454daa: [clang-format][NFC] Move static variable in scope (authored by HazardyKnusperkeks). · Explain WhyDec 4 2021, 12:30 PM
This revision was automatically updated to reflect the committed changes.
HazardyKnusperkeks added a commit: rG8d1c85454daa: [clang-format][NFC] Move static variable in scope.

Revision Contents

PathSize
clang/
lib/
Format/
12 lines

Diff 391862

clang/lib/Format/ContinuationIndenter.cpp

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines if (Previous.ClosesTemplateDeclaration)
return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_No; return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_No;
if (Previous.is(TT_FunctionAnnotationRParen)) if (Previous.is(TT_FunctionAnnotationRParen))
return true; return true;
if (Previous.is(TT_LeadingJavaAnnotation) && Current.isNot(tok::l_paren) && if (Previous.is(TT_LeadingJavaAnnotation) && Current.isNot(tok::l_paren) &&
Current.isNot(TT_LeadingJavaAnnotation)) Current.isNot(TT_LeadingJavaAnnotation))
return true; return true;
} }
if (Style.Language == FormatStyle::LK_JavaScript &&
Previous.is(tok::r_paren) && Previous.is(TT_JavaAnnotation)) {
// Break after the closing parenthesis of TypeScript decorators before // Break after the closing parenthesis of TypeScript decorators before
// functions, getters and setters. // functions, getters and setters.
static const llvm::StringSet<> BreakBeforeDecoratedTokens = {"get", "set", static const llvm::StringSet<> BreakBeforeDecoratedTokens = {"get", "set",
"function"}; "function"};
if (Style.Language == FormatStyle::LK_JavaScript && if (BreakBeforeDecoratedTokens.contains(Current.TokenText))
BreakBeforeDecoratedTokens.contains(Current.TokenText) &&
Previous.is(tok::r_paren) && Previous.is(TT_JavaAnnotation)) {
return true; return true;
} }
// If the return type spans multiple lines, wrap before the function name. // If the return type spans multiple lines, wrap before the function name.
if (((Current.is(TT_FunctionDeclarationName) && if (((Current.is(TT_FunctionDeclarationName) &&
// Don't break before a C# function when no break after return type // Don't break before a C# function when no break after return type
(!Style.isCSharp() || (!Style.isCSharp() ||
Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None) && Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None) &&
// Don't always break between a JavaScript `function` and the function // Don't always break between a JavaScript `function` and the function
▲ Show 20 Lines • Show All 1,899 Lines • Show Last 20 Lines