Add directions

Author: AndreasArvidsson

packages/cursorless-engine/src/customCommandGrammar/generated/grammar.ts

@@ -6,6 +6,7 @@ function id(d: any[]): any { return d[0]; }
 declare var simpleActionName: any;
 declare var bringMove: any;
 declare var insertionMode: any;
+declare var direction: any;
 declare var simpleScopeTypeType: any;
 declare var pairedDelimiter: any;
 declare var simpleMarkType: any;
@@ -81,16 +82,12 @@ const grammar: Grammar = {
     {"name": "primitiveTarget", "symbols": ["primitiveTarget$ebnf$2", "mark"], "postprocess": 
         ([modifiers, mark]) => partialPrimitiveTargetDescriptor(modifiers, mark)
         },
-    {"name": "modifier", "symbols": ["containingScopeModifier"], "postprocess": 
-        ([containingScopeModifier]) => containingScopeModifier
-        },
-    {"name": "modifier", "symbols": ["relativeScopeModifier"], "postprocess": 
-        ([relativeScopeModifier]) => relativeScopeModifier
-        },
+    {"name": "modifier", "symbols": ["containingScopeModifier"], "postprocess": id},
+    {"name": "modifier", "symbols": ["relativeScopeModifier"], "postprocess": id},
     {"name": "containingScopeModifier", "symbols": ["scopeType"], "postprocess": 
         ([scopeType]) => containingScopeModifier(scopeType)
         },
-    {"name": "relativeScopeModifier", "symbols": ["direction", "scopeType"], "postprocess": 
+    {"name": "relativeScopeModifier", "symbols": [(lexer.has("direction") ? {type: "direction"} : direction), "scopeType"], "postprocess": 
         ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
         },
     {"name": "scopeType", "symbols": [(lexer.has("simpleScopeTypeType") ? {type: "simpleScopeTypeType"} : simpleScopeTypeType)], "postprocess": 
@@ -99,8 +96,6 @@ const grammar: Grammar = {
     {"name": "scopeType", "symbols": [(lexer.has("pairedDelimiter") ? {type: "pairedDelimiter"} : pairedDelimiter)], "postprocess": 
         ([delimiter]) => surroundingPairScopeType(delimiter)
         },
-    {"name": "direction", "symbols": [{"literal":"next"}], "postprocess": ([]) => "forward"},
-    {"name": "direction", "symbols": [{"literal":"previous"}], "postprocess": ([]) => "backward"},
     {"name": "mark", "symbols": [(lexer.has("simpleMarkType") ? {type: "simpleMarkType"} : simpleMarkType)], "postprocess": 
         ([simpleMarkType]) => simplePartialMark(simpleMarkType)
         },

packages/cursorless-engine/src/customCommandGrammar/grammar.ne

@@ -55,19 +55,15 @@ primitiveTarget -> modifier:+ mark {%
 
 # --------------------------- Modifiers ---------------------------
 
-modifier -> containingScopeModifier {%
-  ([containingScopeModifier]) => containingScopeModifier
-%}
+modifier -> containingScopeModifier {% id %}
 
-modifier -> relativeScopeModifier {%
-  ([relativeScopeModifier]) => relativeScopeModifier
-%}
+modifier -> relativeScopeModifier {% id %}
 
 containingScopeModifier -> scopeType {%
   ([scopeType]) => containingScopeModifier(scopeType)
 %}
 
-relativeScopeModifier -> direction scopeType {%
+relativeScopeModifier -> %direction scopeType {%
   ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
 %}
 
@@ -81,11 +77,6 @@ scopeType -> %pairedDelimiter {%
   ([delimiter]) => surroundingPairScopeType(delimiter)
 %}
 
-# --------------------------- Directions ---------------------------
-
-direction -> "next" {% ([]) => "forward" %}
-
-direction -> "previous" {% ([]) => "backward" %}
 
 # --------------------------- Marks ---------------------------
 

packages/cursorless-engine/src/customCommandGrammar/lexer.ts

@@ -89,6 +89,22 @@ for (const [mark, spokenForm] of Object.entries(marks)) {
   }
 }
 
+defaultSpokenFormMap.modifierExtra.next.spokenForms.forEach((spokenForm) => {
+  tokens[spokenForm] = {
+    type: "direction",
+    value: "forward",
+  };
+});
+
+defaultSpokenFormMap.modifierExtra.previous.spokenForms.forEach(
+  (spokenForm) => {
+    tokens[spokenForm] = {
+      type: "direction",
+      value: "backward",
+    };
+  },
+);
+
 export const lexer = new CommandLexer({
   ws: /[ \t]+/,
   placeholderTarget: {