Auto merge of rust-lang#14147 - Veykril:completion, r=Veykril

Don't assume VSCode internal commands in the server
rust-lang-ci · Feb 14, 2023 · 2e86029 · 2e86029
2 parents 4456800 + 95fa278
commit 2e86029
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
@@ -1360,7 +1360,7 @@ pub(crate) mod command {
     pub(crate) fn trigger_parameter_hints() -> lsp_types::Command {
         lsp_types::Command {
             title: "triggerParameterHints".into(),
-            command: "editor.action.triggerParameterHints".into(),
+            command: "rust-analyzer.triggerParameterHints".into(),
             arguments: None,
         }
     }

diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
@@ -87,6 +87,12 @@ export function shuffleCrateGraph(ctx: CtxInit): Cmd {
     };
 }
 
+export function triggerParameterHints(_: CtxInit): Cmd {
+    return async () => {
+        await vscode.commands.executeCommand("editor.action.triggerParameterHints");
+    };
+}
+
 export function matchingBrace(ctx: CtxInit): Cmd {
     return async () => {
         const editor = ctx.activeRustEditor;

diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
@@ -186,5 +186,6 @@ function createCommands(): Record<string, CommandFactory> {
         resolveCodeAction: { enabled: commands.resolveCodeAction },
         runSingle: { enabled: commands.runSingle },
         showReferences: { enabled: commands.showReferences },
+        triggerParameterHints: { enabled: commands.triggerParameterHints },
     };
 }