kbobyrev created this revision.
kbobyrev added a reviewer: sammccall.
Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman, jkorous.
Herald added a project: clang.
kbobyrev requested review of this revision.
Herald added subscribers: MaskRay, ilya-biryukov.
As per LSP specification, allCommitCharacters should be string[] instead of
string:
https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D86604
Files:
clang-tools-extra/clangd/ClangdLSPServer.cpp
clang-tools-extra/clangd/test/initialize-params.test
Index: clang-tools-extra/clangd/test/initialize-params.test
===================================================================
--- clang-tools-extra/clangd/test/initialize-params.test
+++ clang-tools-extra/clangd/test/initialize-params.test
@@ -7,7 +7,35 @@
# CHECK-NEXT: "capabilities": {
# CHECK-NEXT: "codeActionProvider": true,
# CHECK-NEXT: "completionProvider": {
-# CHECK-NEXT: "allCommitCharacters": " \t()[]{}<>:;,+-/*%^&#?.=\"'|",
+# CHECK-NEXT: "allCommitCharacters": [
+# CHECK-NEXT: " ",
+# CHECK-NEXT: "\t",
+# CHECK-NEXT: "(",
+# CHECK-NEXT: ")",
+# CHECK-NEXT: "[",
+# CHECK-NEXT: "]",
+# CHECK-NEXT: "{",
+# CHECK-NEXT: "}",
+# CHECK-NEXT: "<",
+# CHECK-NEXT: ">",
+# CHECK-NEXT: ":",
+# CHECK-NEXT: ";",
+# CHECK-NEXT: ",",
+# CHECK-NEXT: "+",
+# CHECK-NEXT: "-",
+# CHECK-NEXT: "/",
+# CHECK-NEXT: "*",
+# CHECK-NEXT: "%",
+# CHECK-NEXT: "^",
+# CHECK-NEXT: "&",
+# CHECK-NEXT: "#",
+# CHECK-NEXT: "?",
+# CHECK-NEXT: ".",
+# CHECK-NEXT: "=",
+# CHECK-NEXT: "\"",
+# CHECK-NEXT: "'",
+# CHECK-NEXT: "|"
+# CHECK-NEXT: ],
# CHECK-NEXT: "resolveProvider": false,
# CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: ".",
Index: clang-tools-extra/clangd/ClangdLSPServer.cpp
===================================================================
--- clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -592,7 +592,10 @@
{"codeActionProvider", std::move(CodeActionProvider)},
{"completionProvider",
llvm::json::Object{
- {"allCommitCharacters", " \t()[]{}<>:;,+-/*%^&#?.=\"'|"},
+ {"allCommitCharacters",
+ {" ", "\t", "(", ")", "[", "]", "{", "}", "<",
+ ">", ":", ";", ",", "+", "-", "/", "*", "%",
+ "^", "&", "#", "?", ".", "=", "\"", "'", "|"}},
{"resolveProvider", false},
// We do extra checks, e.g. that > is part of ->.
{"triggerCharacters", {".", "<", ">", ":", "\"", "/"}},
Index: clang-tools-extra/clangd/test/initialize-params.test
===================================================================
--- clang-tools-extra/clangd/test/initialize-params.test
+++ clang-tools-extra/clangd/test/initialize-params.test
@@ -7,7 +7,35 @@
# CHECK-NEXT: "capabilities": {
# CHECK-NEXT: "codeActionProvider": true,
# CHECK-NEXT: "completionProvider": {
-# CHECK-NEXT: "allCommitCharacters": " \t()[]{}<>:;,+-/*%^&#?.=\"'|",
+# CHECK-NEXT: "allCommitCharacters": [
+# CHECK-NEXT: " ",
+# CHECK-NEXT: "\t",
+# CHECK-NEXT: "(",
+# CHECK-NEXT: ")",
+# CHECK-NEXT: "[",
+# CHECK-NEXT: "]",
+# CHECK-NEXT: "{",
+# CHECK-NEXT: "}",
+# CHECK-NEXT: "<",
+# CHECK-NEXT: ">",
+# CHECK-NEXT: ":",
+# CHECK-NEXT: ";",
+# CHECK-NEXT: ",",
+# CHECK-NEXT: "+",
+# CHECK-NEXT: "-",
+# CHECK-NEXT: "/",
+# CHECK-NEXT: "*",
+# CHECK-NEXT: "%",
+# CHECK-NEXT: "^",
+# CHECK-NEXT: "&",
+# CHECK-NEXT: "#",
+# CHECK-NEXT: "?",
+# CHECK-NEXT: ".",
+# CHECK-NEXT: "=",
+# CHECK-NEXT: "\"",
+# CHECK-NEXT: "'",
+# CHECK-NEXT: "|"
+# CHECK-NEXT: ],
# CHECK-NEXT: "resolveProvider": false,
# CHECK-NEXT: "triggerCharacters": [
# CHECK-NEXT: ".",
Index: clang-tools-extra/clangd/ClangdLSPServer.cpp
===================================================================
--- clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -592,7 +592,10 @@
{"codeActionProvider", std::move(CodeActionProvider)},
{"completionProvider",
llvm::json::Object{
- {"allCommitCharacters", " \t()[]{}<>:;,+-/*%^&#?.=\"'|"},
+ {"allCommitCharacters",
+ {" ", "\t", "(", ")", "[", "]", "{", "}", "<",
+ ">", ":", ";", ",", "+", "-", "/", "*", "%",
+ "^", "&", "#", "?", ".", "=", "\"", "'", "|"}},
{"resolveProvider", false},
// We do extra checks, e.g. that > is part of ->.
{"triggerCharacters", {".", "<", ">", ":", "\"", "/"}},
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
