commands: fix esc, s-q not stopping recording (fixes 71#243)

forivall · Mar 8, 2022 · ff1df1c · ff1df1c
1 parent 4332956
commit ff1df1c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 18 deletions.
diff --git a/meta.ts b/meta.ts
@@ -434,20 +434,25 @@ export function parseKeys(keys: string) {
     const remainingKeybinding = keybinding.replace(/[csa]-/g, ""),
           whenClauses = ["editorTextFocus"];
 
-    for (const tag of match[3].split(", ")) {
+    for (let tag of match[3].split(", ")) {
+      const negate = tag.startsWith("!");
+      if (negate) {
+        tag = tag.slice(1);
+      }
       switch (tag) {
       case "normal":
       case "insert":
       case "input":
-        whenClauses.push(`dance.mode == '${tag}'`);
+        whenClauses.push(`dance.mode ${negate ? "!=" : "=="} '${tag}'`);
         break;
 
       case "recording":
-        whenClauses.push("dance.isRecording");
+        whenClauses.push(`${negate ? "!" : ""}dance.isRecording`);
         break;
 
       case "prompt":
-        whenClauses.shift();  // Remove "editorTextFocus" clause.
+        assert(!negate);
+        whenClauses.splice(whenClauses.indexOf("editorTextFocus"), 1);
         whenClauses.push("inputFocus && !textInputFocus");
         break;
 
@@ -458,7 +463,7 @@ export function parseKeys(keys: string) {
           throw new Error("unknown keybinding tag " + tag);
         }
 
-        whenClauses.push(match[1]);
+        whenClauses.push((negate ? "!" : "") + match[1]);
         break;
       }
       }

diff --git a/package.json b/package.json
diff --git a/src/api/keybindings/built-in.ts b/src/api/keybindings/built-in.ts
diff --git a/src/commands/README.md b/src/commands/README.md
diff --git a/src/commands/history.ts b/src/commands/history.ts
@@ -166,7 +166,7 @@ const recordingPerRegister = new WeakMap<Register, ActiveRecording>();
 /**
  * Start recording.
  *
- * @keys `s-q` (normal)
+ * @keys `s-q` (normal, !recording)
  * @noreplay
  */
 export function recording_start(
@@ -187,7 +187,7 @@ export function recording_start(
 /**
  * Stop recording.
  *
- * @keys `escape` (normal, recording)
+ * @keys `escape` (normal, recording), `s-q` (normal, recording)
  * @noreplay
  */
 export function recording_stop(

diff --git a/src/commands/misc.ts b/src/commands/misc.ts
@@ -19,7 +19,7 @@ declare module "./misc";
 /**
  * Cancel Dance operation.
  *
- * @keys `escape` (normal, "!markersNavigationVisible"), `escape` (input)
+ * @keys `escape` (normal, !recording, "!markersNavigationVisible"), `escape` (input)
  */
 export function cancel(extension: Extension) {
   // Calling a new command resets pending operations, so we don't need to do