diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-23 13:02:42 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-23 13:02:42 +0100 |
| commit | 803f3613ba041a24b50c7e8249e9ee3195836ea8 (patch) | |
| tree | a6229184243c3892cbd51e211f15093bd84a9fd9 /editors/code/src | |
| parent | 37e1d1c526e4d777a8e78088d830d73e2c6e0e90 (diff) | |
| parent | 995c624f57e91ed6c2ea4349d3a4d0d7a5e80b15 (diff) | |
Merge #5500
5500: ProblemMatcher fixes/improvements. r=matklad a=rickvanprim
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/5482.
ProblemMatcher auto detects relative/absolute paths and matches VSCode LSP's owner and source. VSCode LSP updated to specify owner.
Co-authored-by: James Leitch <[email protected]>
Diffstat (limited to 'editors/code/src')
| -rw-r--r-- | editors/code/src/client.ts | 1 |
1 files changed, 1 insertions, 0 deletions
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 |