Refactor: Move duplicateAndIncrement and duplicateAndDecrement logic to increment-decrement.ts

Author: exceptionraiser

src/commands/increment-decrement.ts

@@ -1,3 +1,4 @@
+import * as vscode from "vscode";
 import { CommandFunction } from "./types";
 
 export const increment: CommandFunction = (str: string) =>
@@ -6,5 +7,65 @@ export const increment: CommandFunction = (str: string) =>
 export const decrement: CommandFunction = (str: string) =>
   str.replace(/-?\d+/g, (n) => String(Number(n) - 1));
 
+// These functions are placeholders as the actual implementation is in the stringFunction
+// They're kept here for type consistency in the command registry
 export const duplicateAndIncrement: CommandFunction = () => "";
 export const duplicateAndDecrement: CommandFunction = () => "";
+
+// Helper function to handle duplicate and increment/decrement operations
+export function handleDuplicateAndIncrementDecrement(
+  editor: vscode.TextEditor,
+  selections: readonly vscode.Selection[],
+  operation: (str: string) => string
+): {
+  selectionMap: {
+    [key: number]: { selection: vscode.Selection; replaced: string };
+  };
+  replacedSelections: string[];
+} {
+  const selectionMap: {
+    [key: number]: { selection: vscode.Selection; replaced: string };
+  } = {};
+  const replacedSelections: string[] = [];
+
+  for (const [index, selection] of selections.entries()) {
+    const text = editor.document.getText(selection);
+    const replaced = text + operation(text);
+
+    replacedSelections.push(replaced);
+    selectionMap[index] = { selection, replaced };
+  }
+
+  return { selectionMap, replacedSelections };
+}
+
+// Helper function to update selections after duplicate operations
+export function updateSelectionsAfterDuplicate(
+  editor: vscode.TextEditor,
+  selectionMap: {
+    [key: number]: { selection: vscode.Selection; replaced: string };
+  }
+): vscode.Selection[] {
+  return editor.selections.map((selection, index) => {
+    const originalSelection = selectionMap[index].selection;
+    const originalText = editor.document.getText(originalSelection);
+
+    // Calculate the start position of the duplicated text
+    const startPos = originalSelection.end;
+
+    // Calculate the end position based on the original text length
+    let endLine = startPos.line;
+    let endChar = startPos.character + originalText.length;
+
+    // Handle multi-line selections
+    const lines = originalText.split("\n");
+    if (lines.length > 1) {
+      endLine = startPos.line + lines.length - 1;
+      // If multi-line, the end character should be the length of the last line
+      endChar = lines[lines.length - 1].length;
+    }
+
+    const endPos = new vscode.Position(endLine, endChar);
+    return new vscode.Selection(startPos, endPos);
+  });
+}

src/commands/index.ts

@@ -11,6 +11,8 @@ import {
   decrement,
   duplicateAndIncrement,
   duplicateAndDecrement,
+  handleDuplicateAndIncrementDecrement,
+  updateSelectionsAfterDuplicate,
 } from "./increment-decrement";
 import { sequence } from "./sequence";
 import { randomCase } from "./random-case";
@@ -75,15 +77,15 @@ export const stringFunction = async (
     return;
   }
 
-  const selectionMap: {
+  let selectionMap: {
     [key: number]: { selection: vscode.Selection; replaced: string };
   } = {};
 
   let multiselectData = {};
 
   let stringFunc: (str: string) => string;
 
-  let replacedSelections = [];
+  let replacedSelections: string[] = [];
 
   if (functionNamesWithArgument.includes(commandName)) {
     const valueStr = await vscode.window.showInputBox();
@@ -107,16 +109,16 @@ export const stringFunction = async (
     commandName === "duplicateAndIncrement" ||
     commandName === "duplicateAndDecrement"
   ) {
-    for (const [index, selection] of editor.selections.entries()) {
-      const text = editor.document.getText(selection);
-
-      const operation =
-        commandName === "duplicateAndIncrement" ? increment : decrement;
-      const replaced = text + operation(text);
+    const operation =
+      commandName === "duplicateAndIncrement" ? increment : decrement;
 
-      replacedSelections.push(replaced);
-      selectionMap[index] = { selection, replaced };
-    }
+    const result = handleDuplicateAndIncrementDecrement(
+      editor,
+      editor.selections,
+      operation as (str: string) => string
+    );
+    selectionMap = result.selectionMap;
+    replacedSelections = result.replacedSelections;
   } else {
     for (const [index, selection] of editor.selections.entries()) {
       const text = editor.document.getText(selection);
@@ -139,30 +141,7 @@ export const stringFunction = async (
       commandName === "duplicateAndIncrement" ||
       commandName === "duplicateAndDecrement"
     ) {
-      const newSelections = editor.selections.map((selection, index) => {
-        const originalSelection = selectionMap[index].selection;
-        const originalText = editor.document.getText(originalSelection);
-
-        // Calculate the start position of the duplicated text
-        const startPos = originalSelection.end;
-
-        // Calculate the end position based on the original text length
-        let endLine = startPos.line;
-        let endChar = startPos.character + originalText.length;
-
-        // Handle multi-line selections
-        const lines = originalText.split("\n");
-        if (lines.length > 1) {
-          endLine = startPos.line + lines.length - 1;
-          // If multi-line, the end character should be the length of the last line
-          endChar = lines[lines.length - 1].length;
-        }
-
-        const endPos = new vscode.Position(endLine, endChar);
-        return new vscode.Selection(startPos, endPos);
-      });
-
-      editor.selections = newSelections;
+      editor.selections = updateSelectionsAfterDuplicate(editor, selectionMap);
     }
 
     context.globalState.update("lastAction", commandName);