Migrate python scopes map/list (#1874)

## 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
- [x] I have executed all existing tests (Extension tests - 6277
passing)
- [x] I have tested the `visualize list` and `visualize map` commands

visualize list:


![image](https://github.com/cursorless-dev/cursorless/assets/387346/9e160f0d-2af7-4d75-a611-7ae54518fbaf)

visualize map:


![image](https://github.com/cursorless-dev/cursorless/assets/387346/cf4dc273-2ec7-4be8-a0ab-e291ff6e9450)

---------

Co-authored-by: Cedric Halbronn <[email protected]>
Co-authored-by: Pokey Rule <[email protected]>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: Andreas Arvidsson <[email protected]>

Author: 5 people

data/playground/python/maps_and_lists.py

@@ -0,0 +1,34 @@
+import sys
+
+one = 1
+
+
+def mapsAndLists():
+    # immutable can serve as dictionary keys
+    key1 = "a"
+    key2 = False
+    key3 = 1.5
+
+    # Python "tuple" is "pair"/"round" scope
+    _ = (1, 2, 3)
+
+    # Python "list" is "list" scope
+    _ = [1, 2, 3]
+    _ = [sys.path[0], sys.path[1]]
+    fruits = ["apple", "banana", "cherry", "kiwi", "mango"]
+    _ = [x for x in fruits if "a" in x]
+
+    # Python "set" is "list" scope
+    _ = {1, 2, 3}
+
+    # Python "dictionary" is "map" scope
+    d1 = {"a": 1, "b": 2, "c": 3}
+    _ = {key1: 1, key2: 2, key3: 3}
+    _ = {value: key for (key, value) in d1.items()}
+
+    # complex ones
+    _ = [[1, 2, 3], 4, 5, 6]
+    _ = [[1, 2, 3], {1, 2, 3}, {"a": 1, "b": 2, "c": 3}]
+    _ = {{"a": 1, "b": 2, "c": 3}: 1, d1: 2}
+    _ = {{1, 2, 3}: 1, {2, 3, 4}: 2}
+    _ = ({1, 2, 3}, {1, 2, 3}, {1, 2, 3})

packages/cursorless-engine/src/languages/python.ts

@@ -23,9 +23,6 @@ import { ternaryBranchMatcher } from "./ternaryBranchMatcher";
 export const getTypeNode = (node: SyntaxNode) =>
   node.children.find((child) => child.type === "type") ?? null;
 
-const dictionaryTypes = ["dictionary", "dictionary_comprehension"];
-const listTypes = ["list", "list_comprehension", "set"];
-
 function itemNodeFinder(
   parentType: string,
   childType: string,
@@ -48,8 +45,6 @@ function itemNodeFinder(
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
-  map: dictionaryTypes,
-  list: listTypes,
   string: "string",
   collectionItem: cascadingMatcher(
     matcher(

queries/python.scm

@@ -27,6 +27,17 @@
   (with_statement)
 ] @statement
 
+[
+  (dictionary)
+  (dictionary_comprehension)
+] @map
+
+[
+  (list)
+  (list_comprehension)
+  (set)
+] @list
+
 (
   (function_definition
     name: (_) @functionName