[clang] [clang-format] Change BracedInitializerIndentWidth to int (PR #128988)
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Thu Feb 27 19:25:25 PST 2025
https://github.com/owenca updated https://github.com/llvm/llvm-project/pull/128988
>From ef2548f777bdee34bbe6c36bd8c061c00191629b Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Wed, 26 Feb 2025 18:32:08 -0800
Subject: [PATCH 1/2] [clang-format] Change BracedInitializerIndentWidth to int
Fixes #108526
---
clang/docs/ClangFormatStyleOptions.rst | 4 ++--
clang/include/clang/Format/Format.h | 4 ++--
clang/lib/Format/ContinuationIndenter.cpp | 6 +++---
clang/lib/Format/Format.cpp | 2 +-
clang/unittests/Format/ConfigParseTest.cpp | 11 ++++++-----
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index d157c07c9cef8..9ecac68ae72bf 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -2582,9 +2582,9 @@ the configuration (without a prefix: ``Auto``).
.. _BracedInitializerIndentWidth:
-**BracedInitializerIndentWidth** (``Unsigned``) :versionbadge:`clang-format 17` :ref:`¶ <BracedInitializerIndentWidth>`
+**BracedInitializerIndentWidth** (``Integer``) :versionbadge:`clang-format 17` :ref:`¶ <BracedInitializerIndentWidth>`
The number of columns to use to indent the contents of braced init lists.
- If unset, ``ContinuationIndentWidth`` is used.
+ If unset or negative, ``ContinuationIndentWidth`` is used.
.. code-block:: c++
diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h
index 46fb1d52701b3..fec47a248abb4 100644
--- a/clang/include/clang/Format/Format.h
+++ b/clang/include/clang/Format/Format.h
@@ -1289,7 +1289,7 @@ struct FormatStyle {
BitFieldColonSpacingStyle BitFieldColonSpacing;
/// The number of columns to use to indent the contents of braced init lists.
- /// If unset, ``ContinuationIndentWidth`` is used.
+ /// If unset or negative, ``ContinuationIndentWidth`` is used.
/// \code
/// AlignAfterOpenBracket: AlwaysBreak
/// BracedInitializerIndentWidth: 2
@@ -1319,7 +1319,7 @@ struct FormatStyle {
/// }
/// \endcode
/// \version 17
- std::optional<unsigned> BracedInitializerIndentWidth;
+ int BracedInitializerIndentWidth;
/// Different ways to wrap braces after control statements.
enum BraceWrappingAfterControlStatementStyle : int8_t {
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index d49128c2b40f8..972dceb697a8b 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -1921,9 +1921,9 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State,
NewIndent = Style.IndentWidth +
std::min(State.Column, CurrentState.NestedBlockIndent);
} else if (Current.is(tok::l_brace)) {
- NewIndent =
- CurrentState.LastSpace + Style.BracedInitializerIndentWidth.value_or(
- Style.ContinuationIndentWidth);
+ const auto Width = Style.BracedInitializerIndentWidth;
+ NewIndent = CurrentState.LastSpace +
+ (Width < 0 ? Style.ContinuationIndentWidth : Width);
} else {
NewIndent = CurrentState.LastSpace + Style.ContinuationIndentWidth;
}
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 68ef119fb4d65..92678a031178a 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -1512,7 +1512,7 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) {
LLVMStyle.BinPackLongBracedList = true;
LLVMStyle.BinPackParameters = FormatStyle::BPPS_BinPack;
LLVMStyle.BitFieldColonSpacing = FormatStyle::BFCS_Both;
- LLVMStyle.BracedInitializerIndentWidth = std::nullopt;
+ LLVMStyle.BracedInitializerIndentWidth = -1;
LLVMStyle.BraceWrapping = {/*AfterCaseLabel=*/false,
/*AfterClass=*/false,
/*AfterControlStatement=*/FormatStyle::BWACS_Never,
diff --git a/clang/unittests/Format/ConfigParseTest.cpp b/clang/unittests/Format/ConfigParseTest.cpp
index 9cd262960b724..cda60440874be 100644
--- a/clang/unittests/Format/ConfigParseTest.cpp
+++ b/clang/unittests/Format/ConfigParseTest.cpp
@@ -265,9 +265,9 @@ TEST(ConfigParseTest, ParsesConfigurationIntegers) {
Style.Language = FormatStyle::LK_Cpp;
CHECK_PARSE_INT(AccessModifierOffset);
+ CHECK_PARSE_INT(BracedInitializerIndentWidth);
CHECK_PARSE_INT(PPIndentWidth);
- CHECK_PARSE_UNSIGNED(BracedInitializerIndentWidth);
CHECK_PARSE_UNSIGNED(ColumnLimit);
CHECK_PARSE_UNSIGNED(ConstructorInitializerIndentWidth);
CHECK_PARSE_UNSIGNED(ContinuationIndentWidth);
@@ -1441,8 +1441,9 @@ TEST(ConfigParseTest, GetStyleOfFile) {
ASSERT_EQ(*Style9, SubSubStyle);
// Test 9.8: use inheritance from a file without BasedOnStyle
- ASSERT_TRUE(FS.addFile("/e/withoutbase/.clang-format", 0,
- llvm::MemoryBuffer::getMemBuffer("ColumnLimit: 123")));
+ ASSERT_TRUE(FS.addFile(
+ "/e/withoutbase/.clang-format", 0,
+ llvm::MemoryBuffer::getMemBuffer("BracedInitializerIndentWidth: 2")));
ASSERT_TRUE(
FS.addFile("/e/withoutbase/sub/.clang-format", 0,
llvm::MemoryBuffer::getMemBuffer(
@@ -1452,7 +1453,7 @@ TEST(ConfigParseTest, GetStyleOfFile) {
ASSERT_TRUE(static_cast<bool>(Style9));
ASSERT_EQ(*Style9, [] {
auto Style = getLLVMStyle();
- Style.ColumnLimit = 123;
+ Style.BracedInitializerIndentWidth = 2;
return Style;
}());
@@ -1460,7 +1461,7 @@ TEST(ConfigParseTest, GetStyleOfFile) {
ASSERT_TRUE(static_cast<bool>(Style9));
ASSERT_EQ(*Style9, [] {
auto Style = getLLVMStyle();
- Style.ColumnLimit = 123;
+ Style.BracedInitializerIndentWidth = 2;
Style.IndentWidth = 7;
return Style;
}());
>From 7c6237c615c7ea890d6c9efbaeac1910112556b0 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Thu, 27 Feb 2025 19:25:16 -0800
Subject: [PATCH 2/2] Update ConfigParseTest.cpp
---
clang/unittests/Format/ConfigParseTest.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/clang/unittests/Format/ConfigParseTest.cpp b/clang/unittests/Format/ConfigParseTest.cpp
index cda60440874be..273bab87b1ee1 100644
--- a/clang/unittests/Format/ConfigParseTest.cpp
+++ b/clang/unittests/Format/ConfigParseTest.cpp
@@ -1443,7 +1443,8 @@ TEST(ConfigParseTest, GetStyleOfFile) {
// Test 9.8: use inheritance from a file without BasedOnStyle
ASSERT_TRUE(FS.addFile(
"/e/withoutbase/.clang-format", 0,
- llvm::MemoryBuffer::getMemBuffer("BracedInitializerIndentWidth: 2")));
+ llvm::MemoryBuffer::getMemBuffer("BracedInitializerIndentWidth: 2\n"
+ "ColumnLimit: 123")));
ASSERT_TRUE(
FS.addFile("/e/withoutbase/sub/.clang-format", 0,
llvm::MemoryBuffer::getMemBuffer(
@@ -1454,6 +1455,7 @@ TEST(ConfigParseTest, GetStyleOfFile) {
ASSERT_EQ(*Style9, [] {
auto Style = getLLVMStyle();
Style.BracedInitializerIndentWidth = 2;
+ Style.ColumnLimit = 123;
return Style;
}());
@@ -1462,6 +1464,7 @@ TEST(ConfigParseTest, GetStyleOfFile) {
ASSERT_EQ(*Style9, [] {
auto Style = getLLVMStyle();
Style.BracedInitializerIndentWidth = 2;
+ Style.ColumnLimit = 123;
Style.IndentWidth = 7;
return Style;
}());
More information about the cfe-commits
mailing list