Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links

Hasn't fixed tests yet.

1 files changed, 6 insertions, 2 deletions

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 65ad573d8..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
     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
@@ -66,7 +67,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                         return Promise.resolve(null);
                     });
             },
-            // Using custom handling of CodeActions where each code action is resloved lazily
+            // Using custom handling of CodeActions where each code action is resolved lazily
             // That's why we are not waiting for any command or edits
             async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) {
                 const params: lc.CodeActionParams = {
@@ -87,7 +88,8 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                             continue;
                         }
                         assert(isCodeActionWithoutEditsAndCommands(item), "We don't expect edits or commands here");
-                        const action = new vscode.CodeAction(item.title);
+                        const kind = client.protocol2CodeConverter.asCodeActionKind((item as any).kind);
+                        const action = new vscode.CodeAction(item.title, kind);
                         const group = (item as any).group;
                         const id = (item as any).id;
                         const resolveParams: ra.ResolveCodeActionParams = {
@@ -116,6 +118,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                             result[index] = items[0];
                         } else {
                             const action = new vscode.CodeAction(group);
+                            action.kind = items[0].kind;
                             action.command = {
                                 command: "rust-analyzer.applyActionGroup",
                                 title: "",
@@ -161,6 +164,7 @@ class ExperimentalFeatures implements lc.StaticFeature {
         caps.codeActionGroup = true;
         caps.resolveCodeAction = true;
         caps.hoverActions = true;
+        caps.statusNotification = true;
         capabilities.experimental = caps;
     }
     initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void {