Update tests

cursorless-dev · Nov 19, 2024 · 4298d59 · 4298d59
1 parent a25d329
commit 4298d59
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 46 deletions.
diff --git a/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.scope b/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.scope
@@ -2,12 +2,12 @@ let foo, bar;
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:4-0:7
-      >---<
+[#1 Domain] = 0:0-0:7
+  >-------<
 0| let foo, bar;
 
-[#1 Removal] = 0:4-0:9
-      >-----<
+[#1 Removal] = 0:0-0:9
+  >---------<
 0| let foo, bar;
 
 [#1 Trailing delimiter] = 0:7-0:9
@@ -18,16 +18,48 @@ let foo, bar;
 
 
 [#2 Content] =
-[#2 Domain] = 0:9-0:12
+[#2 Domain] = 0:4-0:7
+      >---<
+0| let foo, bar;
+
+[#2 Removal] = 0:4-0:9
+      >-----<
+0| let foo, bar;
+
+[#2 Trailing delimiter] = 0:7-0:9
+         >--<
+0| let foo, bar;
+
+[#2 Insertion delimiter] = ", "
+
+
+[#3 Content] =
+[#3 Domain] = 0:9-0:12
            >---<
 0| let foo, bar;
 
-[#2 Removal] = 0:7-0:12
+[#3 Removal] = 0:7-0:12
          >-----<
 0| let foo, bar;
 
-[#2 Leading delimiter] = 0:7-0:9
+[#3 Leading delimiter] = 0:7-0:9
          >--<
 0| let foo, bar;
 
-[#2 Insertion delimiter] = ", "
+[#3 Insertion delimiter] = ", "
+
+
+[#4 Content] =
+[#4 Domain] = 0:9-0:13
+           >----<
+0| let foo, bar;
+
+[#4 Removal] = 0:7-0:13
+         >------<
+0| let foo, bar;
+
+[#4 Leading delimiter] = 0:7-0:9
+         >--<
+0| let foo, bar;
+
+[#4 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope
@@ -2,10 +2,16 @@ def foo():
     global bar, baz
 ---
 
-[Range] = 1:11-1:19
+[#1 Range] =
+[#1 Domain] = 0:8-0:8
+          ><
+0| def foo():
+
+
+[#2 Range] = 1:11-1:19
              >--------<
 1|     global bar, baz
 
-[Domain] = 1:4-1:19
+[#2 Domain] = 1:4-1:19
       >---------------<
 1|     global bar, baz
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope
@@ -2,7 +2,13 @@ for key, value in map.items():
     pass
 ---
 
-[Range] =
-[Domain] = 0:4-0:14
+[#1 Range] =
+[#1 Domain] = 0:4-0:14
       >----------<
 0| for key, value in map.items():
+
+
+[#2 Range] =
+[#2 Domain] = 0:28-0:28
+                              ><
+0| for key, value in map.items():
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed2.scope b/data/fixtures/scopes/python/collectionItem.unenclosed2.scope
@@ -2,12 +2,12 @@ import foo, bar
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:7-0:10
-         >---<
+[#1 Domain] = 0:0-0:10
+  >----------<
 0| import foo, bar
 
-[#1 Removal] = 0:7-0:12
-         >-----<
+[#1 Removal] = 0:0-0:12
+  >------------<
 0| import foo, bar
 
 [#1 Trailing delimiter] = 0:10-0:12
@@ -18,16 +18,32 @@ import foo, bar
 
 
 [#2 Content] =
-[#2 Domain] = 0:12-0:15
+[#2 Domain] = 0:7-0:10
+         >---<
+0| import foo, bar
+
+[#2 Removal] = 0:7-0:12
+         >-----<
+0| import foo, bar
+
+[#2 Trailing delimiter] = 0:10-0:12
+            >--<
+0| import foo, bar
+
+[#2 Insertion delimiter] = ", "
+
+
+[#3 Content] =
+[#3 Domain] = 0:12-0:15
               >---<
 0| import foo, bar
 
-[#2 Removal] = 0:10-0:15
+[#3 Removal] = 0:10-0:15
             >-----<
 0| import foo, bar
 
-[#2 Leading delimiter] = 0:10-0:12
+[#3 Leading delimiter] = 0:10-0:12
             >--<
 0| import foo, bar
 
-[#2 Insertion delimiter] = ", "
+[#3 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed5.scope b/data/fixtures/scopes/python/collectionItem.unenclosed5.scope
@@ -2,36 +2,52 @@ from foo import bar, baz
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:16-0:19
+[#1 Domain] = 0:0-0:19
+  >-------------------<
+0| from foo import bar, baz
+
+[#1 Removal] = 0:0-0:21
+  >---------------------<
+0| from foo import bar, baz
+
+[#1 Trailing delimiter] = 0:19-0:21
+                     >--<
+0| from foo import bar, baz
+
+[#1 Insertion delimiter] = ", "
+
+
+[#2 Content] =
+[#2 Domain] = 0:16-0:19
                   >---<
 0| from foo import bar, baz
 
-[#1 Removal] = 0:16-0:21
+[#2 Removal] = 0:16-0:21
                   >-----<
 0| from foo import bar, baz
 
-[#1 Leading delimiter] = 0:15-0:16
+[#2 Leading delimiter] = 0:15-0:16
                  >-<
 0| from foo import bar, baz
 
-[#1 Trailing delimiter] = 0:19-0:21
+[#2 Trailing delimiter] = 0:19-0:21
                      >--<
 0| from foo import bar, baz
 
-[#1 Insertion delimiter] = ", "
+[#2 Insertion delimiter] = ", "
 
 
-[#2 Content] =
-[#2 Domain] = 0:21-0:24
+[#3 Content] =
+[#3 Domain] = 0:21-0:24
                        >---<
 0| from foo import bar, baz
 
-[#2 Removal] = 0:19-0:24
+[#3 Removal] = 0:19-0:24
                      >-----<
 0| from foo import bar, baz
 
-[#2 Leading delimiter] = 0:19-0:21
+[#3 Leading delimiter] = 0:19-0:21
                      >--<
 0| from foo import bar, baz
 
-[#2 Insertion delimiter] = ", "
+[#3 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed6.scope b/data/fixtures/scopes/python/collectionItem.unenclosed6.scope
@@ -3,12 +3,12 @@ def foo():
 ---
 
 [#1 Content] =
-[#1 Domain] = 1:11-1:14
-             >---<
+[#1 Domain] = 1:4-1:14
+      >----------<
 1|     global bar, baz
 
-[#1 Removal] = 1:11-1:16
-             >-----<
+[#1 Removal] = 1:4-1:16
+      >------------<
 1|     global bar, baz
 
 [#1 Trailing delimiter] = 1:14-1:16
@@ -19,16 +19,32 @@ def foo():
 
 
 [#2 Content] =
-[#2 Domain] = 1:16-1:19
+[#2 Domain] = 1:11-1:14
+             >---<
+1|     global bar, baz
+
+[#2 Removal] = 1:11-1:16
+             >-----<
+1|     global bar, baz
+
+[#2 Trailing delimiter] = 1:14-1:16
+                >--<
+1|     global bar, baz
+
+[#2 Insertion delimiter] = ", "
+
+
+[#3 Content] =
+[#3 Domain] = 1:16-1:19
                   >---<
 1|     global bar, baz
 
-[#2 Removal] = 1:14-1:19
+[#3 Removal] = 1:14-1:19
                 >-----<
 1|     global bar, baz
 
-[#2 Leading delimiter] = 1:14-1:16
+[#3 Leading delimiter] = 1:14-1:16
                 >--<
 1|     global bar, baz
 
-[#2 Insertion delimiter] = ", "
+[#3 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed7.scope b/data/fixtures/scopes/python/collectionItem.unenclosed7.scope
@@ -3,12 +3,12 @@ for key, value in map.items():
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:4-0:7
-      >---<
+[#1 Domain] = 0:0-0:7
+  >-------<
 0| for key, value in map.items():
 
-[#1 Removal] = 0:4-0:9
-      >-----<
+[#1 Removal] = 0:0-0:9
+  >---------<
 0| for key, value in map.items():
 
 [#1 Trailing delimiter] = 0:7-0:9
@@ -19,16 +19,48 @@ for key, value in map.items():
 
 
 [#2 Content] =
-[#2 Domain] = 0:9-0:14
+[#2 Domain] = 0:4-0:7
+      >---<
+0| for key, value in map.items():
+
+[#2 Removal] = 0:4-0:9
+      >-----<
+0| for key, value in map.items():
+
+[#2 Trailing delimiter] = 0:7-0:9
+         >--<
+0| for key, value in map.items():
+
+[#2 Insertion delimiter] = ", "
+
+
+[#3 Content] =
+[#3 Domain] = 0:9-0:14
            >-----<
 0| for key, value in map.items():
 
-[#2 Removal] = 0:7-0:14
+[#3 Removal] = 0:7-0:14
          >-------<
 0| for key, value in map.items():
 
-[#2 Leading delimiter] = 0:7-0:9
+[#3 Leading delimiter] = 0:7-0:9
          >--<
 0| for key, value in map.items():
 
-[#2 Insertion delimiter] = ", "
+[#3 Insertion delimiter] = ", "
+
+
+[#4 Content] =
+[#4 Domain] = 0:9-0:30
+           >---------------------<
+0| for key, value in map.items():
+
+[#4 Removal] = 0:7-0:30
+         >-----------------------<
+0| for key, value in map.items():
+
+[#4 Leading delimiter] = 0:7-0:9
+         >--<
+0| for key, value in map.items():
+
+[#4 Insertion delimiter] = ", "