Started working on custom relative command

Author: AndreasArvidsson

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

@@ -16,9 +16,10 @@ import { lexer } from "../lexer";
 import {
   bringMoveActionDescriptor,
   containingScopeModifier,
-  partialPrimitiveTargetDescriptor,
   createPlaceholderTarget,
+  partialPrimitiveTargetDescriptor,
   primitiveDestinationDescriptor,
+  relativeScopeModifier,
   simpleActionDescriptor,
   simplePartialMark,
   simpleScopeType,
@@ -83,15 +84,23 @@ const grammar: Grammar = {
     {"name": "modifier", "symbols": ["containingScopeModifier"], "postprocess": 
         ([containingScopeModifier]) => containingScopeModifier
         },
+    {"name": "modifier", "symbols": ["relativeScopeModifier"], "postprocess": 
+        ([relativeScopeModifier]) => relativeScopeModifier
+        },
     {"name": "containingScopeModifier", "symbols": ["scopeType"], "postprocess": 
         ([scopeType]) => containingScopeModifier(scopeType)
         },
+    {"name": "relativeScopeModifier", "symbols": ["direction", "scopeType"], "postprocess": 
+        ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
+        },
     {"name": "scopeType", "symbols": [(lexer.has("simpleScopeTypeType") ? {type: "simpleScopeTypeType"} : simpleScopeTypeType)], "postprocess": 
         ([simpleScopeTypeType]) => simpleScopeType(simpleScopeTypeType)
         },
     {"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

@@ -5,9 +5,10 @@ import { lexer } from "../lexer";
 import {
   bringMoveActionDescriptor,
   containingScopeModifier,
-  partialPrimitiveTargetDescriptor,
   createPlaceholderTarget,
+  partialPrimitiveTargetDescriptor,
   primitiveDestinationDescriptor,
+  relativeScopeModifier,
   simpleActionDescriptor,
   simplePartialMark,
   simpleScopeType,
@@ -58,10 +59,18 @@ modifier -> containingScopeModifier {%
   ([containingScopeModifier]) => containingScopeModifier
 %}
 
+modifier -> relativeScopeModifier {%
+  ([relativeScopeModifier]) => relativeScopeModifier
+%}
+
 containingScopeModifier -> scopeType {%
   ([scopeType]) => containingScopeModifier(scopeType)
 %}
 
+relativeScopeModifier -> direction scopeType {%
+  ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
+%}
+
 # --------------------------- Scope types ---------------------------
 
 scopeType -> %simpleScopeTypeType {%
@@ -72,6 +81,12 @@ scopeType -> %pairedDelimiter {%
   ([delimiter]) => surroundingPairScopeType(delimiter)
 %}
 
+# --------------------------- Directions ---------------------------
+
+direction -> "next" {% ([]) => "forward" %}
+
+direction -> "previous" {% ([]) => "backward" %}
+
 # --------------------------- Marks ---------------------------
 
 mark -> %simpleMarkType {%

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

@@ -1,11 +1,13 @@
 import type {
   BringMoveActionDescriptor,
   DestinationDescriptor,
+  Direction,
   InsertionMode,
   PartialListTargetDescriptor,
   PartialRangeTargetDescriptor,
   PartialTargetMark,
   PrimitiveDestinationDescriptor,
+  RelativeScopeModifier,
 } from "@cursorless/common";
 import {
   type ContainingScopeModifier,
@@ -75,6 +77,19 @@ export function containingScopeModifier(
   };
 }
 
+export function relativeScopeModifier(
+  scopeType: ScopeType,
+  direction: Direction,
+): RelativeScopeModifier {
+  return {
+    type: "relativeScope",
+    scopeType,
+    offset: 1,
+    length: 1,
+    direction,
+  };
+}
+
 export function simpleScopeType(type: SimpleScopeTypeType): SimpleScopeType {
   return { type };
 }