vi-style count-prefix for task movement

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index dc61007ec9724a2ec417b1f786670c93a6cc3f6a..d3b2c05fbb73a118fb7ea9ee133680117491ac88 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -215,15 +215,16 @@ function Log(prefix: string = "vp-") {
 const log = Log();
 
 function UI() {
-  const undoLog: string[] = [];
+  const undoLog: string[][] = [];
+  const redoLog: string[][] = [];
   function perform(forward: string, reverse: string) {
-    undoLog.push(reverse);
+    undoLog.push([reverse, forward]);
     return log.recordAndApply(`${clock.now()} ${forward}`);
   }
   return {
     addTask: function (description: string): Element {
       const now = clock.now();
-      undoLog.push(`State ${now} deleted`);
+      undoLog.push([`State ${now} deleted`, `State ${now} todo`]);
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
@@ -242,8 +243,17 @@ function UI() {
       return perform(`State ${createTimestamp} ${newState}`, `State ${createTimestamp} ${oldState}`);
     },
     undo: function () {
-      if (undoLog.length > 0) {
-        return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`);
+      const entry = undoLog.pop();
+      if (entry) {
+        redoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[0]}`);
+      }
+    },
+    redo: function () {
+      const entry = redoLog.pop();
+      if (entry) {
+        undoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[1]}`);
       }
     },
   };
@@ -464,6 +474,10 @@ function BrowserUI() {
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();
     },
+    redo: function () {
+      const ret = ui.redo();
+      if (ret && ret instanceof HTMLElement) ret.focus();
+    },
   };
 }
 const browserUI = BrowserUI();
@@ -475,8 +489,10 @@ enum InputState {
   VS,
 }
 var inputState = InputState.Root;
+var inputCount: number | null = null;
 
 function handleKey(event: any) {
+  if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return;
   if (event.target.tagName === "INPUT") {
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
@@ -490,23 +506,31 @@ function handleKey(event: any) {
     }
   } else {
     if (inputState === InputState.Root) {
-      if (event.key == "j") return browserUI.moveCursor(1);
-      if (event.key == "k") return browserUI.moveCursor(-1);
-      if (event.key == "J") return browserUI.moveTask(1);
-      if (event.key == "K") return browserUI.moveTask(-1);
-      if (event.key == "T") return browserUI.makeTopPriority();
-      if (event.key == "n") return browserUI.focusTaskNameInput(event);
-      if (event.key == "c") return browserUI.setState("cancelled");
-      if (event.key == "d") return browserUI.setState("done");
-      if (event.key == "q") return browserUI.setState("todo");
-      if (event.key == "s") return (inputState = InputState.S);
-      if (event.key == "w") return browserUI.setState("waiting");
-      if (event.key == "X") return browserUI.setState("deleted");
-      if (event.key == "x") return browserUI.removeTag();
-      if (event.key == "u") return browserUI.undo();
-      if (event.key == "e") return browserUI.beginEdit(event);
-      if (event.key == "t") return browserUI.beginTagEdit(event);
-      if (event.key == "v") return (inputState = InputState.V);
+      if ("0" <= event.key && event.key <= "9") {
+        return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
+      }
+      try {
+        if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
+        if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
+        if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
+        if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
+        if (event.key == "T") return browserUI.makeTopPriority();
+        if (event.key == "n") return browserUI.focusTaskNameInput(event);
+        if (event.key == "c") return browserUI.setState("cancelled");
+        if (event.key == "d") return browserUI.setState("done");
+        if (event.key == "q") return browserUI.setState("todo");
+        if (event.key == "s") return (inputState = InputState.S);
+        if (event.key == "w") return browserUI.setState("waiting");
+        if (event.key == "X") return browserUI.setState("deleted");
+        if (event.key == "x") return browserUI.removeTag();
+        if (event.key == "u") return browserUI.undo();
+        if (event.key == "r") return browserUI.redo();
+        if (event.key == "e") return browserUI.beginEdit(event);
+        if (event.key == "t") return browserUI.beginTagEdit(event);
+        if (event.key == "v") return (inputState = InputState.V);
+      } finally {
+        inputCount = null;
+      }
     } else if (inputState === InputState.S) {
       inputState = InputState.Root;
       if (event.key == "m") return browserUI.setState("someday-maybe");