[PATCH] D157179: [clang-format] Currectly handle PCIS_CurrentLine with no column limit
Owen Pan via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Sat Aug 5 00:22:10 PDT 2023
owenpan created this revision.
Herald added projects: All, clang, clang-format.
Herald added a subscriber: cfe-commits.
Herald added reviewers: rymiel, HazardyKnusperkeks, MyDeveloperDay.
owenpan requested review of this revision.
Fixes https://github.com/llvm/llvm-project/issues/63519.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D157179
Files:
clang/lib/Format/ContinuationIndenter.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -7758,6 +7758,13 @@
" aaaaaaaaaaaaaaaaaaaa(a),\n"
" bbbbbbbbbbbbbbbbbbbbb(b) {}",
Style);
+
+ Style = getLLVMStyleWithColumns(0);
+ Style.PackConstructorInitializers = FormatStyle::PCIS_CurrentLine;
+ verifyFormat("Foo(Bar bar, Baz baz) : bar(bar), baz(baz) {}", Style);
+ verifyNoChange("Foo(Bar bar, Baz baz)\n"
+ " : bar(bar), baz(baz) {}",
+ Style);
}
TEST_F(FormatTest, AllowAllArgumentsOnNextLine) {
Index: clang/lib/Format/ContinuationIndenter.cpp
===================================================================
--- clang/lib/Format/ContinuationIndenter.cpp
+++ clang/lib/Format/ContinuationIndenter.cpp
@@ -1437,6 +1437,7 @@
if (Style.PackConstructorInitializers > FormatStyle::PCIS_BinPack) {
CurrentState.AvoidBinPacking = true;
CurrentState.BreakBeforeParameter =
+ Style.ColumnLimit > 0 &&
Style.PackConstructorInitializers != FormatStyle::PCIS_NextLine &&
Style.PackConstructorInitializers != FormatStyle::PCIS_NextLineOnly;
} else {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D157179.547456.patch
Type: text/x-patch
Size: 1303 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230805/5dbb2c23/attachment-0001.bin>
More information about the cfe-commits
mailing list