Index: clangd/ClangdLSPServer.cpp
===================================================================
--- clangd/ClangdLSPServer.cpp
+++ clangd/ClangdLSPServer.cpp
@@ -36,29 +36,31 @@
 
 void ClangdLSPServer::onInitialize(Ctx C, InitializeParams &Params) {
   C.reply(json::obj{
-      {"textDocumentSync", 1},
-      {"documentFormattingProvider", true},
-      {"documentRangeFormattingProvider", true},
-      {"documentOnTypeFormattingProvider",
+      {"capabilities",
        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}},
-       }},
+           {"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);
Index: test/clangd/initialize-params-invalid.test
===================================================================
--- test/clangd/initialize-params-invalid.test
+++ test/clangd/initialize-params-invalid.test
@@ -8,34 +8,36 @@
 #      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
 
Index: test/clangd/initialize-params.test
===================================================================
--- test/clangd/initialize-params.test
+++ test/clangd/initialize-params.test
@@ -8,34 +8,36 @@
 #      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