================
@@ -485,19 +484,23 @@ TEST(ConfigParseTest, ParsesConfiguration) {
CHECK_PARSE("BreakBeforeInheritanceComma: true", BreakInheritanceList,
FormatStyle::BILS_BeforeComma);
- Style.BinPackParameters = FormatStyle::BPPS_OnePerLine;
- CHECK_PARSE("BinPackParameters: BinPack", BinPackParameters,
- FormatStyle::BPPS_BinPack);
- CHECK_PARSE("BinPackParameters: OnePerLine", BinPackParameters,
- FormatStyle::BPPS_OnePerLine);
- CHECK_PARSE("BinPackParameters: AlwaysOnePerLine", BinPackParameters,
- FormatStyle::BPPS_AlwaysOnePerLine);
- // For backward compatibility.
- CHECK_PARSE("BinPackParameters: true", BinPackParameters,
- FormatStyle::BPPS_BinPack);
- CHECK_PARSE("BinPackParameters: false", BinPackParameters,
- FormatStyle::BPPS_OnePerLine);
-
+ Style.PackArguments.BinPack = FormatStyle::BPAS_OnePerLine;
+ CHECK_PARSE_NESTED_VALUE("BinPack: BinPack", PackArguments, BinPack,
+ FormatStyle::BPAS_BinPack);
+ CHECK_PARSE_NESTED_VALUE("BinPack: OnePerLine", PackArguments, BinPack,
+ FormatStyle::BPAS_OnePerLine);
+ CHECK_PARSE_NESTED_VALUE("BinPack: UseBreakAfter", PackArguments, BinPack,
+ FormatStyle::BPAS_UseBreakAfter);
+ CHECK_PARSE_NESTED_VALUE("BreakAfter: 1234", PackArguments,
+ BreakAfter, 1234u);
+ // For backward compatibility:
+ CHECK_PARSE_NESTED_VALUE("BinPack: true", PackArguments, BinPack,
----------------
HazardyKnusperkeks wrote:
Also add tests to check the old names are still parsed correctly, and also the
combination, that the new option takes precedence.
https://github.com/llvm/llvm-project/pull/181281
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
