Skip to content

Commit

Permalink
chore(deps)!: update LSP libraries to match 3.17 spec (#532)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: LSP libraries updated to match the 3.17 version of the LSP spec. Requires minimum Node 14.
  • Loading branch information
rchl committed Aug 6, 2022
1 parent 1f52703 commit bdbdd83
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"pkg-up": "^3.1.0",
"semver": "^7.3.5",
"tempy": "^1.0.1",
"vscode-languageserver": "^7.0.0",
"vscode-languageserver-protocol": "3.16.0",
"vscode-languageserver": "^8.0.2",
"vscode-languageserver-protocol": "^3.17.2",
"vscode-languageserver-textdocument": "1.0.5",
"vscode-uri": "^3.0.2",
"which": "^2.0.2"
Expand All @@ -56,6 +56,7 @@
"@types/fs-extra": "^9.0.11",
"@types/mocha": "^9.0.0",
"@types/node": "^16.11.6",
"@types/semver": "^7.3.10",
"@types/which": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.3.1",
"@typescript-eslint/parser": "^5.3.1",
Expand Down
4 changes: 2 additions & 2 deletions src/lsp-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface LspClient {
publishDiagnostics(args: lsp.PublishDiagnosticsParams): void;
showMessage(args: lsp.ShowMessageParams): void;
logMessage(args: lsp.LogMessageParams): void;
applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResponse>;
applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult>;
telemetry(args: any): void;
rename(args: lsp.TextDocumentPositionParams): Promise<any>;
}
Expand Down Expand Up @@ -85,7 +85,7 @@ export class LspClientImpl implements LspClient {
this.connection.sendNotification(lsp.TelemetryEventNotification.type, args);
}

async applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResponse> {
async applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult> {
return this.connection.sendRequest(lsp.ApplyWorkspaceEditRequest.type, args);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export async function createServer(options: {
telemetry(args): void {
logger.log('telemetry', JSON.stringify(args));
},
async applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResponse> {
async applyWorkspaceEdit(args: lsp.ApplyWorkspaceEditParams): Promise<lsp.ApplyWorkspaceEditResult> {
server.workspaceEdits.push(args);
return { applied: true };
},
Expand Down
3 changes: 1 addition & 2 deletions src/tsp-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ interface TypeScriptRequestTypes {
'completionInfo': [protocol.CompletionsRequestArgs, protocol.CompletionInfoResponse];
'configure': [protocol.ConfigureRequestArguments, protocol.ConfigureResponse];
'definition': [protocol.FileLocationRequestArgs, protocol.DefinitionResponse];
'definitionAndBoundSpan': [protocol.FileLocationRequestArgs, protocol.DefinitionInfoAndBoundSpanReponse];
'definitionAndBoundSpan': [protocol.FileLocationRequestArgs, protocol.DefinitionInfoAndBoundSpanResponse];
'docCommentTemplate': [protocol.FileLocationRequestArgs, protocol.DocCommandTemplateResponse];
'format': [protocol.FormatRequestArgs, protocol.FormatResponse];
'formatonkey': [protocol.FormatOnKeyRequestArgs, protocol.FormatResponse];
Expand All @@ -56,7 +56,6 @@ interface TypeScriptRequestTypes {
'jsxClosingTag': [protocol.JsxClosingTagRequestArgs, protocol.JsxClosingTagResponse];
'navto': [protocol.NavtoRequestArgs, protocol.NavtoResponse];
'navtree': [protocol.FileRequestArgs, protocol.NavTreeResponse];
'occurrences': [protocol.FileLocationRequestArgs, protocol.OccurrencesResponse];
'organizeImports': [protocol.OrganizeImportsRequestArgs, protocol.OrganizeImportsResponse];
'projectInfo': [protocol.ProjectInfoRequestArgs, protocol.ProjectInfoResponse];
'quickinfo': [protocol.FileLocationRequestArgs, protocol.QuickInfoResponse];
Expand Down
43 changes: 24 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==

"@types/semver@^7.3.10":
version "7.3.10"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==

"@types/which@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/which/-/which-2.0.1.tgz#27ecd67f915b7c3d6ba552135bb1eecd66e63501"
Expand Down Expand Up @@ -1702,35 +1707,35 @@ v8-compile-cache@^2.0.3:
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==

vscode-jsonrpc@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
vscode-jsonrpc@8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9"
integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==

vscode-languageserver-protocol@3.16.0:
version "3.16.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
vscode-languageserver-protocol@3.17.2, vscode-languageserver-protocol@^3.17.2:
version "3.17.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378"
integrity sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==
dependencies:
vscode-jsonrpc "6.0.0"
vscode-languageserver-types "3.16.0"
vscode-jsonrpc "8.0.2"
vscode-languageserver-types "3.17.2"

vscode-languageserver-textdocument@1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz#838769940ece626176ec5d5a2aa2d0aa69f5095c"
integrity sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==

vscode-languageserver-types@3.16.0:
version "3.16.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
vscode-languageserver-types@3.17.2:
version "3.17.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==

vscode-languageserver@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
vscode-languageserver@^8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz#cfe2f0996d9dfd40d3854e786b2821604dfec06d"
integrity sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==
dependencies:
vscode-languageserver-protocol "3.16.0"
vscode-languageserver-protocol "3.17.2"

vscode-uri@^3.0.2:
version "3.0.3"
Expand Down

0 comments on commit bdbdd83

Please sign in to comment.