aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/package.json12
-rw-r--r--editors/code/src/client.ts1
2 files changed, 10 insertions, 3 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index aac4ba94f..448e2269f 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -655,24 +655,30 @@
655 "problemMatchers": [ 655 "problemMatchers": [
656 { 656 {
657 "name": "rustc", 657 "name": "rustc",
658 "owner": "rustc",
659 "source": "rustc",
658 "fileLocation": [ 660 "fileLocation": [
659 "relative", 661 "autoDetect",
660 "${workspaceRoot}" 662 "${workspaceRoot}"
661 ], 663 ],
662 "pattern": "$rustc" 664 "pattern": "$rustc"
663 }, 665 },
664 { 666 {
665 "name": "rustc-json", 667 "name": "rustc-json",
668 "owner": "rustc",
669 "source": "rustc",
666 "fileLocation": [ 670 "fileLocation": [
667 "relative", 671 "autoDetect",
668 "${workspaceRoot}" 672 "${workspaceRoot}"
669 ], 673 ],
670 "pattern": "$rustc-json" 674 "pattern": "$rustc-json"
671 }, 675 },
672 { 676 {
673 "name": "rustc-watch", 677 "name": "rustc-watch",
678 "owner": "rustc",
679 "source": "rustc",
674 "fileLocation": [ 680 "fileLocation": [
675 "relative", 681 "autoDetect",
676 "${workspaceRoot}" 682 "${workspaceRoot}"
677 ], 683 ],
678 "background": { 684 "background": {
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 41ffac7b3..18948cb3c 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -41,6 +41,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
41 const clientOptions: lc.LanguageClientOptions = { 41 const clientOptions: lc.LanguageClientOptions = {
42 documentSelector: [{ scheme: 'file', language: 'rust' }], 42 documentSelector: [{ scheme: 'file', language: 'rust' }],
43 initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"), 43 initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
44 diagnosticCollectionName: "rustc",
44 traceOutputChannel, 45 traceOutputChannel,
45 middleware: { 46 middleware: {
46 // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576 47 // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576