Skip to content

Commit 9d11e67

Browse files
committed
[clangd] Use string[] for allCommitCharacters
As per LSP specification, allCommitCharacters should be string[] instead of string: https://microsoft.github.io/language-server-protocol/specification#textDocument_completion Reviewed By: sammccall Differential Revision: https://reviews.llvm.org/D86604
1 parent 3d120b6 commit 9d11e67

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

clang-tools-extra/clangd/ClangdLSPServer.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,10 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
592592
{"codeActionProvider", std::move(CodeActionProvider)},
593593
{"completionProvider",
594594
llvm::json::Object{
595-
{"allCommitCharacters", " \t()[]{}<>:;,+-/*%^&#?.=\"'|"},
595+
{"allCommitCharacters",
596+
{" ", "\t", "(", ")", "[", "]", "{", "}", "<",
597+
">", ":", ";", ",", "+", "-", "/", "*", "%",
598+
"^", "&", "#", "?", ".", "=", "\"", "'", "|"}},
596599
{"resolveProvider", false},
597600
// We do extra checks, e.g. that > is part of ->.
598601
{"triggerCharacters", {".", "<", ">", ":", "\"", "/"}},

clang-tools-extra/clangd/test/initialize-params.test

+29-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,35 @@
77
# CHECK-NEXT: "capabilities": {
88
# CHECK-NEXT: "codeActionProvider": true,
99
# CHECK-NEXT: "completionProvider": {
10-
# CHECK-NEXT: "allCommitCharacters": " \t()[]{}<>:;,+-/*%^&#?.=\"'|",
10+
# CHECK-NEXT: "allCommitCharacters": [
11+
# CHECK-NEXT: " ",
12+
# CHECK-NEXT: "\t",
13+
# CHECK-NEXT: "(",
14+
# CHECK-NEXT: ")",
15+
# CHECK-NEXT: "[",
16+
# CHECK-NEXT: "]",
17+
# CHECK-NEXT: "{",
18+
# CHECK-NEXT: "}",
19+
# CHECK-NEXT: "<",
20+
# CHECK-NEXT: ">",
21+
# CHECK-NEXT: ":",
22+
# CHECK-NEXT: ";",
23+
# CHECK-NEXT: ",",
24+
# CHECK-NEXT: "+",
25+
# CHECK-NEXT: "-",
26+
# CHECK-NEXT: "/",
27+
# CHECK-NEXT: "*",
28+
# CHECK-NEXT: "%",
29+
# CHECK-NEXT: "^",
30+
# CHECK-NEXT: "&",
31+
# CHECK-NEXT: "#",
32+
# CHECK-NEXT: "?",
33+
# CHECK-NEXT: ".",
34+
# CHECK-NEXT: "=",
35+
# CHECK-NEXT: "\"",
36+
# CHECK-NEXT: "'",
37+
# CHECK-NEXT: "|"
38+
# CHECK-NEXT: ],
1139
# CHECK-NEXT: "resolveProvider": false,
1240
# CHECK-NEXT: "triggerCharacters": [
1341
# CHECK-NEXT: ".",

0 commit comments

Comments
 (0)