================
@@ -958,9 +958,13 @@ template <> struct MappingTraits<FormatStyle> {
// For backward compatibility.
BracketAlignmentStyle LocalBAS = BAS_Align;
if (IsGoogleOrChromium) {
- if (Style.Language == FormatStyle::LK_JavaScript) {
+ FormatStyle::LanguageKind Language =
----------------
gedare wrote:
It turns out this isn't supported already...
```
diff --git a/clang/unittests/Format/ConfigParseTest.cpp
b/clang/unittests/Format/ConfigParseTest.cpp
index 7c993c0f8fd3..3d78bf11dad8 100644
--- a/clang/unittests/Format/ConfigParseTest.cpp
+++ b/clang/unittests/Format/ConfigParseTest.cpp
@@ -83,7 +83,7 @@ TEST(ConfigParseTest, GetsCorrectBasedOnStyle) {
EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Styles[1]).value());
EXPECT_ALL_STYLES_EQUAL(Styles);
- Styles.resize(5);
+ Styles.resize(6);
Styles[0] = getGoogleStyle(FormatStyle::LK_JavaScript);
Styles[1] = getLLVMStyle();
Styles[1].Language = FormatStyle::LK_JavaScript;
@@ -113,6 +113,12 @@ TEST(ConfigParseTest, GetsCorrectBasedOnStyle) {
"Language: JavaScript",
&Styles[4])
.value());
+ Styles[5] = getLLVMStyle();
+ Styles[5].Language = FormatStyle::LK_Cpp;
+ EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google\n"
+ "Language: JavaScript",
+ &Styles[5])
+ .value());
EXPECT_ALL_STYLES_EQUAL(Styles);
```
This fails on `main`.
https://github.com/llvm/llvm-project/pull/108332
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
