From 995c624f57e91ed6c2ea4349d3a4d0d7a5e80b15 Mon Sep 17 00:00:00 2001
From: James Leitch <rickvanprim@gmail.com>
Date: Wed, 22 Jul 2020 22:32:54 -0700
Subject: [PATCH] ProblemMatcher auto detects relative/absolute paths and
 matches VSCode LSP's owner and source.  VSCode LSP updated to specify owner.

---
 editors/code/package.json  | 12 +++++++++---
 editors/code/src/client.ts |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/editors/code/package.json b/editors/code/package.json
index aac4ba94f2..448e2269ff 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -655,24 +655,30 @@
         "problemMatchers": [
             {
                 "name": "rustc",
+                "owner": "rustc",
+                "source": "rustc",
                 "fileLocation": [
-                    "relative",
+                    "autoDetect",
                     "${workspaceRoot}"
                 ],
                 "pattern": "$rustc"
             },
             {
                 "name": "rustc-json",
+                "owner": "rustc",
+                "source": "rustc",
                 "fileLocation": [
-                    "relative",
+                    "autoDetect",
                     "${workspaceRoot}"
                 ],
                 "pattern": "$rustc-json"
             },
             {
                 "name": "rustc-watch",
+                "owner": "rustc",
+                "source": "rustc",
                 "fileLocation": [
-                    "relative",
+                    "autoDetect",
                     "${workspaceRoot}"
                 ],
                 "background": {
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 41ffac7b34..18948cb3c4 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
     const clientOptions: lc.LanguageClientOptions = {
         documentSelector: [{ scheme: 'file', language: 'rust' }],
         initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
+        diagnosticCollectionName: "rustc",
         traceOutputChannel,
         middleware: {
             // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576