Added tests

Author: AndreasArvidsson

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ContiguousScopeHandler.ts

@@ -84,15 +84,26 @@ function combineScopes(scope1: TargetScope, scope2: TargetScope): TargetScope {
   return {
     editor: scope1.editor,
     domain: scope1.domain.union(scope2.domain),
-    getTargets: (isReversed) => [
-      createContinuousRangeTarget(
-        isReversed,
-        scope1.getTargets(false)[0],
-        scope2.getTargets(false)[0],
-        true,
-        true,
-      ),
-    ],
+    getTargets: (isReversed) => {
+      const target1 = scope1.getTargets(isReversed)[0];
+      const target2 = scope2.getTargets(isReversed)[0];
+
+      const [startTarget, endTarget] = target1.contentRange.start.isBefore(
+        target2.contentRange.start,
+      )
+        ? [target1, target2]
+        : [target2, target1];
+
+      return [
+        createContinuousRangeTarget(
+          isReversed,
+          startTarget,
+          endTarget,
+          true,
+          true,
+        ),
+      ];
+    },
   };
 }
 

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/contiguousScopes/changeNextFatIdentifier.yml

@@ -0,0 +1,28 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: change next fat identifier
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType:
+            type: contiguous
+            scopeType: {type: identifier}
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa bbb | ccc
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: "aaa bbb | "
+  selections:
+    - anchor: {line: 0, character: 10}
+      active: {line: 0, character: 10}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/contiguousScopes/changeNextFatIdentifier2.yml

@@ -0,0 +1,28 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: change next fat identifier
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType:
+            type: contiguous
+            scopeType: {type: identifier}
+          offset: 1
+          length: 1
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa bbb | ccc
+  selections:
+    - anchor: {line: 0, character: 7}
+      active: {line: 0, character: 7}
+  marks: {}
+finalState:
+  documentContents: "aaa bbb | "
+  selections:
+    - anchor: {line: 0, character: 10}
+      active: {line: 0, character: 10}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/contiguousScopes/changePreviousFatIdentifier.yml

@@ -0,0 +1,28 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: change previous fat identifier
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType:
+            type: contiguous
+            scopeType: {type: identifier}
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa bbb | ccc
+  selections:
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 13}
+  marks: {}
+finalState:
+  documentContents: " | ccc"
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/contiguousScopes/changePreviousFatIdentifier2.yml

@@ -0,0 +1,28 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: change previous fat identifier
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType:
+            type: contiguous
+            scopeType: {type: identifier}
+          offset: 1
+          length: 1
+          direction: backward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa bbb | ccc
+  selections:
+    - anchor: {line: 0, character: 10}
+      active: {line: 0, character: 10}
+  marks: {}
+finalState:
+  documentContents: " | ccc"
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}