Fixed bug with line number inference (#1774)

Fixes #1773

## 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)
- [/] I have not broken the cheatsheet

---------

Co-authored-by: Pokey Rule <[email protected]>

Author: AndreasArvidsson

packages/cursorless-engine/src/core/inferFullTargetDescriptor.ts

@@ -110,6 +110,7 @@ function inferPrimitiveTarget(
   const modifiers =
     getPreservedModifiers(target) ??
     getPreviousPreservedModifiers(previousTargets) ??
+    getPreviousLineNumberMarkModifiers(previousTargets) ??
     [];
 
   return {
@@ -142,10 +143,15 @@ function getPreservedModifiers(
     target.modifiers?.filter(
       (modifier) => modifier.type !== "inferPreviousMark",
     ) ?? [];
-  if (preservedModifiers.length !== 0) {
-    return preservedModifiers;
-  }
-  // In the absence of any other modifiers line number marks are infer as a containing line scope
+  return preservedModifiers.length !== 0 ? preservedModifiers : undefined;
+}
+
+/**
+ * `"row five past air"` => `"row five past line air"`
+ */
+function getLineNumberMarkModifiers(
+  target: PartialPrimitiveTargetDescriptor,
+): Modifier[] | undefined {
   if (isLineNumberMark(target)) {
     return [
       {
@@ -190,6 +196,15 @@ function getPreviousPreservedModifiers(
   return getPreviousTargetAttribute(previousTargets, getPreservedModifiers);
 }
 
+function getPreviousLineNumberMarkModifiers(
+  previousTargets: PartialTargetDescriptor[],
+): Modifier[] | undefined {
+  return getPreviousTargetAttribute(
+    previousTargets,
+    getLineNumberMarkModifiers,
+  );
+}
+
 /**
  * Walks backward through the given targets and their descendants trying to find
  * the first target for which the given attribute extractor returns a

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/inference/bringAirToEndOfRowTwoAndRowThree.yml

@@ -0,0 +1,42 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: bring air to end of row two and row three
+  action:
+    name: replaceWithTarget
+    source:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: a}
+    destination:
+      type: primitive
+      insertionMode: to
+      target:
+        type: list
+        elements:
+          - type: primitive
+            mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 1}
+            modifiers:
+              - {type: endOf}
+          - type: primitive
+            mark: {type: lineNumber, lineNumberType: modulo100, lineNumber: 2}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    a
+    b
+    c
+  selections:
+    - anchor: {line: 3, character: 0}
+      active: {line: 3, character: 0}
+  marks:
+    default.a:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 1}
+finalState:
+  documentContents: |
+    a
+    ba
+    ca
+  selections:
+    - anchor: {line: 3, character: 0}
+      active: {line: 3, character: 0}