Skip to content

Support value for typescript destruct pattern #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 5, 2023
Merged

Support value for typescript destruct pattern #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a19d90
Support value for typescript destruct pattern
AndreasArvidsson Dec 5, 2023
4b8fc5a
rename file
AndreasArvidsson Dec 5, 2023
4e524ea
rename test
AndreasArvidsson Dec 5, 2023
12b6aaf
Added delimiters
AndreasArvidsson Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions ...s/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/changeValue5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
languageId: typescript
command:
version: 6
spokenForm: change value
action:
name: clearAndSetSelection
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: value}
usePrePhraseSnapshot: true
initialState:
documentContents: |
const { aaa: bbb } = ccc;
selections:
- anchor: {line: 0, character: 8}
active: {line: 0, character: 8}
marks: {}
finalState:
documentContents: |
const { aaa: } = ccc;
selections:
- anchor: {line: 0, character: 13}
active: {line: 0, character: 13}
23 changes: 23 additions & 0 deletions ...ages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckKey2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
languageId: typescript
command:
version: 6
spokenForm: chuck key
action:
name: remove
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: collectionKey}
usePrePhraseSnapshot: true
initialState:
documentContents: "const { aaa: bbb } = ccc;"
selections:
- anchor: {line: 0, character: 9}
active: {line: 0, character: 9}
marks: {}
finalState:
documentContents: const { bbb } = ccc;
selections:
- anchor: {line: 0, character: 8}
active: {line: 0, character: 8}
23 changes: 23 additions & 0 deletions ...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/chuckValue4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
languageId: typescript
command:
version: 6
spokenForm: chuck value
action:
name: remove
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: value}
usePrePhraseSnapshot: true
initialState:
documentContents: "const { aaa: bbb } = ccc;"
selections:
- anchor: {line: 0, character: 9}
active: {line: 0, character: 9}
marks: {}
finalState:
documentContents: const { aaa } = ccc;
selections:
- anchor: {line: 0, character: 9}
active: {line: 0, character: 9}
8 changes: 8 additions & 0 deletions queries/javascript.core.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,14 @@
"}" @collectionKey.iteration.end.startOf @value.iteration.end.startOf
)

;;!! const { aaa: bbb } = ccc;
;;! ^^^
;;! --------
(pair_pattern
key: (_) @collectionKey @collectionKey.trailing.start.endOf @value.leading.start.endOf
value: (_) @value @collectionKey.trailing.end.startOf @value.leading.end.startOf
) @_.domain

;;!! "string"
;;!! `string`
;;! ^^^^^^^^
Expand Down