Only check relevant final marks

cursorless-dev · Nov 5, 2021 · 1b4f769 · 1b4f769
1 parent c1b4077
commit 1b4f769
Show file tree

Hide file tree

Showing 27 changed files with 3 additions and 107 deletions.
diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringAirToThirdCarWhaleTakeWhale.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 20}
       active: {line: 0, character: 20}
   marks:
-    default.a:
-      start: {line: 0, character: 20}
-      end: {line: 0, character: 28}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 19}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/navigationMap/bringCommaToEndOfPointTakePoint.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 11}
       active: {line: 0, character: 11}
   marks:
-    default.,:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
     default..:
       start: {line: 0, character: 1}
       end: {line: 0, character: 2}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/navigationMap/bringCommaToStartOfPointTakePoint.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 11}
       active: {line: 0, character: 11}
   marks:
-    default.,:
-      start: {line: 0, character: 4}
-      end: {line: 0, character: 5}
     default..:
       start: {line: 0, character: 2}
       end: {line: 0, character: 3}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpAfterWhaleTakeWhale.yml
@@ -27,9 +27,6 @@ finalState:
     - anchor: {line: 0, character: 11}
       active: {line: 0, character: 11}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 6}
       end: {line: 0, character: 11}

diff --git a/...te/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml b/...te/fixtures/recorded/navigationMap/bringHarpAndPointToEndOfThisAndEndOfWhaleTakeWhale.yml
@@ -41,12 +41,6 @@ finalState:
     - anchor: {line: 0, character: 12}
       active: {line: 0, character: 12}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 17}

diff --git a/...suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml b/...suite/fixtures/recorded/navigationMap/bringHarpAndPointToThisAndStartOfWhaleTakeWhale.yml
@@ -39,12 +39,6 @@ finalState:
     - anchor: {line: 0, character: 13}
       active: {line: 0, character: 13}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 8}
       end: {line: 0, character: 18}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpBeforeWhaleTakeWhale.yml
@@ -27,9 +27,6 @@ finalState:
     - anchor: {line: 0, character: 19}
       active: {line: 0, character: 19}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 13}
       end: {line: 0, character: 18}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpTakeWhale.yml
@@ -30,9 +30,6 @@ finalState:
     - anchor: {line: 0, character: 16}
       active: {line: 0, character: 16}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 6}
       end: {line: 0, character: 16}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpToEndOfPointTakePoint.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 15}
       active: {line: 0, character: 15}
   marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
     default..:
       start: {line: 0, character: 1}
       end: {line: 0, character: 2}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfPointTakePoint.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 15}
       active: {line: 0, character: 15}
   marks:
-    default.h:
-      start: {line: 0, character: 10}
-      end: {line: 0, character: 15}
     default..:
       start: {line: 0, character: 6}
       end: {line: 0, character: 7}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringHarpToStartOfWhaleTakeWhale.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 18}
       active: {line: 0, character: 18}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 17}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringPointAfterFirstCarWhaleTakeWhale.yml
@@ -29,9 +29,6 @@ finalState:
     - anchor: {line: 0, character: 14}
       active: {line: 0, character: 14}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 13}

diff --git a/...s/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/...s/recorded/navigationMap/bringPointAndHarpToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml
@@ -43,12 +43,6 @@ finalState:
     - anchor: {line: 0, character: 13}
       active: {line: 0, character: 13}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 18}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhale.yml
@@ -41,12 +41,6 @@ finalState:
     - anchor: {line: 0, character: 12}
       active: {line: 0, character: 12}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 18}

diff --git a/...te/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml b/...te/fixtures/recorded/navigationMap/bringPointAndHarpToEndOfThisAndEndOfWhaleTakeWhale.yml
@@ -41,12 +41,6 @@ finalState:
     - anchor: {line: 0, character: 12}
       active: {line: 0, character: 12}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 18}

diff --git a/...corded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/...corded/navigationMap/bringPointAndHarpToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml
@@ -45,12 +45,6 @@ finalState:
     - anchor: {line: 0, character: 18}
       active: {line: 0, character: 18}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 18}

diff --git a/...suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml b/...suite/fixtures/recorded/navigationMap/bringPointAndHarpToThisAndStartOfWhaleTakeWhale.yml
@@ -39,12 +39,6 @@ finalState:
     - anchor: {line: 0, character: 13}
       active: {line: 0, character: 13}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 5}
     default.w:
       start: {line: 0, character: 8}
       end: {line: 0, character: 18}

diff --git a/.../recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml b/.../recorded/navigationMap/bringPointAndPointToEndOfSecondCarWhaleAndEndOfWhaleTakeWhale.yml
@@ -40,9 +40,6 @@ finalState:
     - anchor: {line: 0, character: 13}
       active: {line: 0, character: 13}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 13}

diff --git a/...orded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml b/...orded/navigationMap/bringPointAndPointToStartOfSecondCarWhaleAndStartOfWhaleTakeWhale.yml
@@ -42,9 +42,6 @@ finalState:
     - anchor: {line: 0, character: 14}
       active: {line: 0, character: 14}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 8}
       end: {line: 0, character: 14}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringPointToEndOfWhaleTakeWhale.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 14}
       active: {line: 0, character: 14}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 12}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringPointToStartOfWhaleTakeWhale.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 14}
       active: {line: 0, character: 14}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 8}
       end: {line: 0, character: 13}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/bringPointToThirdCarWhaleTakeWhale.yml
@@ -28,9 +28,6 @@ finalState:
     - anchor: {line: 0, character: 13}
       active: {line: 0, character: 13}
   marks:
-    default..:
-      start: {line: 0, character: 5}
-      end: {line: 0, character: 6}
     default.w:
       start: {line: 0, character: 7}
       end: {line: 0, character: 12}

diff --git a/...est/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml b/...est/suite/fixtures/recorded/navigationMap/chuckFourthCarWhalePastThirdCarAirTakeWhale.yml
@@ -38,9 +38,6 @@ finalState:
     default.w:
       start: {line: 0, character: 6}
       end: {line: 0, character: 9}
-    default.a:
-      start: {line: 0, character: 9}
-      end: {line: 0, character: 14}
   thatMark:
     - anchor: {line: 0, character: 9}
       active: {line: 0, character: 9}

diff --git a/src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml b/src/test/suite/fixtures/recorded/navigationMap/chuckHarpPastAirTakeWhale.yml
@@ -34,12 +34,6 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 0}
-    default.a:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 0}
     default.w:
       start: {line: 0, character: 0}
       end: {line: 0, character: 0}

diff --git a/...st/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml b/...st/suite/fixtures/recorded/navigationMap/chuckThirdCarHarpPastSecondCarWhaleTakeWhale.yml
@@ -35,9 +35,6 @@ finalState:
     - anchor: {line: 0, character: 14}
       active: {line: 0, character: 14}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 2}
     default.w:
       start: {line: 0, character: 2}
       end: {line: 0, character: 5}

diff --git a/...tures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml b/...tures/recorded/navigationMap/moveFourthCarHarpPastSecondCarWhaleToEndOfWhaleTakeWhale.yml
@@ -39,9 +39,6 @@ finalState:
     - anchor: {line: 0, character: 20}
       active: {line: 0, character: 20}
   marks:
-    default.h:
-      start: {line: 0, character: 0}
-      end: {line: 0, character: 3}
     default.w:
       start: {line: 0, character: 3}
       end: {line: 0, character: 8}

diff --git a/src/testUtil/TestCase.ts b/src/testUtil/TestCase.ts
@@ -160,18 +160,16 @@ export class TestCase {
   }
 
   filterMarks(command: TestCaseCommand, context: TestCaseContext) {
-    const keys = this.targetKeys.concat(
-      context.targets.map(extractTargetKeys).flat()
-    );
+    const keysToCheck = context.targets.map(extractTargetKeys).flat();
 
     this.initialState!.marks = pick(
       this.initialState!.marks,
-      keys
+      this.targetKeys.concat(keysToCheck)
     ) as SerializedMarks;
 
     this.finalState!.marks = pick(
       this.finalState!.marks,
-      keys
+      keysToCheck
     ) as SerializedMarks;
 
     this._awaitingFinalMarkInfo = false;