aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/package-lock.json14
-rw-r--r--editors/code/package.json2
-rw-r--r--editors/code/src/server.ts7
3 files changed, 13 insertions, 10 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 7c7392260..144a46e2b 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2507,18 +2507,18 @@
2507 "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==" 2507 "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
2508 }, 2508 },
2509 "vscode-languageclient": { 2509 "vscode-languageclient": {
2510 "version": "5.2.1", 2510 "version": "5.3.0-next.1",
2511 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz", 2511 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.1.tgz",
2512 "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==", 2512 "integrity": "sha512-q5o6vHHDi+HjFOFUNC288Dee5jyAO4mEufoOaF2wKCjVP1qoJGbnBalTNGuakJThrdn0RDa0XdHZgXKFyZomCQ==",
2513 "requires": { 2513 "requires": {
2514 "semver": "^5.5.0", 2514 "semver": "^5.5.0",
2515 "vscode-languageserver-protocol": "3.14.1" 2515 "vscode-languageserver-protocol": "3.15.0-next.1"
2516 } 2516 }
2517 }, 2517 },
2518 "vscode-languageserver-protocol": { 2518 "vscode-languageserver-protocol": {
2519 "version": "3.14.1", 2519 "version": "3.15.0-next.1",
2520 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz", 2520 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.1.tgz",
2521 "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==", 2521 "integrity": "sha512-LXF0d9s3vxFBxVQ4aKl/XghdEMAncGt3dh4urIYa9Is43g3MfIQL9fC44YZtP+XXOrI2rpZU8lRNN01U1V6CDg==",
2522 "requires": { 2522 "requires": {
2523 "vscode-jsonrpc": "^4.0.0", 2523 "vscode-jsonrpc": "^4.0.0",
2524 "vscode-languageserver-types": "3.14.0" 2524 "vscode-languageserver-types": "3.14.0"
diff --git a/editors/code/package.json b/editors/code/package.json
index 2b4299473..fc63d988b 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -31,7 +31,7 @@
31 "singleQuote": true 31 "singleQuote": true
32 }, 32 },
33 "dependencies": { 33 "dependencies": {
34 "vscode-languageclient": "^5.2.1" 34 "vscode-languageclient": "^5.3.0-next.1"
35 }, 35 },
36 "devDependencies": { 36 "devDependencies": {
37 "@types/mocha": "^5.2.5", 37 "@types/mocha": "^5.2.5",
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d2632708..7bb0e56ca 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -1,5 +1,6 @@
1import * as lc from 'vscode-languageclient'; 1import * as lc from 'vscode-languageclient';
2 2
3import { window } from 'vscode';
3import { Config } from './config'; 4import { Config } from './config';
4import { Highlighter } from './highlighting'; 5import { Highlighter } from './highlighting';
5 6
@@ -19,16 +20,18 @@ export class Server {
19 run, 20 run,
20 debug: run 21 debug: run
21 }; 22 };
23 const traceOutputChannel = window.createOutputChannel('Rust Analyzer Language Server Trace');
22 const clientOptions: lc.LanguageClientOptions = { 24 const clientOptions: lc.LanguageClientOptions = {
23 documentSelector: [{ scheme: 'file', language: 'rust' }], 25 documentSelector: [{ scheme: 'file', language: 'rust' }],
24 initializationOptions: { 26 initializationOptions: {
25 publishDecorations: true 27 publishDecorations: true
26 } 28 },
29 traceOutputChannel
27 }; 30 };
28 31
29 Server.client = new lc.LanguageClient( 32 Server.client = new lc.LanguageClient(
30 'ra-lsp', 33 'ra-lsp',
31 'rust-analyzer language server', 34 'Rust Analyzer Language Server',
32 serverOptions, 35 serverOptions,
33 clientOptions 36 clientOptions
34 ); 37 );