Skip to content

Commit 01b15c9

Browse files
bors[bot]DJMcNab
andcommitted
Merge #776
776: Add support for a seperate output channel for trace messages r=DJMcNab a=DJMcNab See microsoft/vscode-languageserver-node#444 I am just working on testing this now, but I think it should work. Co-authored-by: DJMcNab <[email protected]>
2 parents 166c720 + 48d6a52 commit 01b15c9

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

editors/code/package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editors/code/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
"singleQuote": true
3232
},
3333
"dependencies": {
34-
"vscode-languageclient": "^5.2.1"
34+
"vscode-languageclient": "^5.3.0-next.1"
3535
},
3636
"devDependencies": {
3737
"@types/mocha": "^5.2.5",
38-
"@types/node": "^10.12.21",
38+
"@types/node": "^10.12.24",
3939
"prettier": "^1.16.4",
4040
"tslint": "^5.12.1",
4141
"tslint-config-prettier": "^1.18.0",
4242
"typescript": "^3.3.1",
43-
"vsce": "^1.56.0",
43+
"vsce": "^1.57.0",
4444
"vscode": "^1.1.29"
4545
},
4646
"activationEvents": [

editors/code/src/server.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as lc from 'vscode-languageclient';
22

3+
import { window } from 'vscode';
34
import { Config } from './config';
45
import { Highlighter } from './highlighting';
56

@@ -19,16 +20,20 @@ export class Server {
1920
run,
2021
debug: run
2122
};
23+
const traceOutputChannel = window.createOutputChannel(
24+
'Rust Analyzer Language Server Trace'
25+
);
2226
const clientOptions: lc.LanguageClientOptions = {
2327
documentSelector: [{ scheme: 'file', language: 'rust' }],
2428
initializationOptions: {
2529
publishDecorations: true
26-
}
30+
},
31+
traceOutputChannel
2732
};
2833

2934
Server.client = new lc.LanguageClient(
30-
'ra-lsp',
31-
'rust-analyzer language server',
35+
'rust-analyzer',
36+
'Rust Analyzer Language Server',
3237
serverOptions,
3338
clientOptions
3439
);

0 commit comments

Comments
 (0)