In typescript short hand property can be treated as key item or value (…

…#381) Co-authored-by: Pokey Rule <pokey.rule@gmail.com>
cursorless-dev · Jan 5, 2022 · 78aceac · 78aceac
1 parent 14749f4
commit 78aceac
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/src/languages/typescript.ts b/src/languages/typescript.ts
@@ -129,7 +129,7 @@ function typeMatcher(): NodeMatcher {
 }
 
 function valueMatcher() {
-  const pFinder = patternFinder("assignment_expression[right]", "*[value]");
+  const pFinder = patternFinder("assignment_expression[right]", "*[value]", "shorthand_property_identifier");
   return matcher(
     (node: SyntaxNode) =>
       node.type === "jsx_attribute" ? node.lastChild : pFinder(node),
@@ -145,7 +145,7 @@ const nodeMatchers: Partial<Record<ScopeType, NodeMatcherAlternative>> = {
   list: listTypes,
   string: ["string", "template_string"],
   collectionKey: trailingMatcher(
-    ["pair[key]", "jsx_attribute.property_identifier!"],
+    ["pair[key]", "jsx_attribute.property_identifier!", "shorthand_property_identifier"],
     [":"]
   ),
   collectionItem: argumentMatcher(...mapTypes, ...listTypes),

diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryKey2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every key
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}
+initialState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 7}
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 7}
+  thatMark:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 7}
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 7}
+fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: collectionKey, includeSiblings: true}}]
diff --git a/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml b/src/test/suite/fixtures/recorded/languages/typescript/takeEveryValue2.yml
@@ -0,0 +1,35 @@
+languageId: typescript
+command:
+  version: 1
+  spokenForm: take every value
+  action: setSelection
+  targets:
+    - type: primitive
+      modifier: {type: containingScope, scopeType: value, includeSiblings: true}
+initialState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
+  marks: {}
+finalState:
+  documentContents: |-
+    {
+        foo: "hello",
+        bar,
+    }
+  selections:
+    - anchor: {line: 1, character: 9}
+      active: {line: 1, character: 16}
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 7}
+  thatMark:
+    - anchor: {line: 1, character: 9}
+      active: {line: 1, character: 16}
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 7}
+fullTargets: [{type: primitive, mark: {type: cursor}, selectionType: token, position: contents, insideOutsideType: inside, modifier: {type: containingScope, scopeType: value, includeSiblings: true}}]