This is an archive of the discontinued LLVM Phabricator instance.

Differential D122548

[clang-format] Don't format qualifiers in PPDirective
ClosedPublic

Authored by owenpan on Mar 27 2022, 1:28 PM.

Details

Reviewers
MyDeveloperDay
curdeius
HazardyKnusperkeks
Commits
rGeee536dd3185: [clang-format] Don't format qualifiers in PPDirective
Summary

Fixes #54513

Diff Detail

Event Timeline

owenpan created this revision.Mar 27 2022, 1:28 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2022, 1:28 PM
owenpan requested review of this revision.Mar 27 2022, 1:28 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2022, 1:28 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
curdeius accepted this revision.Mar 27 2022, 1:50 PM
This revision is now accepted and ready to land.Mar 27 2022, 1:50 PM
MyDeveloperDay accepted this revision.Mar 27 2022, 2:05 PM

LGTM thank you for the patch

Harbormaster completed remote builds in B156468: Diff 418470.Mar 28 2022, 4:06 AM
HazardyKnusperkeks accepted this revision.Mar 28 2022, 11:45 AM
Closed by commit rGeee536dd3185: [clang-format] Don't format qualifiers in PPDirective (authored by owenpan). · Explain WhyMar 28 2022, 2:28 PM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rGeee536dd3185: [clang-format] Don't format qualifiers in PPDirective.

Revision Contents

PathSize
clang/
lib/
Format/
2 lines
unittests/
Format/
1 line

Diff 418470

clang/lib/Format/QualifierAlignmentFixer.cpp

Show First 20 Lines • Show All 401 Lines • ▼ Show 20 LinesLeftRightQualifierAlignmentFixer::analyze(
const AdditionalKeywords &Keywords = Tokens.getKeywords(); const AdditionalKeywords &Keywords = Tokens.getKeywords();
const SourceManager &SourceMgr = Env.getSourceManager(); const SourceManager &SourceMgr = Env.getSourceManager();
AffectedRangeMgr.computeAffectedLines(AnnotatedLines); AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
tok::TokenKind QualifierToken = getTokenFromQualifier(Qualifier); tok::TokenKind QualifierToken = getTokenFromQualifier(Qualifier);
assert(QualifierToken != tok::identifier && "Unrecognised Qualifier"); assert(QualifierToken != tok::identifier && "Unrecognised Qualifier");
for (AnnotatedLine *Line : AnnotatedLines) { for (AnnotatedLine *Line : AnnotatedLines) {
if (Line->InPPDirective)
continue;
FormatToken *First = Line->First; FormatToken *First = Line->First;
assert(First); assert(First);
if (First->Finalized) if (First->Finalized)
continue; continue;
const auto *Last = Line->Last; const auto *Last = Line->Last;
for (const auto *Tok = First; Tok && Tok != Last && Tok->Next; for (const auto *Tok = First; Tok && Tok != Last && Tok->Next;
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines

clang/unittests/Format/QualifierFixerTest.cpp

Show First 20 Lines • Show All 809 Lines • ▼ Show 20 LinesTEST_F(QualifierFixerTest, NoOpQualifierReplacements) {
FormatStyle Style = getLLVMStyle(); FormatStyle Style = getLLVMStyle();
Style.QualifierAlignment = FormatStyle::QAS_Custom; Style.QualifierAlignment = FormatStyle::QAS_Custom;
Style.QualifierOrder = {"static", "const", "type"}; Style.QualifierOrder = {"static", "const", "type"};
ReplacementCount = 0; ReplacementCount = 0;
EXPECT_EQ(ReplacementCount, 0); EXPECT_EQ(ReplacementCount, 0);
verifyFormat("static const uint32 foo[] = {0, 31};", Style); verifyFormat("static const uint32 foo[] = {0, 31};", Style);
verifyFormat("#define MACRO static const", Style);
EXPECT_EQ(ReplacementCount, 0); EXPECT_EQ(ReplacementCount, 0);
} }
TEST_F(QualifierFixerTest, QualifierTemplates) { TEST_F(QualifierFixerTest, QualifierTemplates) {
FormatStyle Style = getLLVMStyle(); FormatStyle Style = getLLVMStyle();
Style.QualifierAlignment = FormatStyle::QAS_Custom; Style.QualifierAlignment = FormatStyle::QAS_Custom;
Style.QualifierOrder = {"static", "const", "type"}; Style.QualifierOrder = {"static", "const", "type"};
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines