owenpan created this revision.
owenpan added reviewers: curdeius, HazardyKnusperkeks, MyDeveloperDay.
owenpan added a project: clang-format.
Herald added a project: All.
owenpan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Similar to D124868 <https://reviews.llvm.org/D124868>.
The `ShouldShiftBeAdded` lambda checks if extra space should be
added before the wrapped part of a braced list. If the first
element of the list is wrapped, no extra space should be added.
Fixes https://github.com/llvm/llvm-project/issues/55161.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D124956
Files:
clang/lib/Format/WhitespaceManager.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -18023,6 +18023,12 @@
"}",
Style);
+ verifyFormat("unsigned i = 0;\n"
+ "int a[] = {\n"
+ " 1234567890,\n"
+ " -1234567890};",
+ Style);
+
Style.ColumnLimit = 120;
// clang-format off
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -398,6 +398,8 @@
Changes[OuterScopeStart - 1].Tok->is(TT_LambdaLBrace))
return false;
}
+ if (Changes[ScopeStart].NewlinesBefore > 0)
+ return false;
return true;
}
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -18023,6 +18023,12 @@
"}",
Style);
+ verifyFormat("unsigned i = 0;\n"
+ "int a[] = {\n"
+ " 1234567890,\n"
+ " -1234567890};",
+ Style);
+
Style.ColumnLimit = 120;
// clang-format off
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -398,6 +398,8 @@
Changes[OuterScopeStart - 1].Tok->is(TT_LambdaLBrace))
return false;
}
+ if (Changes[ScopeStart].NewlinesBefore > 0)
+ return false;
return true;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
