Merge som prs

helix-term/src/commands/lsp.rs

@@ -773,7 +773,7 @@ pub fn code_action(cx: &mut Context) {
                 match &action.lsp_item {
                     lsp::CodeActionOrCommand::Command(command) => {
                         log::debug!("code action command: {:?}", command);
-                        editor.execute_lsp_command(command.clone(), action.language_server_id);
+                        execute_lsp_command(editor, action.language_server_id, command.clone());
                     }
                     lsp::CodeActionOrCommand::CodeAction(code_action) => {
                         log::debug!("code action: {:?}", code_action);
@@ -802,7 +802,7 @@ pub fn code_action(cx: &mut Context) {
                         // if code action provides both edit and command first the edit
                         // should be applied and then the command
                         if let Some(command) = &code_action.command {
-                            editor.execute_lsp_command(command.clone(), action.language_server_id);
+                            execute_lsp_command(editor, action.language_server_id, command.clone());
                         }
                     }
                 }
@@ -818,6 +818,33 @@ pub fn code_action(cx: &mut Context) {
     });
 }
 
+pub fn execute_lsp_command(
+    editor: &mut Editor,
+    language_server_id: LanguageServerId,
+    cmd: lsp::Command,
+) {
+    // the command is executed on the server and communicated back
+    // to the client asynchronously using workspace edits
+    let future = match editor
+        .language_server_by_id(language_server_id)
+        .and_then(|language_server| language_server.command(cmd))
+    {
+        Some(future) => future,
+        None => {
+            editor.set_error("Language server does not support executing commands");
+            return;
+        }
+    };
+
+    tokio::spawn(async move {
+        let res = future.await;
+
+        if let Err(e) = res {
+            log::error!("execute LSP command: {}", e);
+        }
+    });
+}
+
 #[derive(Debug)]
 pub struct ApplyEditError {
     pub kind: ApplyEditErrorKind,

helix-term/src/commands/typed.rs

@@ -1456,7 +1456,7 @@ fn lsp_workspace_command(
                         commands,
                         (),
                         move |cx, (ls_id, command), _action| {
-                            cx.editor.execute_lsp_command(command.clone(), *ls_id);
+                            execute_lsp_command(cx.editor, *ls_id, command.clone());
                         },
                     );
                     compositor.push(Box::new(overlaid(picker)))
@@ -1483,14 +1483,14 @@ fn lsp_workspace_command(
                     })
                     .transpose()?
                     .filter(|args| !args.is_empty());
-
-                cx.editor.execute_lsp_command(
+                execute_lsp_command(
+                    cx.editor,
+                    *ls_id,
                     helix_lsp::lsp::Command {
                         title: command.clone(),
                         arguments,
                         command,
                     },
-                    *ls_id,
                 );
             }
             [] => {

helix-view/src/handlers/lsp.rs

@@ -374,22 +374,4 @@ impl Editor {
             helix_event::dispatch(DiagnosticsDidChange { editor: self, doc });
         }
     }
-
-    pub fn execute_lsp_command(&mut self, command: lsp::Command, server_id: LanguageServerId) {
-        // the command is executed on the server and communicated back
-        // to the client asynchronously using workspace edits
-        let Some(future) = self
-            .language_server_by_id(server_id)
-            .and_then(|server| server.command(command))
-        else {
-            self.set_error("Language server does not support executing commands");
-            return;
-        };
-
-        tokio::spawn(async move {
-            if let Err(err) = future.await {
-                log::error!("Error executing LSP command: {err}");
-            }
-        });
-    }
 }