aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/package-lock.json26
-rw-r--r--editors/code/package.json6
-rw-r--r--editors/code/src/server.ts11
3 files changed, 24 insertions, 19 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 7c7392260..5a0d21e78 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -11,9 +11,9 @@
11 "dev": true 11 "dev": true
12 }, 12 },
13 "@types/node": { 13 "@types/node": {
14 "version": "10.12.21", 14 "version": "10.12.24",
15 "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", 15 "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.24.tgz",
16 "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==", 16 "integrity": "sha512-GWWbvt+z9G5otRBW8rssOFgRY87J9N/qbhqfjMZ+gUuL6zoL+Hm6gP/8qQBG4jjimqdaNLCehcVapZ/Fs2WjCQ==",
17 "dev": true 17 "dev": true
18 }, 18 },
19 "ajv": { 19 "ajv": {
@@ -2454,9 +2454,9 @@
2454 } 2454 }
2455 }, 2455 },
2456 "vsce": { 2456 "vsce": {
2457 "version": "1.56.0", 2457 "version": "1.57.0",
2458 "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.56.0.tgz", 2458 "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.57.0.tgz",
2459 "integrity": "sha512-Kvc+b1qEx8tEMnYC3bHyTQyCPWHs1dJ2kDK2y8f63fVzwwYmwq2XOXP7rCgBoB2nGEFwP5YT/kwkdmgQzKnhlg==", 2459 "integrity": "sha512-ULiWDQBt0XZAA5PI7XL0TxeKZ6cXk3e3ZH/lL9xk93WeckqWzR79D3xNsf0GRacOGYU+UmbhXWRtP8C6wnDNmg==",
2460 "dev": true, 2460 "dev": true,
2461 "requires": { 2461 "requires": {
2462 "chalk": "^2.4.2", 2462 "chalk": "^2.4.2",
@@ -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..045d372e7 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -31,16 +31,16 @@
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",
38 "@types/node": "^10.12.21", 38 "@types/node": "^10.12.24",
39 "prettier": "^1.16.4", 39 "prettier": "^1.16.4",
40 "tslint": "^5.12.1", 40 "tslint": "^5.12.1",
41 "tslint-config-prettier": "^1.18.0", 41 "tslint-config-prettier": "^1.18.0",
42 "typescript": "^3.3.1", 42 "typescript": "^3.3.1",
43 "vsce": "^1.56.0", 43 "vsce": "^1.57.0",
44 "vscode": "^1.1.29" 44 "vscode": "^1.1.29"
45 }, 45 },
46 "activationEvents": [ 46 "activationEvents": [
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d2632708..9ead87fae 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,20 @@ export class Server {
19 run, 20 run,
20 debug: run 21 debug: run
21 }; 22 };
23 const traceOutputChannel = window.createOutputChannel(
24 'Rust Analyzer Language Server Trace'
25 );
22 const clientOptions: lc.LanguageClientOptions = { 26 const clientOptions: lc.LanguageClientOptions = {
23 documentSelector: [{ scheme: 'file', language: 'rust' }], 27 documentSelector: [{ scheme: 'file', language: 'rust' }],
24 initializationOptions: { 28 initializationOptions: {
25 publishDecorations: true 29 publishDecorations: true
26 } 30 },
31 traceOutputChannel
27 }; 32 };
28 33
29 Server.client = new lc.LanguageClient( 34 Server.client = new lc.LanguageClient(
30 'ra-lsp', 35 'rust-analyzer',
31 'rust-analyzer language server', 36 'Rust Analyzer Language Server',
32 serverOptions, 37 serverOptions,
33 clientOptions 38 clientOptions
34 ); 39 );