itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-25 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #776

Browse Source 
776: Add support for a seperate output channel for trace messages r=DJMcNab a=DJMcNab

See https://github.com/Microsoft/vscode-languageserver-node/pull/444

I am just working on testing this now, but I think it should work.

Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-02-10 10:33:35 +00:00
commit 01b15c9fc2
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editors/code/package-lock.json generated
View File

@ -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",
@ -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"

6
editors/code/package.json
View File

@ -31,16 +31,16 @@
"singleQuote": true
},
"dependencies": {
"vscode-languageclient": "^5.2.1"
"vscode-languageclient": "^5.3.0-next.1"
},
"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": [

11
editors/code/src/server.ts
View File

@ -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,20 @@ 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',
'Rust Analyzer Language Server',
serverOptions,
clientOptions
);