[clangd] Actually parse Index section of the YAML file.

[adamcz]

Summary

This fixes a bug in dbf486c0de92c76df77c1a1f815cf16533ecbb3a, which
introduced the Index section of the config, but did not register the
parse method, so it didn't work in a YAML file (but did in a test).

[kadircet]

oh shoot, thanks for catching this. i'll leave the stamp to sam, just came here to remind that this needs to be cherry-picked into release branch :/

[sammccall]

Argh, sorry. I think this might be too late to get into 11 - we're in the "soon=final" stage and maybe any changes at all cause logistical problems? :-(

@hans to confirm - this is a feature that was meant to be in the 11 release (and was implemented and tested) but the flag to enable it wasn't wired up.

[hans]

In D87710#2275933, @sammccall wrote:

Argh, sorry. I think this might be too late to get into 11 - we're in the "soon=final" stage and maybe any changes at all cause logistical problems? :-(

@hans to confirm - this is a feature that was meant to be in the 11 release (and was implemented and tested) but the flag to enable it wasn't wired up.

Okay, I'll cherry-pick it once it lands.

[hans]

Pushed to 11.x as 4a26e3b33798424dc5a4843f7b29a617bef81656.

[sammccall]

Thanks Hans!

clang-tools-extra/clangd/ConfigYAML.cpp

public:
   Parser(llvm::SourceMgr &SM) : SM(SM) {}
 
   // Tries to parse N into F, returning false if it failed and we couldn't
   // meaningfully recover (YAML syntax error, or hard semantic error).
   bool parse(Fragment &F, Node &N) {
     DictParser Dict("Config", this);
     Dict.handle("If", [&](Node &N) { parse(F.If, N); });
     Dict.handle("CompileFlags", [&](Node &N) { parse(F.CompileFlags, N); });
+    Dict.handle("Index", [&](Node &N) { parse(F.Index, N); });
     Dict.parse(N);
     return !(N.failed() || HadError);
   }
 
 private:
   void parse(Fragment::IfBlock &F, Node &N) {
     DictParser Dict("If", this);
     Dict.unrecognized(

clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp

If:
   PathMatch:
     - 'abc'
 CompileFlags: { Add: [foo, bar] }
 ---
 CompileFlags:
   Add: |
     b
     az
+---
+Index:
+  Background: Skip
   )yaml";
   auto Results = Fragment::parseYAML(YAML, "config.yaml", Diags.callback());
   EXPECT_THAT(Diags.Diagnostics, IsEmpty());
-  ASSERT_EQ(Results.size(), 2u);
-  EXPECT_FALSE(Results.front().If.HasUnrecognizedCondition);
-  EXPECT_THAT(Results.front().If.PathMatch, ElementsAre(Val("abc")));
-  EXPECT_THAT(Results.front().CompileFlags.Add,
-              ElementsAre(Val("foo"), Val("bar")));
+  ASSERT_EQ(Results.size(), 3u);
+  EXPECT_FALSE(Results[0].If.HasUnrecognizedCondition);
+  EXPECT_THAT(Results[0].If.PathMatch, ElementsAre(Val("abc")));
+  EXPECT_THAT(Results[0].CompileFlags.Add, ElementsAre(Val("foo"), Val("bar")));
+
+  EXPECT_THAT(Results[1].CompileFlags.Add, ElementsAre(Val("b\naz\n")));
 
-  EXPECT_THAT(Results.back().CompileFlags.Add, ElementsAre(Val("b\naz\n")));
+  ASSERT_TRUE(Results[2].Index.Background);
+  EXPECT_EQ("Skip", *Results[2].Index.Background.getValue());
 }
 
 TEST(ParseYAML, Locations) {
   CapturedDiags Diags;
   Annotations YAML(R"yaml(
 If:
   PathMatch: [['???bad***regex(((']]
   )yaml");