This is an archive of the discontinued LLVM Phabricator instance.

Differential D39735

[clangd] Fix missing 'capabilities' field in initialize
AbandonedPublic

Authored by malaperle on Nov 7 2017, 7:55 AM.

Details

Reviewers
sammccall
Summary

Without this, the client can think that the server has no capabilities
so it will stop sending any requests.

Diff Detail

Event Timeline

malaperle created this revision.Nov 7 2017, 7:55 AM
Herald added a subscriber: ilya-biryukov. · View Herald TranscriptNov 7 2017, 7:55 AM
Harbormaster completed remote builds in B11910: Diff 121907.Nov 7 2017, 7:55 AM
malaperle added a reviewer: sammccall.Nov 7 2017, 7:55 AM
malaperle set the repository for this revision to rL LLVM.
malaperle added a project: Restricted Project.
malaperle added a subscriber: cfe-commits.
malaperle abandoned this revision.Nov 7 2017, 7:58 AM

Already committed.

Revision Contents

PathSize
clangd/
46 lines
test/
clangd/
58 lines
58 lines

Diff 121907

clangd/ClangdLSPServer.cpp

Show All 30 LinesreplacementsToEdits(StringRef Code,
} }
return Edits; return Edits;
} }
} // namespace } // namespace
void ClangdLSPServer::onInitialize(Ctx C, InitializeParams &Params) { void ClangdLSPServer::onInitialize(Ctx C, InitializeParams &Params) {
C.reply(json::obj{ C.reply(json::obj{
{"capabilities",
json::obj{
{"textDocumentSync", 1}, {"textDocumentSync", 1},
{"documentFormattingProvider", true}, {"documentFormattingProvider", true},
{"documentRangeFormattingProvider", true}, {"documentRangeFormattingProvider", true},
{"documentOnTypeFormattingProvider", {"documentOnTypeFormattingProvider",
json::obj{ json::obj{
{"firstTriggerCharacter", "}"}, {"firstTriggerCharacter", "}"},
{"moreTriggerCharacter", {}}, {"moreTriggerCharacter", {}},
}}, }},
{"codeActionProvider", true}, {"codeActionProvider", true},
{"completionProvider", {"completionProvider",
json::obj{ json::obj{
{"resolveProvider", false}, {"resolveProvider", false},
{"triggerCharacters", {".", ">", ":"}}, {"triggerCharacters", {".", ">", ":"}},
}}, }},
{"signatureHelpProvider", {"signatureHelpProvider",
json::obj{ json::obj{
{"triggerCharacters", {"(", ","}}, {"triggerCharacters", {"(", ","}},
}}, }},
{"definitionProvider", true}, {"definitionProvider", true},
{"executeCommandProvider", {"executeCommandProvider",
json::obj{ json::obj{
{"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}}, {"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}},
}}, }}}},
}); });
if (Params.rootUri && !Params.rootUri->file.empty()) if (Params.rootUri && !Params.rootUri->file.empty())
Server.setRootPath(Params.rootUri->file); Server.setRootPath(Params.rootUri->file);
else if (Params.rootPath && !Params.rootPath->empty()) else if (Params.rootPath && !Params.rootPath->empty())
Server.setRootPath(*Params.rootPath); Server.setRootPath(*Params.rootPath);
} }
void ClangdLSPServer::onShutdown(Ctx C, ShutdownParams &Params) { void ClangdLSPServer::onShutdown(Ctx C, ShutdownParams &Params) {
▲ Show 20 Lines • Show All 230 Lines • Show Last 20 Lines

test/clangd/initialize-params-invalid.test

# RUN: clangd -pretty -run-synchronously < %s | FileCheck -strict-whitespace %s # RUN: clangd -pretty -run-synchronously < %s | FileCheck -strict-whitespace %s
# It is absolutely vital that this file has CRLF line endings. # It is absolutely vital that this file has CRLF line endings.
# #
# Test with invalid initialize request parameters # Test with invalid initialize request parameters
Content-Length: 142 Content-Length: 142
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":"","rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}} {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":"","rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}}
# CHECK: "id": 0, # CHECK: "id": 0,
# CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "jsonrpc": "2.0",
# CHECK-NEXT: "result": { # CHECK-NEXT: "result": {
# CHECK-NEXT: "capabilities": {
# CHECK-NEXT: "codeActionProvider": true, # CHECK-NEXT: "codeActionProvider": true,
# CHECK-NEXT: "completionProvider": { # CHECK-NEXT: "completionProvider": {
# CHECK-NEXT: "resolveProvider": false, # CHECK-NEXT: "resolveProvider": false,
# CHECK-NEXT: "triggerCharacters": [ # CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: ".", # CHECK-NEXT: ".",
# CHECK-NEXT: ">", # CHECK-NEXT: ">",
# CHECK-NEXT: ":" # CHECK-NEXT: ":"
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "definitionProvider": true, # CHECK-NEXT: "definitionProvider": true,
# CHECK-NEXT: "documentFormattingProvider": true, # CHECK-NEXT: "documentFormattingProvider": true,
# CHECK-NEXT: "documentOnTypeFormattingProvider": { # CHECK-NEXT: "documentOnTypeFormattingProvider": {
# CHECK-NEXT: "firstTriggerCharacter": "}", # CHECK-NEXT: "firstTriggerCharacter": "}",
# CHECK-NEXT: "moreTriggerCharacter": [] # CHECK-NEXT: "moreTriggerCharacter": []
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "documentRangeFormattingProvider": true, # CHECK-NEXT: "documentRangeFormattingProvider": true,
# CHECK-NEXT: "executeCommandProvider": { # CHECK-NEXT: "executeCommandProvider": {
# CHECK-NEXT: "commands": [ # CHECK-NEXT: "commands": [
# CHECK-NEXT: "clangd.applyFix" # CHECK-NEXT: "clangd.applyFix"
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "signatureHelpProvider": { # CHECK-NEXT: "signatureHelpProvider": {
# CHECK-NEXT: "triggerCharacters": [ # CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: "(", # CHECK-NEXT: "(",
# CHECK-NEXT: "," # CHECK-NEXT: ","
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "textDocumentSync": 1 # CHECK-NEXT: "textDocumentSync": 1
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: }
Content-Length: 44 Content-Length: 44
{"jsonrpc":"2.0","id":3,"method":"shutdown"} {"jsonrpc":"2.0","id":3,"method":"shutdown"}
Content-Length: 33 Content-Length: 33
{"jsonrpc":"2.0":"method":"exit"} {"jsonrpc":"2.0":"method":"exit"}

test/clangd/initialize-params.test

# RUN: clangd -pretty -run-synchronously < %s | FileCheck -strict-whitespace %s # RUN: clangd -pretty -run-synchronously < %s | FileCheck -strict-whitespace %s
# It is absolutely vital that this file has CRLF line endings. # It is absolutely vital that this file has CRLF line endings.
# #
# Test initialize request parameters with rootUri # Test initialize request parameters with rootUri
Content-Length: 143 Content-Length: 143
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}} {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}}
# CHECK: "id": 0, # CHECK: "id": 0,
# CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "jsonrpc": "2.0",
# CHECK-NEXT: "result": { # CHECK-NEXT: "result": {
# CHECK-NEXT: "capabilities": {
# CHECK-NEXT: "codeActionProvider": true, # CHECK-NEXT: "codeActionProvider": true,
# CHECK-NEXT: "completionProvider": { # CHECK-NEXT: "completionProvider": {
# CHECK-NEXT: "resolveProvider": false, # CHECK-NEXT: "resolveProvider": false,
# CHECK-NEXT: "triggerCharacters": [ # CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: ".", # CHECK-NEXT: ".",
# CHECK-NEXT: ">", # CHECK-NEXT: ">",
# CHECK-NEXT: ":" # CHECK-NEXT: ":"
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "definitionProvider": true, # CHECK-NEXT: "definitionProvider": true,
# CHECK-NEXT: "documentFormattingProvider": true, # CHECK-NEXT: "documentFormattingProvider": true,
# CHECK-NEXT: "documentOnTypeFormattingProvider": { # CHECK-NEXT: "documentOnTypeFormattingProvider": {
# CHECK-NEXT: "firstTriggerCharacter": "}", # CHECK-NEXT: "firstTriggerCharacter": "}",
# CHECK-NEXT: "moreTriggerCharacter": [] # CHECK-NEXT: "moreTriggerCharacter": []
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "documentRangeFormattingProvider": true, # CHECK-NEXT: "documentRangeFormattingProvider": true,
# CHECK-NEXT: "executeCommandProvider": { # CHECK-NEXT: "executeCommandProvider": {
# CHECK-NEXT: "commands": [ # CHECK-NEXT: "commands": [
# CHECK-NEXT: "clangd.applyFix" # CHECK-NEXT: "clangd.applyFix"
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "signatureHelpProvider": { # CHECK-NEXT: "signatureHelpProvider": {
# CHECK-NEXT: "triggerCharacters": [ # CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: "(", # CHECK-NEXT: "(",
# CHECK-NEXT: "," # CHECK-NEXT: ","
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: }, # CHECK-NEXT: },
# CHECK-NEXT: "textDocumentSync": 1 # CHECK-NEXT: "textDocumentSync": 1
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: }
Content-Length: 44 Content-Length: 44
{"jsonrpc":"2.0","id":3,"method":"shutdown"} {"jsonrpc":"2.0","id":3,"method":"shutdown"}
# CHECK: "id": 3, # CHECK: "id": 3,
# CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "jsonrpc": "2.0",
# CHECK-NEXT: "result": null # CHECK-NEXT: "result": null
Content-Length: 33 Content-Length: 33
{"jsonrpc":"2.0":"method":"exit"} {"jsonrpc":"2.0":"method":"exit"}