Skip to content

Commit 803f361

Browse files
Merge #5500
5500: ProblemMatcher fixes/improvements. r=matklad a=rickvanprim Fixes #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]>
2 parents 37e1d1c + 995c624 commit 803f361

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

editors/code/package.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,24 +655,30 @@
655655
"problemMatchers": [
656656
{
657657
"name": "rustc",
658+
"owner": "rustc",
659+
"source": "rustc",
658660
"fileLocation": [
659-
"relative",
661+
"autoDetect",
660662
"${workspaceRoot}"
661663
],
662664
"pattern": "$rustc"
663665
},
664666
{
665667
"name": "rustc-json",
668+
"owner": "rustc",
669+
"source": "rustc",
666670
"fileLocation": [
667-
"relative",
671+
"autoDetect",
668672
"${workspaceRoot}"
669673
],
670674
"pattern": "$rustc-json"
671675
},
672676
{
673677
"name": "rustc-watch",
678+
"owner": "rustc",
679+
"source": "rustc",
674680
"fileLocation": [
675-
"relative",
681+
"autoDetect",
676682
"${workspaceRoot}"
677683
],
678684
"background": {

editors/code/src/client.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
4141
const clientOptions: lc.LanguageClientOptions = {
4242
documentSelector: [{ scheme: 'file', language: 'rust' }],
4343
initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
44+
diagnosticCollectionName: "rustc",
4445
traceOutputChannel,
4546
middleware: {
4647
// Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576

0 commit comments

Comments
 (0)