From 913831702154fb6c532622fb50ab0d7aebceb3d9 Mon Sep 17 00:00:00 2001 From: DJMcNab <36049421+DJMcNab@users.noreply.github.com> Date: Sun, 10 Feb 2019 10:06:33 +0000 Subject: Add support for a seperate output channel for trace messages --- editors/code/package-lock.json | 14 +++++++------- editors/code/package.json | 2 +- editors/code/src/server.ts | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'editors/code') 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 @@ "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==" }, "vscode-languageclient": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz", - "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==", + "version": "5.3.0-next.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.1.tgz", + "integrity": "sha512-q5o6vHHDi+HjFOFUNC288Dee5jyAO4mEufoOaF2wKCjVP1qoJGbnBalTNGuakJThrdn0RDa0XdHZgXKFyZomCQ==", "requires": { "semver": "^5.5.0", - "vscode-languageserver-protocol": "3.14.1" + "vscode-languageserver-protocol": "3.15.0-next.1" } }, "vscode-languageserver-protocol": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz", - "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==", + "version": "3.15.0-next.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.1.tgz", + "integrity": "sha512-LXF0d9s3vxFBxVQ4aKl/XghdEMAncGt3dh4urIYa9Is43g3MfIQL9fC44YZtP+XXOrI2rpZU8lRNN01U1V6CDg==", "requires": { "vscode-jsonrpc": "^4.0.0", "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 @@ "singleQuote": true }, "dependencies": { - "vscode-languageclient": "^5.2.1" + "vscode-languageclient": "^5.3.0-next.1" }, "devDependencies": { "@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 @@ import * as lc from 'vscode-languageclient'; +import { window } from 'vscode'; import { Config } from './config'; import { Highlighter } from './highlighting'; @@ -19,16 +20,18 @@ export class Server { run, debug: run }; + const traceOutputChannel = window.createOutputChannel('Rust Analyzer Language Server Trace'); const clientOptions: lc.LanguageClientOptions = { documentSelector: [{ scheme: 'file', language: 'rust' }], initializationOptions: { publishDecorations: true - } + }, + traceOutputChannel }; Server.client = new lc.LanguageClient( 'ra-lsp', - 'rust-analyzer language server', + 'Rust Analyzer Language Server', serverOptions, clientOptions ); -- cgit v1.2.3 From 28fd3683938ee74d4ef319b94ce6c9c3ff74a036 Mon Sep 17 00:00:00 2001 From: DJMcNab <36049421+DJMcNab@users.noreply.github.com> Date: Sun, 10 Feb 2019 10:30:16 +0000 Subject: Fix trace and prettier --- editors/code/src/server.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'editors/code') diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts index 7bb0e56ca..9ead87fae 100644 --- a/editors/code/src/server.ts +++ b/editors/code/src/server.ts @@ -20,7 +20,9 @@ export class Server { run, debug: run }; - const traceOutputChannel = window.createOutputChannel('Rust Analyzer Language Server Trace'); + const traceOutputChannel = window.createOutputChannel( + 'Rust Analyzer Language Server Trace' + ); const clientOptions: lc.LanguageClientOptions = { documentSelector: [{ scheme: 'file', language: 'rust' }], initializationOptions: { @@ -30,7 +32,7 @@ export class Server { }; Server.client = new lc.LanguageClient( - 'ra-lsp', + 'rust-analyzer', 'Rust Analyzer Language Server', serverOptions, clientOptions -- cgit v1.2.3 From 48d6a52ac163c9316394f6c5027683f2c646ecaa Mon Sep 17 00:00:00 2001 From: DJMcNab <36049421+DJMcNab@users.noreply.github.com> Date: Sun, 10 Feb 2019 10:32:45 +0000 Subject: Update dependencies --- editors/code/package-lock.json | 12 ++++++------ editors/code/package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'editors/code') diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 144a46e2b..5a0d21e78 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json @@ -11,9 +11,9 @@ "dev": true }, "@types/node": { - "version": "10.12.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", - "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==", + "version": "10.12.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.24.tgz", + "integrity": "sha512-GWWbvt+z9G5otRBW8rssOFgRY87J9N/qbhqfjMZ+gUuL6zoL+Hm6gP/8qQBG4jjimqdaNLCehcVapZ/Fs2WjCQ==", "dev": true }, "ajv": { @@ -2454,9 +2454,9 @@ } }, "vsce": { - "version": "1.56.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.56.0.tgz", - "integrity": "sha512-Kvc+b1qEx8tEMnYC3bHyTQyCPWHs1dJ2kDK2y8f63fVzwwYmwq2XOXP7rCgBoB2nGEFwP5YT/kwkdmgQzKnhlg==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.57.0.tgz", + "integrity": "sha512-ULiWDQBt0XZAA5PI7XL0TxeKZ6cXk3e3ZH/lL9xk93WeckqWzR79D3xNsf0GRacOGYU+UmbhXWRtP8C6wnDNmg==", "dev": true, "requires": { "chalk": "^2.4.2", diff --git a/editors/code/package.json b/editors/code/package.json index fc63d988b..045d372e7 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -35,12 +35,12 @@ }, "devDependencies": { "@types/mocha": "^5.2.5", - "@types/node": "^10.12.21", + "@types/node": "^10.12.24", "prettier": "^1.16.4", "tslint": "^5.12.1", "tslint-config-prettier": "^1.18.0", "typescript": "^3.3.1", - "vsce": "^1.56.0", + "vsce": "^1.57.0", "vscode": "^1.1.29" }, "activationEvents": [ -- cgit v1.2.3