[clangd] Fix initialize capabilities response

llvm-svn: 317584

3 files changed, 86 insertions, 80 deletions

diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp
index e21695185b9..aa73e737f22 100644
--- a/clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ b/clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -36,30 +36,32 @@ replacementsToEdits(StringRef Code,
 
 void ClangdLSPServer::onInitialize(Ctx C, InitializeParams &Params) {
   C.reply(json::obj{
-      {"textDocumentSync", 1},
-      {"documentFormattingProvider", true},
-      {"documentRangeFormattingProvider", true},
-      {"documentOnTypeFormattingProvider",
-       json::obj{
-           {"firstTriggerCharacter", "}"},
-           {"moreTriggerCharacter", {}},
-       }},
-      {"codeActionProvider", true},
-      {"completionProvider",
-       json::obj{
-           {"resolveProvider", false},
-           {"triggerCharacters", {".", ">", ":"}},
-       }},
-      {"signatureHelpProvider",
-       json::obj{
-           {"triggerCharacters", {"(", ","}},
-       }},
-      {"definitionProvider", true},
-      {"executeCommandProvider",
-       json::obj{
-           {"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}},
-       }},
-  });
+      {{"capabilities",
+        json::obj{
+            {"textDocumentSync", 1},
+            {"documentFormattingProvider", true},
+            {"documentRangeFormattingProvider", true},
+            {"documentOnTypeFormattingProvider",
+             json::obj{
+                 {"firstTriggerCharacter", "}"},
+                 {"moreTriggerCharacter", {}},
+             }},
+            {"codeActionProvider", true},
+            {"completionProvider",
+             json::obj{
+                 {"resolveProvider", false},
+                 {"triggerCharacters", {".", ">", ":"}},
+             }},
+            {"signatureHelpProvider",
+             json::obj{
+                 {"triggerCharacters", {"(", ","}},
+             }},
+            {"definitionProvider", true},
+            {"executeCommandProvider",
+             json::obj{
+                 {"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}},
+             }},
+        }}}});
   if (Params.rootUri && !Params.rootUri->file.empty())
     Server.setRootPath(Params.rootUri->file);
   else if (Params.rootPath && !Params.rootPath->empty())
diff --git a/clang-tools-extra/test/clangd/initialize-params-invalid.test b/clang-tools-extra/test/clangd/initialize-params-invalid.test
index 535dc2c0a98..9f9c69d14b4 100644
--- a/clang-tools-extra/test/clangd/initialize-params-invalid.test
+++ b/clang-tools-extra/test/clangd/initialize-params-invalid.test
@@ -8,34 +8,36 @@ Content-Length: 142
 #      CHECK:  "id": 0,

 # CHECK-NEXT:  "jsonrpc": "2.0",

 # CHECK-NEXT:  "result": {

-# CHECK-NEXT:    "codeActionProvider": true,

-# CHECK-NEXT:    "completionProvider": {

-# CHECK-NEXT:      "resolveProvider": false,

-# CHECK-NEXT:      "triggerCharacters": [

-# CHECK-NEXT:        ".",

-# CHECK-NEXT:        ">",

-# CHECK-NEXT:        ":"

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "definitionProvider": true,

-# CHECK-NEXT:    "documentFormattingProvider": true,

-# CHECK-NEXT:    "documentOnTypeFormattingProvider": {

-# CHECK-NEXT:      "firstTriggerCharacter": "}",

-# CHECK-NEXT:      "moreTriggerCharacter": []

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "documentRangeFormattingProvider": true,

-# CHECK-NEXT:    "executeCommandProvider": {

-# CHECK-NEXT:      "commands": [

-# CHECK-NEXT:        "clangd.applyFix"

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "signatureHelpProvider": {

-# CHECK-NEXT:      "triggerCharacters": [

-# CHECK-NEXT:        "(",

-# CHECK-NEXT:        ","

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "textDocumentSync": 1

+# CHECK-NEXT:    "capabilities": {

+# CHECK-NEXT:      "codeActionProvider": true,

+# CHECK-NEXT:      "completionProvider": {

+# CHECK-NEXT:        "resolveProvider": false,

+# CHECK-NEXT:        "triggerCharacters": [

+# CHECK-NEXT:          ".",

+# CHECK-NEXT:          ">",

+# CHECK-NEXT:          ":"

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "definitionProvider": true,

+# CHECK-NEXT:      "documentFormattingProvider": true,

+# CHECK-NEXT:      "documentOnTypeFormattingProvider": {

+# CHECK-NEXT:        "firstTriggerCharacter": "}",

+# CHECK-NEXT:        "moreTriggerCharacter": []

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "documentRangeFormattingProvider": true,

+# CHECK-NEXT:      "executeCommandProvider": {

+# CHECK-NEXT:        "commands": [

+# CHECK-NEXT:          "clangd.applyFix"

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "signatureHelpProvider": {

+# CHECK-NEXT:        "triggerCharacters": [

+# CHECK-NEXT:          "(",

+# CHECK-NEXT:          ","

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "textDocumentSync": 1

+# CHECK-NEXT:    }

 # CHECK-NEXT:  }

 Content-Length: 44

 

diff --git a/clang-tools-extra/test/clangd/initialize-params.test b/clang-tools-extra/test/clangd/initialize-params.test
index af9b3d4ea33..60fc05ec069 100644
--- a/clang-tools-extra/test/clangd/initialize-params.test
+++ b/clang-tools-extra/test/clangd/initialize-params.test
@@ -8,34 +8,36 @@ Content-Length: 143
 #      CHECK:  "id": 0,

 # CHECK-NEXT:  "jsonrpc": "2.0",

 # CHECK-NEXT:  "result": {

-# CHECK-NEXT:    "codeActionProvider": true,

-# CHECK-NEXT:    "completionProvider": {

-# CHECK-NEXT:      "resolveProvider": false,

-# CHECK-NEXT:      "triggerCharacters": [

-# CHECK-NEXT:        ".",

-# CHECK-NEXT:        ">",

-# CHECK-NEXT:        ":"

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "definitionProvider": true,

-# CHECK-NEXT:    "documentFormattingProvider": true,

-# CHECK-NEXT:    "documentOnTypeFormattingProvider": {

-# CHECK-NEXT:      "firstTriggerCharacter": "}",

-# CHECK-NEXT:      "moreTriggerCharacter": []

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "documentRangeFormattingProvider": true,

-# CHECK-NEXT:    "executeCommandProvider": {

-# CHECK-NEXT:      "commands": [

-# CHECK-NEXT:        "clangd.applyFix"

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "signatureHelpProvider": {

-# CHECK-NEXT:      "triggerCharacters": [

-# CHECK-NEXT:        "(",

-# CHECK-NEXT:        ","

-# CHECK-NEXT:      ]

-# CHECK-NEXT:    },

-# CHECK-NEXT:    "textDocumentSync": 1

+# CHECK-NEXT:    "capabilities": {

+# CHECK-NEXT:      "codeActionProvider": true,

+# CHECK-NEXT:      "completionProvider": {

+# CHECK-NEXT:        "resolveProvider": false,

+# CHECK-NEXT:        "triggerCharacters": [

+# CHECK-NEXT:          ".",

+# CHECK-NEXT:          ">",

+# CHECK-NEXT:          ":"

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "definitionProvider": true,

+# CHECK-NEXT:      "documentFormattingProvider": true,

+# CHECK-NEXT:      "documentOnTypeFormattingProvider": {

+# CHECK-NEXT:        "firstTriggerCharacter": "}",

+# CHECK-NEXT:        "moreTriggerCharacter": []

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "documentRangeFormattingProvider": true,

+# CHECK-NEXT:      "executeCommandProvider": {

+# CHECK-NEXT:        "commands": [

+# CHECK-NEXT:          "clangd.applyFix"

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "signatureHelpProvider": {

+# CHECK-NEXT:        "triggerCharacters": [

+# CHECK-NEXT:          "(",

+# CHECK-NEXT:          ","

+# CHECK-NEXT:        ]

+# CHECK-NEXT:      },

+# CHECK-NEXT:      "textDocumentSync": 1

+# CHECK-NEXT:    }

 # CHECK-NEXT:  }

 Content-Length: 44