Clean up

Author: AndreasArvidsson

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

@@ -82,12 +82,10 @@ const grammar: Grammar = {
     {"name": "primitiveTarget", "symbols": ["primitiveTarget$ebnf$2", "mark"], "postprocess": 
         ([modifiers, mark]) => partialPrimitiveTargetDescriptor(modifiers, mark)
         },
-    {"name": "modifier", "symbols": ["containingScopeModifier"], "postprocess": id},
-    {"name": "modifier", "symbols": ["relativeScopeModifier"], "postprocess": id},
-    {"name": "containingScopeModifier", "symbols": ["scopeType"], "postprocess": 
+    {"name": "modifier", "symbols": ["scopeType"], "postprocess": 
         ([scopeType]) => containingScopeModifier(scopeType)
         },
-    {"name": "relativeScopeModifier", "symbols": [(lexer.has("direction") ? {type: "direction"} : direction), "scopeType"], "postprocess": 
+    {"name": "modifier", "symbols": [(lexer.has("direction") ? {type: "direction"} : direction), "scopeType"], "postprocess": 
         ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
         },
     {"name": "scopeType", "symbols": [(lexer.has("simpleScopeTypeType") ? {type: "simpleScopeTypeType"} : simpleScopeTypeType)], "postprocess": 

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

@@ -55,15 +55,11 @@ primitiveTarget -> modifier:+ mark {%
 
 # --------------------------- Modifiers ---------------------------
 
-modifier -> containingScopeModifier {% id %}
-
-modifier -> relativeScopeModifier {% id %}
-
-containingScopeModifier -> scopeType {%
+modifier -> scopeType {%
   ([scopeType]) => containingScopeModifier(scopeType)
 %}
 
-relativeScopeModifier -> %direction scopeType {%
+modifier -> %direction scopeType {%
   ([direction, scopeType]) => relativeScopeModifier(scopeType, direction)
 %}