frontend/index.html

@@ -20,7 +20,7 @@
     </div>
   </dialog>
   <dialog id="command-dialog" data-controller="commands"
-    data-action="dq-showcommands@window->commands#showCommands dq-rerunlastcommand@window->commands#rerunLastCommand dq-rerunlastcommand-line@window->commands#rerunLastCommandOnLine">
+    data-action="dq-showcommands@window->commands#showCommands dq-rerunlastcommand@window->commands#rerunLastCommand">
     <div class="dialog-body">
       <div class="command-input">
         <input data-commands-target="commandInput" type="text" placeholder="Enter command"

frontend/src/cmplugins.js

@@ -46,14 +46,6 @@ export const commandPalette = keymap.of([{
         return true;
     }
 }, {
-    key: "Cmd-l",
-    run: () => {
-        let event = new CustomEvent('dq-rerunlastcommand-line');
-        window.dispatchEvent(event);
-
-        return true;
-    }
-}, {
     key: "Cmd-k",
     run: (view) => {
         const {state} = view;

frontend/src/controllers/commands_controller.js

@@ -10,10 +10,6 @@ export class CommandsController extends Controller {
         "commandSelect",
     ];
 
-    initialize() {
-        this._lineModeOnce = false;
-    }
-
     async connect() {
         this._lastCommand = null;
 
@@ -51,7 +47,6 @@ export class CommandsController extends Controller {
     runCommand(ev) {
         ev.preventDefault();
 
-        this._promptController()?.clearUseLastValue();
         textProcessor.runTextCommand(this.commandSelectTarget.value);
         this._lastCommand = this.commandSelectTarget.value;
 
@@ -65,21 +60,7 @@ export class CommandsController extends Controller {
             return;
         }
 
-        this._promptController()?.useLastValueForNextPrompt();
+        textProcessor.runTextCommand(this._lastCommand);
-        const lineMode = this._lineModeOnce;
-        this._lineModeOnce = false;
-        textProcessor.runTextCommand(this._lastCommand, { lineMode });
-    }
-
-    rerunLastCommandOnLine(ev) {
-        this._lineModeOnce = true;
-        this.rerunLastCommand(ev);
-    }
-
-    _promptController() {
-        const el = document.getElementById("prompt-dialog");
-        if (!el) return null;
-        return this.application.getControllerForElementAndIdentifier(el, "prompt");
     }
 
     _filterOptions(filterText) {

frontend/src/controllers/prompt_controller.js

@@ -8,16 +8,8 @@ export class PromptController extends Controller {
 
     connect() {
         this._callback = null;
-        this._lastValue = null;
-        this._useLastNext = false;
 
         window.runtime.EventsOn("prompt-request", (data) => {
-            if (this._useLastNext && this._lastValue !== null) {
-                this._useLastNext = false;
-                window.runtime.EventsEmit("prompt-response", this._lastValue);
-                return;
-            }
-            this._useLastNext = false;
             this.prompt(data.label, (res) => {
                 window.runtime.EventsEmit("prompt-response", res);
             });
@@ -27,16 +19,14 @@ export class PromptController extends Controller {
     prompt(label, callback) {
         this._callback = callback;
         this.labelTarget.textContent = label;
-        this.inputTarget.value = this._lastValue || "";
+        this.inputTarget.value = "";
         this.element.showModal();
-        this.inputTarget.select();
         this.inputTarget.focus();
     }
 
     submit(ev) {
         ev.preventDefault();
         let value = this.inputTarget.value;
-        this._lastValue = value;
         this.element.close();
         if (this._callback) {
             this._callback(value);
@@ -49,12 +39,4 @@ export class PromptController extends Controller {
         this._callback = null;
         this.element.close();
     }
-
-    useLastValueForNextPrompt() {
-        this._useLastNext = true;
-    }
-
-    clearUseLastValue() {
-        this._useLastNext = false;
-    }
 }

frontend/src/services.js

@@ -46,31 +46,16 @@ class TextProcessor {
         });
     }
 
-    async runTextCommand(command, opts) {
+    async runTextCommand(command) {
         if (this._editor === undefined) {
             return;
         }
 
-        const lineMode = opts && opts.lineMode;
         let ranges = this._editor.state.selection.ranges;
-        let hasSelection = ranges.some(r => r.from !== r.to);
+        let shouldBeAll = ranges.reduce((a, r) => a && r.from === r.to, true);
 
         let inputs = [];
-        if (lineMode && !hasSelection) {
+        if (shouldBeAll) {
-            this._appendInsertPos = undefined;
-            const doc = this._editor.state.doc;
-            const seen = new Set();
-            for (let r of ranges) {
-                const line = doc.lineAt(r.head);
-                if (seen.has(line.number)) continue;
-                seen.add(line.number);
-                inputs.push({
-                    text: line.text,
-                    pos: line.from,
-                    len: line.to - line.from,
-                });
-            }
-        } else if (!hasSelection) {
             this._appendInsertPos = this._editor.state.selection.main.head;
             inputs.push({
                 text: this._editor.state.doc.toString(),