Simplify scope fixtures (#2238)

Fixes #2210 ## Checklist - [/] 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]>
cursorless-dev · Feb 21, 2024 · 76be55e · 76be55e
1 parent aaf645a
commit 76be55e
Show file tree

Hide file tree

Showing 120 changed files with 466 additions and 540 deletions.
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/attribute.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/attribute.scope
@@ -3,15 +3,15 @@
 
 [Content] =
 [Domain] = 0:5-0:14
-0| <div id="root"></div>
        >---------<
+0| <div id="root"></div>
 
 [Removal] = 0:4-0:14
-0| <div id="root"></div>
       >----------<
+0| <div id="root"></div>
 
 [Leading delimiter] = 0:4-0:5
-0| <div id="root"></div>
       >-<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/comment.block.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/comment.block.scope
@@ -6,10 +6,9 @@
 [Content] =
 [Removal] =
 [Domain] = 0:0-2:3
-0| <!--
   >----
+0| <!--
 1|    Hello world
-   --------------
 2| -->
    ---<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/element.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/element.scope
@@ -4,11 +4,11 @@
 [Content] =
 [Removal] =
 [Domain] = 0:0-0:21
-0| <div id="root"></div>
   >---------------------<
+0| <div id="root"></div>
 
 [Interior] = 0:15-0:15
-0| <div id="root"></div>
                  ><
+0| <div id="root"></div>
 
 [Insertion delimiter] = "\n"
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/endTag.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/endTag.scope
@@ -3,11 +3,11 @@
 
 [Content] =
 [Removal] = 0:15-0:21
-0| <div id="root"></div>
                  >------<
+0| <div id="root"></div>
 
 [Domain] = 0:0-0:21
-0| <div id="root"></div>
   >---------------------<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute.scope
@@ -2,19 +2,19 @@
 ---
 
 [Content] = 0:5-0:7
-0| <div id="root"></div>
        >--<
+0| <div id="root"></div>
 
 [Removal] = 0:5-0:8
-0| <div id="root"></div>
        >---<
+0| <div id="root"></div>
 
 [Trailing delimiter] = 0:7-0:8
-0| <div id="root"></div>
          >-<
+0| <div id="root"></div>
 
 [Domain] = 0:5-0:14
-0| <div id="root"></div>
        >---------<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute2.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute2.scope
@@ -3,15 +3,15 @@
 
 [Content] =
 [Domain] = 0:5-0:13
-0| <div disabled></div>
        >--------<
+0| <div disabled></div>
 
 [Removal] = 0:4-0:13
-0| <div disabled></div>
       >---------<
+0| <div disabled></div>
 
 [Leading delimiter] = 0:4-0:5
-0| <div disabled></div>
       >-<
+0| <div disabled></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/startTag.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/startTag.scope
@@ -3,11 +3,11 @@
 
 [Content] =
 [Removal] = 0:0-0:15
-0| <div id="root"></div>
   >---------------<
+0| <div id="root"></div>
 
 [Domain] = 0:0-0:21
-0| <div id="root"></div>
   >---------------------<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/tags.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/tags.scope
@@ -3,18 +3,18 @@
 
 [.1 Content] =
 [.1 Removal] = 0:0-0:5
-0| <div>hello</div>
   >-----<
+0| <div>hello</div>
 
 [.1 Insertion delimiter] = " "
 
 [.2 Content] =
 [.2 Removal] = 0:10-0:16
-0| <div>hello</div>
             >------<
+0| <div>hello</div>
 
 [.2 Insertion delimiter] = " "
 
 [Domain] = 0:0-0:16
-0| <div>hello</div>
   >----------------<
+0| <div>hello</div>
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/value.attribute.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/value.attribute.scope
@@ -2,19 +2,19 @@
 ---
 
 [Content] = 0:8-0:14
-0| <div id="root"></div>
           >------<
+0| <div id="root"></div>
 
 [Removal] = 0:7-0:14
-0| <div id="root"></div>
          >-------<
+0| <div id="root"></div>
 
 [Leading delimiter] = 0:7-0:8
-0| <div id="root"></div>
          >-<
+0| <div id="root"></div>
 
 [Domain] = 0:5-0:14
-0| <div id="root"></div>
        >---------<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/name.foreach.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/name.foreach.scope
@@ -4,26 +4,25 @@ for (final Item item : items) {
 ---
 
 [Content] = 0:16-0:20
-0| for (final Item item : items) {
                   >----<
+0| for (final Item item : items) {
 
 [Removal] = 0:16-0:21
-0| for (final Item item : items) {
                   >-----<
+0| for (final Item item : items) {
 
 [Leading delimiter] = 0:15-0:16
-0| for (final Item item : items) {
                  >-<
+0| for (final Item item : items) {
 
 [Trailing delimiter] = 0:20-0:21
-0| for (final Item item : items) {
                       >-<
+0| for (final Item item : items) {
 
 [Domain] = 0:0-2:1
-0| for (final Item item : items) {
   >-------------------------------
+0| for (final Item item : items) {
 1|
-
 2| }
    -<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/type.foreach.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/type.foreach.scope
@@ -4,26 +4,25 @@ for (final Item item : items) {
 ---
 
 [Content] = 0:11-0:15
-0| for (final Item item : items) {
              >----<
+0| for (final Item item : items) {
 
 [Removal] = 0:11-0:16
-0| for (final Item item : items) {
              >-----<
+0| for (final Item item : items) {
 
 [Leading delimiter] = 0:10-0:11
-0| for (final Item item : items) {
             >-<
+0| for (final Item item : items) {
 
 [Trailing delimiter] = 0:15-0:16
-0| for (final Item item : items) {
                  >-<
+0| for (final Item item : items) {
 
 [Domain] = 0:0-2:1
-0| for (final Item item : items) {
   >-------------------------------
+0| for (final Item item : items) {
 1|
-
 2| }
    -<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/value.foreach.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/value.foreach.scope
@@ -4,22 +4,21 @@ for (final Item item : items) {
 ---
 
 [Content] = 0:23-0:28
-0| for (final Item item : items) {
                          >-----<
+0| for (final Item item : items) {
 
 [Removal] = 0:22-0:28
-0| for (final Item item : items) {
                         >------<
+0| for (final Item item : items) {
 
 [Leading delimiter] = 0:22-0:23
-0| for (final Item item : items) {
                         >-<
+0| for (final Item item : items) {
 
 [Domain] = 0:0-2:1
-0| for (final Item item : items) {
   >-------------------------------
+0| for (final Item item : items) {
 1|
-
 2| }
    -<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction.scope
@@ -6,10 +6,9 @@ function() {
 [Content] =
 [Removal] =
 [Domain] = 0:0-2:1
-0| function() {
   >------------
+0| function() {
 1|
-
 2| }
    -<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction2.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction2.scope
@@ -6,10 +6,9 @@
 [Content] =
 [Removal] =
 [Domain] = 0:0-2:1
-0| () => {
   >-------
+0| () => {
 1|
-
 2| }
    -<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction3.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction3.scope
@@ -4,7 +4,7 @@
 [Content] =
 [Removal] =
 [Domain] = 0:0-0:7
-0| () => 0
   >-------<
+0| () => 0
 
 [Insertion delimiter] = "\n"
diff --git a/...ursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.iteration.scope b/...ursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.iteration.scope
@@ -2,9 +2,9 @@ foo(arg1, arg2);
 ---
 
 [Range] = 0:4-0:14
-0| foo(arg1, arg2);
       >----------<
+0| foo(arg1, arg2);
 
 [Domain] = 0:3-0:15
-0| foo(arg1, arg2);
      >------------<
+0| foo(arg1, arg2);
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.scope
@@ -4,7 +4,7 @@ foo.bar(value);
 [Content] =
 [Removal] =
 [Domain] = 0:8-0:13
-0| foo.bar(value);
           >-----<
+0| foo.bar(value);
 
 [Insertion delimiter] = ", "
diff --git a/...ursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.iteration.scope b/...ursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.iteration.scope
@@ -4,13 +4,12 @@ function myFunk(arg1, arg2) {
 ---
 
 [Range] = 0:16-0:26
-0| function myFunk(arg1, arg2) {
                   >----------<
+0| function myFunk(arg1, arg2) {
 
 [Domain] = 0:0-2:1
-0| function myFunk(arg1, arg2) {
   >-----------------------------
+0| function myFunk(arg1, arg2) {
 1|
-
 2| }
    -<
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.scope
@@ -6,7 +6,7 @@ function myFunk(value) {
 [Content] =
 [Removal] =
 [Domain] = 0:16-0:21
-0| function myFunk(value) {
                   >-----<
+0| function myFunk(value) {
 
 [Insertion delimiter] = ", "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/attribute.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/attribute.scope
@@ -3,15 +3,15 @@
 
 [Content] =
 [Domain] = 0:5-0:14
-0| <div id="root"></div>
        >---------<
+0| <div id="root"></div>
 
 [Removal] = 0:4-0:14
-0| <div id="root"></div>
       >----------<
+0| <div id="root"></div>
 
 [Leading delimiter] = 0:4-0:5
-0| <div id="root"></div>
       >-<
+0| <div id="root"></div>
 
 [Insertion delimiter] = " "
diff --git a/...ages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.if.iteration.scope b/...ages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.if.iteration.scope
@@ -11,21 +11,14 @@ else {
 
 [Range] =
 [Domain] = 0:0-8:1
-0| if (true) {
   >-----------
+0| if (true) {
 1|
-
 2| }
-   -
 3| else if (false) {
-   -----------------
 4|
-
 5| }
-   -
 6| else {
-   ------
 7|
-
 8| }
    -<