Fixed bug with array in pair value (#241)

cursorless-dev · Aug 16, 2021 · 0e67a27 · 0e67a27
1 parent 7a10719
commit 0e67a27
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 6 deletions.
diff --git a/src/languages/python.ts b/src/languages/python.ts
@@ -63,7 +63,7 @@ const nodeMatchers: Partial<Record<ScopeType, NodeMatcherAlternative>> = {
     "*[name]",
   ],
   collectionItem: argumentMatcher(...dictionaryTypes, ...listTypes),
-  value: valueMatcher("assignment[right]", "*[value]"),
+  value: valueMatcher("assignment[right]", "pair[value].*", "*[value]"),
   argumentOrParameter: argumentMatcher("parameters", "argument_list"),
 };
 

diff --git a/src/nodeSelectors.ts b/src/nodeSelectors.ts
@@ -40,12 +40,12 @@ export function selectWithLeadingDelimiter(
   editor: TextEditor,
   node: SyntaxNode
 ): SelectionWithContext {
-  const leadingDelimiterToken = node.previousSibling!;
+  const leadingDelimiterToken = node.previousSibling;
 
-  const leadingDelimiterRange = makeRange(
-    leadingDelimiterToken.startPosition,
-    node.startPosition
-  );
+  const leadingDelimiterRange =
+    leadingDelimiterToken != null
+      ? makeRange(leadingDelimiterToken.startPosition, node.startPosition)
+      : null;
 
   return {
     ...simpleSelectionExtractor(editor, node),

diff --git a/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml b/src/test/suite/fixtures/recorded/languages/python/takeValueZero.yml
@@ -0,0 +1,33 @@
+spokenForm: take value zero
+languageId: python
+command:
+  actionName: setSelection
+  partialTargets:
+    - type: primitive
+      modifier: {type: containingScope, scopeType: value, includeSiblings: false}
+      mark: {type: decoratedSymbol, symbolColor: default, character: '0'}
+  extraArgs: []
+marks:
+  default.0:
+    start: {line: 1, character: 15}
+    end: {line: 1, character: 16}
+initialState:
+  documentContents: |-
+    {
+        "foo": bar[0]
+    }
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+finalState:
+  documentContents: |-
+    {
+        "foo": bar[0]
+    }
+  selections:
+    - anchor: {line: 1, character: 11}
+      active: {line: 1, character: 17}
+  thatMark:
+    - anchor: {line: 1, character: 11}
+      active: {line: 1, character: 17}
+fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: '0'}, selectionType: token, position: contents, modifier: {type: containingScope, scopeType: value, includeSiblings: false}, insideOutsideType: inside}]