Infer line scope from line number marks (#1268)

Fixes #1247 

## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [ ] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [x] I have not broken the cheatsheet

Author: AndreasArvidsson

src/core/inferFullTargets.ts

@@ -170,12 +170,41 @@ function shouldInferPreviousMark(
 function getPreservedModifiers(
   target: PartialPrimitiveTargetDescriptor,
 ): Modifier[] | undefined {
-  const preservedModifiers = target.modifiers?.filter(
-    (modifier) => !["position", "inferPreviousMark"].includes(modifier.type),
-  );
-  return preservedModifiers == null || preservedModifiers.length === 0
-    ? undefined
-    : preservedModifiers;
+  const preservedModifiers =
+    target.modifiers?.filter(
+      (modifier) => !["position", "inferPreviousMark"].includes(modifier.type),
+    ) ?? [];
+  if (preservedModifiers.length !== 0) {
+    return preservedModifiers;
+  }
+  // In the absence of any other modifiers line number marks are infer as a containing line scope
+  if (isLineNumberMark(target)) {
+    return [
+      {
+        type: "containingScope",
+        scopeType: {
+          type: "line",
+        },
+      },
+    ];
+  }
+  return undefined;
+}
+
+/**
+ * Returns true if this target has a line number mark.
+ * @param target The target to check for line number mark
+ * @returns True if this target has a line number mark
+ */
+function isLineNumberMark(target: PartialPrimitiveTargetDescriptor): boolean {
+  const isLineNumber = (mark?: Mark) => mark?.type === "lineNumber";
+  if (isLineNumber(target.mark)) {
+    return true;
+  }
+  if (target.mark?.type === "range") {
+    return isLineNumber(target.mark.anchor) && isLineNumber(target.mark.active);
+  }
+  return false;
 }
 
 function getPreviousMark(

src/test/suite/fixtures/recorded/inference/bringRowOneBeforeBatt.yml

@@ -0,0 +1,37 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring row one before batt
+  action: {name: replaceWithTarget}
+  targets:
+    - type: primitive
+      mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+      modifiers:
+        - {type: position, position: before}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aaa
+    ccc
+
+    b
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks:
+    default.b:
+      start: {line: 3, character: 0}
+      end: {line: 3, character: 1}
+finalState:
+  documentContents: |-
+    aaa
+    ccc
+
+    aaa
+    b
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+fullTargets: [{type: primitive, mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: before}}]

src/test/suite/fixtures/recorded/inference/bringRowOnePastTwoBeforeBatt.yml

@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  version: 4
+  spokenForm: bring row one past two before batt
+  action: {name: replaceWithTarget}
+  targets:
+    - type: primitive
+      mark:
+        type: range
+        anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}
+        active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}
+        excludeAnchor: false
+        excludeActive: false
+    - type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+      modifiers:
+        - {type: position, position: before}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aaa
+    ccc
+
+    b
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks:
+    default.b:
+      start: {line: 3, character: 0}
+      end: {line: 3, character: 1}
+finalState:
+  documentContents: |-
+    aaa
+    ccc
+
+    aaa
+    ccc
+    b
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+fullTargets: [{type: primitive, mark: {type: range, anchor: {type: lineNumber, lineNumberType: modulo100, lineNumber: 0}, active: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}, excludeAnchor: false, excludeActive: false}, modifiers: [{type: containingScope, scopeType: {type: line}}]}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: b}, modifiers: [{type: containingScope, scopeType: {type: line}}], positionModifier: {type: position, position: before}}]