refactor: move to using specific range for all id based commands

tobias-z · Nov 24, 2023 · c27cf80 · c27cf80
1 parent 6064308
commit c27cf80
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -202,10 +202,6 @@
             {
                 "command": "vscode-harpoon.gotoPreviousGlobalHarpoonEditor",
                 "title": "VSCode Harpoon: Go to previous global harpoon editor"
-            },
-            {
-                "command": "vscode-harpoon.isQuickPick",
-                "title": "VSCode Harpoon: Quick Pick Visible"
             }
         ]
     },

diff --git a/src/commands/command-factory.ts b/src/commands/command-factory.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 
-type EditorRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+export type EditorRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
 
 type CommandName =
     | "addEditor"

diff --git a/src/harpoon.ts b/src/harpoon.ts
@@ -2,7 +2,7 @@
 import * as vscode from "vscode";
 import ActiveProjectService, { Editor } from "./service/active-project-service";
 import WorkspaceService from "./service/workspace-service";
-import CommandFactory from "./commands/command-factory";
+import CommandFactory, { EditorRange } from "./commands/command-factory";
 import { createGotoEditorCommand } from "./commands/goto-editor";
 import createAddEditorCommand from "./commands/add-editor";
 import createEditEditorsCommand from "./commands/edit-editors";
@@ -11,6 +11,12 @@ import createGotoPreviousHarpoonEditorCommand from "./commands/goto-previous-har
 import { createRemoveCurrentEditorCommand } from "./commands/remove-current-editor";
 import { createRemoveEditorByIdCommand } from "./commands/remove-editor-by-id";
 
+function loopEditorIds(fn: (id: EditorRange) => void) {
+    for (let i = 1; i <= 9; i++) {
+        fn(i as EditorRange);
+    }
+}
+
 export type State = "workspaceState" | "globalState";
 
 export type ProjectState = {
@@ -47,34 +53,26 @@ function registerCommands(
         prevState.previousEditor
     );
     const workspaceService = new WorkspaceService(activeProjectService, context, state);
-    const gotoEditor = createGotoEditorCommand(workspaceService);
 
     const key = state === "globalState" ? "Global" : "";
+
     const addEditor = createAddEditorCommand(activeProjectService, workspaceService);
 
     commandFactory.registerCommand(`add${key}Editor`, addEditor());
     commandFactory.registerCommand(
         `edit${key}Editors`,
         createEditEditorsCommand(activeProjectService, workspaceService)
     );
-    commandFactory.registerCommand(`add${key}Editor1`, addEditor(1));
-    commandFactory.registerCommand(`add${key}Editor2`, addEditor(2));
-    commandFactory.registerCommand(`add${key}Editor3`, addEditor(3));
-    commandFactory.registerCommand(`add${key}Editor4`, addEditor(4));
-    commandFactory.registerCommand(`add${key}Editor5`, addEditor(5));
-    commandFactory.registerCommand(`add${key}Editor6`, addEditor(6));
-    commandFactory.registerCommand(`add${key}Editor7`, addEditor(7));
-    commandFactory.registerCommand(`add${key}Editor8`, addEditor(8));
-    commandFactory.registerCommand(`add${key}Editor9`, addEditor(9));
-    commandFactory.registerCommand(`goto${key}Editor1`, gotoEditor(1));
-    commandFactory.registerCommand(`goto${key}Editor2`, gotoEditor(2));
-    commandFactory.registerCommand(`goto${key}Editor3`, gotoEditor(3));
-    commandFactory.registerCommand(`goto${key}Editor4`, gotoEditor(4));
-    commandFactory.registerCommand(`goto${key}Editor5`, gotoEditor(5));
-    commandFactory.registerCommand(`goto${key}Editor6`, gotoEditor(6));
-    commandFactory.registerCommand(`goto${key}Editor7`, gotoEditor(7));
-    commandFactory.registerCommand(`goto${key}Editor8`, gotoEditor(8));
-    commandFactory.registerCommand(`goto${key}Editor9`, gotoEditor(9));
+
+    const gotoEditor = createGotoEditorCommand(workspaceService);
+    const removeById = createRemoveEditorByIdCommand(workspaceService, activeProjectService);
+
+    loopEditorIds(id => {
+        commandFactory.registerCommand(`add${key}Editor${id}`, addEditor(id));
+        commandFactory.registerCommand(`goto${key}Editor${id}`, gotoEditor(id));
+        commandFactory.registerCommand(`remove${key}Editor${id}`, removeById(id));
+    });
+
     commandFactory.registerCommand(
         `editor${key}QuickPick`,
         createEditorQuickPickCommand(activeProjectService, workspaceService)
@@ -84,16 +82,9 @@ function registerCommands(
         createGotoPreviousHarpoonEditorCommand(activeProjectService, workspaceService)
     );
 
-    commandFactory.registerCommand(`removeCurrent${key}Editor`, createRemoveCurrentEditorCommand(workspaceService, activeProjectService));
+    commandFactory.registerCommand(
+        `removeCurrent${key}Editor`,
+        createRemoveCurrentEditorCommand(workspaceService, activeProjectService)
+    );
 
-    const removeById = createRemoveEditorByIdCommand(workspaceService, activeProjectService);
-    commandFactory.registerCommand(`remove${key}Editor1`, removeById(1));
-    commandFactory.registerCommand(`remove${key}Editor2`, removeById(2));
-    commandFactory.registerCommand(`remove${key}Editor3`, removeById(3));
-    commandFactory.registerCommand(`remove${key}Editor4`, removeById(4));
-    commandFactory.registerCommand(`remove${key}Editor5`, removeById(5));
-    commandFactory.registerCommand(`remove${key}Editor6`, removeById(6));
-    commandFactory.registerCommand(`remove${key}Editor7`, removeById(7));
-    commandFactory.registerCommand(`remove${key}Editor8`, removeById(8));
-    commandFactory.registerCommand(`remove${key}Editor9`, removeById(9));
 }