Migrate python collection item scope (#2450)

AndreasArvidsson · pre-commit-ci-lite[bot] · pokey · web-flow · commit 0a703574e0f3 · 2024-07-09T14:55:42.000Z
## 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: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
diff --git a/data/fixtures/recorded/languages/python/chuckItem.yml b/data/fixtures/recorded/languages/python/chuckItem.yml
diff --git a/data/fixtures/recorded/languages/python/clearEveryItem.yml b/data/fixtures/recorded/languages/python/clearEveryItem.yml
diff --git a/data/fixtures/recorded/languages/python/clearEveryItem2.yml b/data/fixtures/recorded/languages/python/clearEveryItem2.yml
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration.scope
@@ -0,0 +1,10 @@
+import foo, bar
+---
+
+[Range] = 0:7-0:15
+         >--------<
+0| import foo, bar
+
+[Domain] = 0:0-0:15
+  >---------------<
+0| import foo, bar
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration2.scope
@@ -0,0 +1,10 @@
+from foo import bar, baz
+---
+
+[Range] = 0:16-0:24
+                  >--------<
+0| from foo import bar, baz
+
+[Domain] = 0:0-0:24
+  >------------------------<
+0| from foo import bar, baz
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope
@@ -0,0 +1,11 @@
+def foo():
+    global bar, baz
+---
+
+[Range] = 1:11-1:19
+             >--------<
+1|     global bar, baz
+
+[Domain] = 1:4-1:19
+      >---------------<
+1|     global bar, baz
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.scope
@@ -0,0 +1,17 @@
+import foo
+---
+
+[Content] =
+[Domain] = 0:7-0:10
+         >---<
+0| import foo
+
+[Removal] = 0:6-0:10
+        >----<
+0| import foo
+
+[Leading delimiter] = 0:6-0:7
+        >-<
+0| import foo
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed2.scope b/data/fixtures/scopes/python/collectionItem.unenclosed2.scope
@@ -0,0 +1,33 @@
+import foo, bar
+---
+
+[#1 Content] =
+[#1 Domain] = 0:7-0:10
+         >---<
+0| import foo, bar
+
+[#1 Removal] = 0:7-0:12
+         >-----<
+0| import foo, bar
+
+[#1 Trailing delimiter] = 0:10-0:12
+            >--<
+0| import foo, bar
+
+[#1 Insertion delimiter] = ", "
+
+
+[#2 Content] =
+[#2 Domain] = 0:12-0:15
+              >---<
+0| import foo, bar
+
+[#2 Removal] = 0:10-0:15
+            >-----<
+0| import foo, bar
+
+[#2 Leading delimiter] = 0:10-0:12
+            >--<
+0| import foo, bar
+
+[#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed3.scope b/data/fixtures/scopes/python/collectionItem.unenclosed3.scope
@@ -0,0 +1,17 @@
+from foo import bar
+---
+
+[Content] =
+[Domain] = 0:16-0:19
+                  >---<
+0| from foo import bar
+
+[Removal] = 0:15-0:19
+                 >----<
+0| from foo import bar
+
+[Leading delimiter] = 0:15-0:16
+                 >-<
+0| from foo import bar
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed4.scope b/data/fixtures/scopes/python/collectionItem.unenclosed4.scope
@@ -0,0 +1,18 @@
+def foo():
+    global bar
+---
+
+[Content] =
+[Domain] = 1:11-1:14
+             >---<
+1|     global bar
+
+[Removal] = 1:10-1:14
+            >----<
+1|     global bar
+
+[Leading delimiter] = 1:10-1:11
+            >-<
+1|     global bar
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed5.scope b/data/fixtures/scopes/python/collectionItem.unenclosed5.scope
@@ -0,0 +1,37 @@
+from foo import bar, baz
+---
+
+[#1 Content] =
+[#1 Domain] = 0:16-0:19
+                  >---<
+0| from foo import bar, baz
+
+[#1 Removal] = 0:16-0:21
+                  >-----<
+0| from foo import bar, baz
+
+[#1 Leading delimiter] = 0:15-0:16
+                 >-<
+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:21-0:24
+                       >---<
+0| from foo import bar, baz
+
+[#2 Removal] = 0:19-0:24
+                     >-----<
+0| from foo import bar, baz
+
+[#2 Leading delimiter] = 0:19-0:21
+                     >--<
+0| from foo import bar, baz
+
+[#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed6.scope b/data/fixtures/scopes/python/collectionItem.unenclosed6.scope
@@ -0,0 +1,34 @@
+def foo():
+    global bar, baz
+---
+
+[#1 Content] =
+[#1 Domain] = 1:11-1:14
+             >---<
+1|     global bar, baz
+
+[#1 Removal] = 1:11-1:16
+             >-----<
+1|     global bar, baz
+
+[#1 Trailing delimiter] = 1:14-1:16
+                >--<
+1|     global bar, baz
+
+[#1 Insertion delimiter] = ", "
+
+
+[#2 Content] =
+[#2 Domain] = 1:16-1:19
+                  >---<
+1|     global bar, baz
+
+[#2 Removal] = 1:14-1:19
+                >-----<
+1|     global bar, baz
+
+[#2 Leading delimiter] = 1:14-1:16
+                >--<
+1|     global bar, baz
+
+[#2 Insertion delimiter] = ", "
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
@@ -21,6 +21,9 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.formal": supported,
   "argument.formal.iteration": supported,
 
+  "collectionItem.unenclosed": supported,
+  "collectionItem.unenclosed.iteration": supported,
+
   "branch.if": supported,
   "branch.if.iteration": supported,
   "branch.switchCase": supported,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -328,6 +328,17 @@ export const scopeSupportFacetInfos: Record<
     description: "A branch in a ternary expression",
     scopeType: "branch",
   },
+  "collectionItem.unenclosed": {
+    description:
+      "An item in a comma-separated list without enclosing delimiters. This could be multi-variable declarations, import statements, etc.",
+    scopeType: "collectionItem",
+  },
+  "collectionItem.unenclosed.iteration": {
+    description:
+      "Iteration scope for items in a comma-separated list without enclosing delimiters",
+    scopeType: "collectionItem",
+    isIteration: true,
+  },
 
   "condition.if": {
     description: "A condition in an if statement",
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -85,6 +85,9 @@ const scopeSupportFacets = [
   "branch.ternary",
   "branch.loop",
 
+  "collectionItem.unenclosed",
+  "collectionItem.unenclosed.iteration",
+
   "condition.if",
   "condition.while",
   "condition.doWhile",
diff --git a/packages/cursorless-engine/src/languages/LegacyLanguageId.ts b/packages/cursorless-engine/src/languages/LegacyLanguageId.ts
@@ -9,7 +9,6 @@ export const legacyLanguageIds = [
   "latex",
   "markdown",
   "php",
-  "python",
   "ruby",
   "rust",
   "scala",
diff --git a/packages/cursorless-engine/src/languages/getNodeMatcher.ts b/packages/cursorless-engine/src/languages/getNodeMatcher.ts
@@ -14,7 +14,6 @@ import csharp from "./csharp";
 import latex from "./latex";
 import markdown from "./markdown";
 import php from "./php";
-import python from "./python";
 import { patternMatchers as ruby } from "./ruby";
 import rust from "./rust";
 import scala from "./scala";
@@ -54,7 +53,6 @@ export const languageMatchers: Record<
   latex,
   markdown,
   php,
-  python,
   ruby,
   rust,
   scala,
diff --git a/packages/cursorless-engine/src/languages/python.ts b/packages/cursorless-engine/src/languages/python.ts
diff --git a/queries/python.scm b/queries/python.scm
