This is an archive of the discontinued LLVM Phabricator instance.

Differential D123737

[clang-format] Skip preprocessor lines when finding the record lbrace
ClosedPublic

Authored by aeubanks on Apr 13 2022, 2:40 PM.

Details

Reviewers
MyDeveloperDay
curdeius
HazardyKnusperkeks
owenpan
Commits
rGf14ebe91c5dd: [clang-format] Skip preprocessor lines when finding the record lbrace
Summary

With D117142, we would now format

struct A {
#define A
  void f() { a(); }
#endif
};

into

struct A {
#ifdef A
  void f() {
    a();
  }
#endif
};

because we were looking for the record lbrace without skipping preprocess lines.

Fixes https://github.com/llvm/llvm-project/issues/54901.

Diff Detail

Revision Contents

PathSize
clang/
lib/
Format/
2 lines
unittests/
Format/
7 lines

Diff 422893

clang/lib/Format/UnwrappedLineFormatter.cpp

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines auto ShouldMergeShortFunctions = [this, &I, &NextLine, PreviousLine,
if (TheLine->Level != 0) { if (TheLine->Level != 0) {
if (!PreviousLine) if (!PreviousLine)
return false; return false;
// TODO: Use IndentTracker to avoid loop? // TODO: Use IndentTracker to avoid loop?
// Find the last line with lower level. // Find the last line with lower level.
auto J = I - 1; auto J = I - 1;
for (; J != AnnotatedLines.begin(); --J) for (; J != AnnotatedLines.begin(); --J)
if ((*J)->Level < TheLine->Level) if (!(*J)->InPPDirective && (*J)->Level < TheLine->Level)
break; break;
if ((*J)->Level >= TheLine->Level) if ((*J)->Level >= TheLine->Level)
return false; return false;
// Check if the found line starts a record. // Check if the found line starts a record.
const FormatToken *LastNonComment = (*J)->Last; const FormatToken *LastNonComment = (*J)->Last;
assert(LastNonComment); assert(LastNonComment);
if (LastNonComment->is(tok::comment)) { if (LastNonComment->is(tok::comment)) {
▲ Show 20 Lines • Show All 1,147 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 12,760 Lines • ▼ Show 20 LinesTEST_F(FormatTest, PullInlineFunctionDefinitionsIntoSingleLine) {
// https://llvm.org/PR54147 // https://llvm.org/PR54147
verifyFormat("auto lambda = []() {\n" verifyFormat("auto lambda = []() {\n"
" // comment\n" " // comment\n"
" f();\n" " f();\n"
" g();\n" " g();\n"
"};", "};",
MergeInlineOnly); MergeInlineOnly);
verifyFormat("class C {\n"
"#ifdef A\n"
" int f() { return 42; }\n"
"#endif\n"
"};",
MergeInlineOnly);
// Also verify behavior when BraceWrapping.AfterFunction = true // Also verify behavior when BraceWrapping.AfterFunction = true
MergeInlineOnly.BreakBeforeBraces = FormatStyle::BS_Custom; MergeInlineOnly.BreakBeforeBraces = FormatStyle::BS_Custom;
MergeInlineOnly.BraceWrapping.AfterFunction = true; MergeInlineOnly.BraceWrapping.AfterFunction = true;
verifyFormat("class C {\n" verifyFormat("class C {\n"
" int f() { return 42; }\n" " int f() { return 42; }\n"
"};", "};",
MergeInlineOnly); MergeInlineOnly);
verifyFormat("int f()\n" verifyFormat("int f()\n"
▲ Show 20 Lines • Show All 12,928 Lines • Show Last 20 Lines