Merge pull request #3205 from blueskyonmars/enable-lsp-refactoring-actions-#3204

Enable lsp refactoring actions 

* Fixes #3204

Author: PEZ

CHANGELOG.md

@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- enable new clojure-lsp code actions: inline function, if<->cond, extract selection to function, move to :let
 
 ## [2.0.583] - 2026-05-04
 

src/lsp/commands/lsp-commands.ts

@@ -12,7 +12,8 @@ type BaseLspCommand = {
   category?: string;
 };
 
-// If afterCommandFn is defined, then defaultName must be too
+const namePositionDefault = 3;
+// If afterCommandFn is defined, then defaultName must be too, namePosition defaults to position 3
 type ClojureLspCommand = BaseLspCommand &
   (
     | {
@@ -21,9 +22,11 @@ type ClojureLspCommand = BaseLspCommand &
           commandResponse: Record<string, unknown>
         ) => Thenable<any>;
         defaultName: string;
+        namePosition?: number;
       }
     | {
         defaultName?: string;
+        namePosition?: number;
         afterCommandFn?: never;
       }
   );
@@ -38,7 +41,7 @@ async function renameAfterRefactor(
   commandArgs: Array<string | number>,
   commandResponse: vscode_lsp.WorkspaceEdit
 ) {
-  if (commandArgs[3] !== this.defaultName) {
+  if (commandArgs[this.namePosition ?? namePositionDefault] !== this.defaultName) {
     return;
   }
 
@@ -106,6 +109,8 @@ const clojureLspCommands: ClojureLspCommand[] = [
   { command: 'drag-param-backward', category: 'clojureLsp' },
   { command: 'drag-param-forward', category: 'clojureLsp' },
   { command: 'expand-let', category: 'clojureLsp.refactor' },
+  { command: 'if->cond-refactor', category: 'clojureLsp.refactor' },
+  { command: 'cond->if-refactor', category: 'clojureLsp.refactor' },
   { command: 'get-in-all', category: 'clojureLsp.refactor' },
   { command: 'get-in-less', category: 'clojureLsp.refactor' },
   { command: 'get-in-more', category: 'clojureLsp.refactor' },
@@ -114,6 +119,7 @@ const clojureLspCommands: ClojureLspCommand[] = [
   { command: 'move-coll-entry-down', category: 'clojureLsp.refactor' },
   { command: 'move-coll-entry-up', category: 'clojureLsp.refactor' },
   { command: 'move-form', category: 'clojureLsp.refactor' },
+  { command: 'move-to-for-let', category: 'clojureLsp.refactor' },
   { command: 'replace-refer-all-with-alias', category: 'clojureLsp.refactor' },
   { command: 'replace-refer-all-with-refer', category: 'clojureLsp.refactor' },
   { command: 'resolve-macro-as', category: 'clojureLsp.refactor' },
@@ -146,6 +152,17 @@ const clojureLspCommands: ClojureLspCommand[] = [
     defaultName: 'new-fn',
     category: 'clojureLsp.refactor',
   },
+  {
+    command: 'inline-function',
+    category: 'clojureLsp.refactor',
+  },
+  {
+    command: 'extract-function-2',
+    afterCommandFn: renameAfterRefactor,
+    defaultName: 'new-fn',
+    namePosition: 5,
+    category: 'clojureLsp.refactor',
+  },
   {
     command: 'extract-to-def',
     afterCommandFn: renameAfterRefactor,
@@ -245,18 +262,7 @@ function registerUserspaceLspCommand(
     // default rather than letting clojure-lsp pick a name so that when we trigger a rename action
     // after the command completes, we know what to rename.
     if (command.defaultName) {
-      params[3] = command.defaultName;
-    }
-
-    // clojure-lsp's `extract-function` always destructures selection-end coords
-    // from the args so a 4-arg call throws IndexOutOfBoundsException.
-    // Append the selection end so the call works whether or not a region is
-    // selected.
-    // https://github.com/clojure-lsp/clojure-lsp/issues/2118
-    if (command.command === 'extract-function') {
-      const selection = calva_utils.getActiveTextEditor().selections[0];
-      params[4] = selection.end.line;
-      params[5] = selection.end.character;
+      params[command.namePosition ?? namePositionDefault] = command.defaultName;
     }
 
     sendCommandRequest(clients, command.command, params);
@@ -273,7 +279,7 @@ function registerInternalLspCommand(
     // default name. Replace that name with our own default so we know what to look for when we
     // trigger a rename action on it afterwards.
     if (command.defaultName) {
-      args[3] = command.defaultName;
+      args[command.namePosition ?? namePositionDefault] = command.defaultName;
     }
 
     sendCommandRequest(clients, command.command, args);