Add basic REPL History search

BetterThanTomorrow · Apr 27, 2024 · fcf8060 · fcf8060
1 parent 859f162
commit fcf8060
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -1978,6 +1978,12 @@
         "enablement": "calva:connected",
         "category": "Calva"
       },
+      {
+        "command": "calva.searchReplHistory",
+        "title": "Search REPL History",
+        "enablement": "calva:connected && calva:outputWindowActive && calva:replHistoryCommandsActive",
+        "category": "Calva"
+      },
       {
         "command": "calva.showPreviousReplHistoryEntry",
         "title": "Show Previous REPL History Entry",
@@ -2748,6 +2754,11 @@
         "key": "ctrl+alt+c ctrl+alt+space",
         "when": "calva:keybindingsEnabled && editorLangId == clojure && calva:connected && !calva:outputWindowActive"
       },
+      {
+        "command": "calva.searchReplHistory",
+        "key": "alt+shift+r",
+        "when": "calva:keybindingsEnabled && editorLangId == clojure && calva:connected && calva:outputWindowActive"
+      },
       {
         "command": "calva.showPreviousReplHistoryEntry",
         "key": "alt+up",
@@ -3069,6 +3080,10 @@
           "command": "calva.debug.instrument",
           "when": "editorLangId == clojure"
         },
+        {
+          "command": "calva.searchReplHistory",
+          "when": "calva:connected && calva:outputWindowActive"
+        },
         {
           "command": "calva.showPreviousReplHistoryEntry",
           "when": "calva:connected && calva:outputWindowActive"

diff --git a/src/extension.ts b/src/extension.ts
@@ -273,6 +273,7 @@ async function activate(context: vscode.ExtensionContext) {
     showFileForOutputWindowNS: () => {
       return outputWindow.revealDocForCurrentNS(false);
     },
+    searchReplHistory: replHistory.searchReplHistory,
     showNextReplHistoryEntry: replHistory.showNextReplHistoryEntry,
     showOutputWindow: () => outputWindow.revealResultsDoc(false),
     showOutputChannel: output.showOutputChannel,

diff --git a/src/repl-window/repl-history.ts b/src/repl-window/repl-history.ts
@@ -142,9 +142,26 @@ function showNextReplHistoryEntry(): void {
   }
 }
 
+function searchReplHistory(): void {
+  const editor = util.getActiveTextEditor();
+  const history = getHistory(getSessionType());
+  vscode.window.showInputBox({
+    prompt: 'Enter search term for REPL history',
+    validateInput: (text) => {
+      const entry = history.filter((entry) => entry.includes(text)).pop();
+      if (entry !== undefined) {
+        showReplHistoryEntry(prependNewline(entry), editor);
+        return undefined;
+      }
+      return 'No matching entry found in REPL history';
+    },
+  });
+}
+
 export {
   addToHistory,
   addToReplHistory,
+  searchReplHistory,
   showPreviousReplHistoryEntry,
   showNextReplHistoryEntry,
   resetState,