Don't show lines in our facet tests that are outside of the range (#2207

) Fixes #2164 ## 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
cursorless-dev · Jan 28, 2024 · d228144 · d228144
1 parent 84a46fe
commit d228144
Show file tree

Hide file tree

Showing 33 changed files with 16 additions and 470 deletions.
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
@@ -6,34 +6,18 @@ for (final Item item : items) {
 [Content] = 0:16-0:20
 0| for (final Item item : items) {
                   >----<
-1|
-
-2| }
-
 
 [Removal] = 0:16-0:21
 0| for (final Item item : items) {
                   >-----<
-1|
-
-2| }
-
 
 [Leading delimiter] = 0:15-0:16
 0| for (final Item item : items) {
                  >-<
-1|
-
-2| }
-
 
 [Trailing delimiter] = 0:20-0:21
 0| for (final Item item : items) {
                       >-<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| for (final Item item : items) {

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
@@ -6,34 +6,18 @@ for (final Item item : items) {
 [Content] = 0:11-0:15
 0| for (final Item item : items) {
              >----<
-1|
-
-2| }
-
 
 [Removal] = 0:11-0:16
 0| for (final Item item : items) {
              >-----<
-1|
-
-2| }
-
 
 [Leading delimiter] = 0:10-0:11
 0| for (final Item item : items) {
             >-<
-1|
-
-2| }
-
 
 [Trailing delimiter] = 0:15-0:16
 0| for (final Item item : items) {
                  >-<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| for (final Item item : items) {

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
@@ -6,26 +6,14 @@ for (final Item item : items) {
 [Content] = 0:23-0:28
 0| for (final Item item : items) {
                          >-----<
-1|
-
-2| }
-
 
 [Removal] = 0:22-0:28
 0| for (final Item item : items) {
                         >------<
-1|
-
-2| }
-
 
 [Leading delimiter] = 0:22-0:23
 0| for (final Item item : items) {
                         >-<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| for (final Item item : items) {

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
@@ -6,10 +6,6 @@ function myFunk(arg1, arg2) {
 [Range] = 0:16-0:26
 0| function myFunk(arg1, arg2) {
                   >----------<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| function myFunk(arg1, arg2) {

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
@@ -8,9 +8,5 @@ function myFunk(value) {
 [Domain] = 0:16-0:21
 0| function myFunk(value) {
                   >-----<
-1|
-
-2| }
-
 
 [Insertion delimiter] = ", "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.if.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.if.scope
@@ -17,18 +17,6 @@ else {
 
 2| }
    -<
-3| else if (false) {
-
-4|
-
-5| }
-
-6| else {
-
-7|
-
-8| }
-
 
 [#1 Removal] = 0:0-3:5
 0| if (true) {
@@ -39,60 +27,26 @@ else {
    -
 3| else if (false) {
    -----<
-4|
-
-5| }
-
-6| else {
-
-7|
-
-8| }
-
 
 [#1 Insertion delimiter] = "\n"
 
 
 [#2 Content] =
 [#2 Removal] =
 [#2 Domain] = 3:0-5:1
-0| if (true) {
-
-1|
-
-2| }
-
 3| else if (false) {
   >-----------------
 4|
 
 5| }
    -<
-6| else {
-
-7|
-
-8| }
-
 
 [#2 Insertion delimiter] = "\n"
 
 
 [#3 Content] =
 [#3 Removal] =
 [#3 Domain] = 6:0-8:1
-0| if (true) {
-
-1|
-
-2| }
-
-3| else if (false) {
-
-4|
-
-5| }
-
 6| else {
   >------
 7|

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.switchCase.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.switchCase.scope
@@ -5,27 +5,15 @@ switch (value) {
 
 [Content] =
 [Domain] = 1:2-1:13
-0| switch (value) {
-
 1|   case 0: { }
     >-----------<
-2| }
-
 
 [Removal] = 1:0-1:13
-0| switch (value) {
-
 1|   case 0: { }
   >-------------<
-2| }
-
 
 [Leading delimiter] = 1:0-1:2
-0| switch (value) {
-
 1|   case 0: { }
   >--<
-2| }
-
 
 [Insertion delimiter] = "\n"
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.try.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.try.scope
@@ -18,62 +18,26 @@ finally {
 
 2| }
    -<
-3| catch(error) {
-
-4|
-
-5| }
-
-6| finally {
-
-7|
-
-8| }
-
 
 [#1 Insertion delimiter] = "\n"
 
 
 [#2 Content] =
 [#2 Removal] =
 [#2 Domain] = 3:0-5:1
-0| try {
-
-1|
-
-2| }
-
 3| catch(error) {
   >--------------
 4|
 
 5| }
    -<
-6| finally {
-
-7|
-
-8| }
-
 
 [#2 Insertion delimiter] = "\n"
 
 
 [#3 Content] =
 [#3 Removal] =
 [#3 Domain] = 6:0-8:1
-0| try {
-
-1|
-
-2| }
-
-3| catch(error) {
-
-4|
-
-5| }
-
 6| finally {
   >---------
 7|

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/className.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/className.scope
@@ -6,34 +6,18 @@ class MyClass {
 [Content] = 0:6-0:13
 0| class MyClass {
         >-------<
-1|
-
-2| }
-
 
 [Removal] = 0:6-0:14
 0| class MyClass {
         >--------<
-1|
-
-2| }
-
 
 [Leading delimiter] = 0:5-0:6
 0| class MyClass {
        >-<
-1|
-
-2| }
-
 
 [Trailing delimiter] = 0:13-0:14
 0| class MyClass {
                >-<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| class MyClass {

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.doWhile.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.doWhile.scope
@@ -5,10 +5,6 @@ do {
 
 [Content] =
 [Removal] = 2:9-2:13
-0| do {
-
-1|
-
 2| } while (true);
            >----<
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.for.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.for.scope
@@ -6,26 +6,14 @@ for (let i = 0; i < 10; ++i) {
 [Content] = 0:16-0:22
 0| for (let i = 0; i < 10; ++i) {
                   >------<
-1|
-
-2| }
-
 
 [Removal] = 0:15-0:22
 0| for (let i = 0; i < 10; ++i) {
                  >-------<
-1|
-
-2| }
-
 
 [Leading delimiter] = 0:15-0:16
 0| for (let i = 0; i < 10; ++i) {
                  >-<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| for (let i = 0; i < 10; ++i) {

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.if.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/condition.if.scope
@@ -7,10 +7,6 @@ if (true) {
 [Removal] = 0:4-0:8
 0| if (true) {
       >----<
-1|
-
-2| }
-
 
 [Domain] = 0:0-2:1
 0| if (true) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,10 +5,6 @@ do { @@
     [Content] =
     [Removal] = 2:9-2:13
-| do {
-|
 | } while (true);
                >----<
@@ Expand Down @@