Fixes

Author: pokey

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue.yml

@@ -0,0 +1,27 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (x := 0) < 1:
+        pass
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: |-
+    if (x := ) < 1:
+        pass
+  selections:
+    - anchor: {line: 0, character: 9}
+      active: {line: 0, character: 9}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue2.yml

@@ -0,0 +1,29 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    match aaa:
+        case {"bbb": ccc}:
+            pass
+  selections:
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}
+  marks: {}
+finalState:
+  documentContents: |-
+    match aaa:
+        case {"bbb": }:
+            pass
+  selections:
+    - anchor: {line: 1, character: 17}
+      active: {line: 1, character: 17}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue4.yml

@@ -0,0 +1,27 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: chuck value
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    if (x := 0) < 1:
+        pass
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: |-
+    if (x ) < 1:
+        pass
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/chuckValue5.yml

@@ -0,0 +1,29 @@
+languageId: python
+command:
+  version: 6
+  spokenForm: chuck value
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    match aaa:
+        case {"bbb": ccc}:
+            pass
+  selections:
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}
+  marks: {}
+finalState:
+  documentContents: |-
+    match aaa:
+        case {"bbb"}:
+            pass
+  selections:
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}

queries/python.scm

@@ -27,10 +27,10 @@
   (with_statement)
 ] @statement
 
-;; a = 25
-;;     ^^
-;;   xxxx
-;; ------
+;;!! a = 25
+;;!      ^^
+;;!    xxxx
+;;!  ------
 (
   (assignment
     [
@@ -40,10 +40,10 @@
   ) @_.domain
 )
 
-;; a /= 25
-;;      ^^
-;;   xxxxx
-;; -------
+;;!! a /= 25
+;;!       ^^
+;;!    xxxxx
+;;!  -------
 (
   (augmented_assignment
     [
@@ -64,44 +64,46 @@
   ) @_.domain
 )
 
-;; d = {"a": 1234}
-;;           ^^^^
-;;         xxxxxx
-;;      ---------
+;;!! d = {"a": 1234}
+;;!            ^^^^
+;;!          xxxxxx
+;;!       ---------
 ;;
-;; {value: key for (key, value) in d1.items()}
-;;         ^^^
-;;       xxxxx
-;;  ----------
-(pair
-  ":" @_.leading
-  value: (_) @value
-) @_.domain
+;;!! {value: key for (key, value) in d1.items()}
+;;!          ^^^
+;;!        xxxxx
+;;!   ----------
+(
+  (_
+    [
+      ":"
+      ":="
+    ] @_.leading
+    value: (_) @value
+  ) @_.domain
+  (#not-type? @_.domain subscript parameters)
+)
 
-;; def func(value: str=""):
-;;                     ^^
-;;                    xxx
-;;          -------------
+;;!! def func(value: str=""):
+;;!                      ^^
+;;!                     xxx
+;;!           -------------
 (parameters
   (_
     "=" @_.leading
     value: (_) @value
   ) @_.domain
 )
 
-;; def func():
-;;     return 1
-;;            ^
-;;            x
-;;     --------
+;;!! return 1
+;;!         ^
+;;!  --------
 ;;
 ;; NOTE: in tree-sitter, both "return" and the "1" are children of `return_statement`
 ;; but "return" is anonymous whereas "1" is named node, so no need to exclude explicitly
-(
-  (return_statement
-    (_) @value
-  ) @_.domain
-)
+(return_statement
+  (_) @value
+) @_.domain
 
 (
   (function_definition