This is an archive of the discontinued LLVM Phabricator instance.

Differential D86604

[clangd] Use string[] for allCommitCharacters
ClosedPublic

Authored by kbobyrev on Aug 26 2020, 2:21 AM.

Details

Reviewers
sammccall
Commits
rG9d11e6789c47: [clangd] Use string[] for allCommitCharacters
Summary

As per LSP specification, allCommitCharacters should be string[] instead of
string:

https://microsoft.github.io/language-server-protocol/specification#textDocument_completion

Diff Detail

Event Timeline

kbobyrev created this revision.Aug 26 2020, 2:21 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 26 2020, 2:21 AM
Herald added subscribers: cfe-commits, usaxena95, kadircet and 2 others. · View Herald Transcript
kbobyrev requested review of this revision.Aug 26 2020, 2:21 AM
Herald added subscribers: MaskRay, ilya-biryukov. · View Herald TranscriptAug 26 2020, 2:21 AM
Harbormaster completed remote builds in B69555: Diff 287879.Aug 26 2020, 2:27 AM
sammccall accepted this revision.Aug 26 2020, 4:18 AM

Oops, nice catch!

This revision is now accepted and ready to land.Aug 26 2020, 4:18 AM
Closed by commit rG9d11e6789c47: [clangd] Use string[] for allCommitCharacters (authored by kbobyrev). · Explain WhyAug 26 2020, 8:08 AM
This revision was automatically updated to reflect the committed changes.
kbobyrev added a commit: rG9d11e6789c47: [clangd] Use string[] for allCommitCharacters.

Revision Contents

PathSize
clang-tools-extra/
clangd/
5 lines
test/
30 lines

Diff 287979

clang-tools-extra/clangd/ClangdLSPServer.cpp

Show First 20 Lines • Show All 586 Lines • ▼ Show 20 Lines llvm::json::Object Result{
{"documentOnTypeFormattingProvider", {"documentOnTypeFormattingProvider",
llvm::json::Object{ llvm::json::Object{
{"firstTriggerCharacter", "\n"}, {"firstTriggerCharacter", "\n"},
{"moreTriggerCharacter", {}}, {"moreTriggerCharacter", {}},
}}, }},
{"codeActionProvider", std::move(CodeActionProvider)}, {"codeActionProvider", std::move(CodeActionProvider)},
{"completionProvider", {"completionProvider",
llvm::json::Object{ llvm::json::Object{
{"allCommitCharacters", " \t()[]{}<>:;,+-/*%^&#?.=\"'|"}, {"allCommitCharacters",
{" ", "\t", "(", ")", "[", "]", "{", "}", "<",
">", ":", ";", ",", "+", "-", "/", "*", "%",
"^", "&", "#", "?", ".", "=", "\"", "'", "|"}},
{"resolveProvider", false}, {"resolveProvider", false},
// We do extra checks, e.g. that > is part of ->. // We do extra checks, e.g. that > is part of ->.
{"triggerCharacters", {".", "<", ">", ":", "\"", "/"}}, {"triggerCharacters", {".", "<", ">", ":", "\"", "/"}},
}}, }},
{"semanticTokensProvider", {"semanticTokensProvider",
llvm::json::Object{ llvm::json::Object{
{"full", llvm::json::Object{{"delta", true}}}, {"full", llvm::json::Object{{"delta", true}}},
{"range", false}, {"range", false},
▲ Show 20 Lines • Show All 1,003 Lines • Show Last 20 Lines

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

# RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s # RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s
# Test initialize request parameters with rootUri # Test initialize request parameters with rootUri
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"test:///workspace","capabilities":{},"trace":"off"}} {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"test:///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: "capabilities": {
# CHECK-NEXT: "codeActionProvider": true, # CHECK-NEXT: "codeActionProvider": true,
# CHECK-NEXT: "completionProvider": { # 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: "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: "/" # CHECK-NEXT: "/"
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines