Skip to content

Support arbitrary scope and insertion delimiter for drop, float and puff #2646

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
phillco merged 7 commits into from
Aug 11, 2024
Merged

Support arbitrary scope and insertion delimiter for drop, float and puff #2646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ad4a11
Support arbitrary scope and insertion delimiter for drop, float and puff
AndreasArvidsson Aug 7, 2024
65cd699
Added token tests
AndreasArvidsson Aug 7, 2024
2a28176
Added changelog
AndreasArvidsson Aug 11, 2024
b1605e8
rename file
AndreasArvidsson Aug 11, 2024
794dd26
Update packages/cursorless-engine/src/actions/InsertEmptyLines.ts
AndreasArvidsson Aug 11, 2024
ee1453b
Update changelog/2024-08-supportArbitraryInsertionDelimiterDrinkFloat.md
AndreasArvidsson Aug 11, 2024
240e653
Update 2024-08-supportArbitraryInsertionDelimiterDrinkFloat.md
phillco Aug 11, 2024
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
6 changes: 6 additions & 0 deletions changelog/2024-08-supportArbitraryInsertionDelimiterDrinkFloat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
tags: [enhancement]
pullRequest: 2646
---

`drop`, `float` and `puff` now behave like `drink` and `pour` for non-line targets: for example, `"puff token"` will insert spaces around the token; `"float item"` will insert `,`s as needed, and so on.
30 changes: 30 additions & 0 deletions data/fixtures/recorded/actions/insertEmptyLines/dropToken.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
languageId: plaintext
command:
version: 7
spokenForm: drop token
action:
name: insertEmptyLineBefore
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: token}
usePrePhraseSnapshot: true
initialState:
documentContents: foo
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
marks: {}
finalState:
documentContents: " foo"
selections:
- anchor: {line: 0, character: 1}
active: {line: 0, character: 1}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 0, character: 1}
end: {line: 0, character: 4}
isReversed: false
hasExplicitRange: true
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ finalState:
documentContents: |+

selections:
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 1, character: 0}
end: {line: 1, character: 0}
start: {line: 0, character: 0}
end: {line: 0, character: 0}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ finalState:

hello
selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 9}
active: {line: 1, character: 9}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 9}
end: {line: 1, character: 9}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ finalState:
documentContents: |
hello
selections:
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
- anchor: {line: 0, character: 5}
active: {line: 0, character: 5}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 1, character: 0}
end: {line: 1, character: 0}
start: {line: 0, character: 5}
end: {line: 0, character: 5}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ finalState:
documentContents: |2
hello
selections:
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
- anchor: {line: 0, character: 9}
active: {line: 0, character: 9}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 1, character: 0}
end: {line: 1, character: 0}
start: {line: 0, character: 9}
end: {line: 0, character: 9}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ finalState:
documentContents: |2

selections:
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
- anchor: {line: 0, character: 4}
active: {line: 0, character: 4}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 1, character: 0}
end: {line: 1, character: 0}
start: {line: 0, character: 4}
end: {line: 0, character: 4}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ finalState:
whatever
hello
selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 9}
active: {line: 1, character: 9}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 9}
end: {line: 1, character: 9}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ finalState:
whatever
hello
selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 5}
active: {line: 1, character: 5}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 5}
end: {line: 1, character: 5}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ finalState:
hello

selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 0}
end: {line: 1, character: 0}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ finalState:
hello

selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 0}
end: {line: 1, character: 0}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
8 changes: 4 additions & 4 deletions data/fixtures/recorded/actions/insertEmptyLines/floatThis9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ finalState:
hello

selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 4}
active: {line: 1, character: 4}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 4}
end: {line: 1, character: 4}
isReversed: false
hasExplicitRange: true
ide:
Expand Down
30 changes: 30 additions & 0 deletions data/fixtures/recorded/actions/insertEmptyLines/floatToken.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
languageId: plaintext
command:
version: 7
spokenForm: float token
action:
name: insertEmptyLineAfter
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: token}
usePrePhraseSnapshot: true
initialState:
documentContents: foo
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
marks: {}
finalState:
documentContents: "foo "
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 0, character: 0}
end: {line: 0, character: 3}
isReversed: false
hasExplicitRange: true
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ finalState:


selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 0, character: 0}
end: {line: 0, character: 0}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 1, end: 1}
range: {type: line, start: 0, end: 0}
- style: justAdded
range: {type: line, start: 1, end: 1}
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ finalState:


selections:
- anchor: {line: 3, character: 0}
active: {line: 3, character: 0}
- anchor: {line: 2, character: 4}
active: {line: 2, character: 4}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 3, character: 0}
end: {line: 3, character: 0}
start: {line: 2, character: 4}
end: {line: 2, character: 4}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 1, end: 1}
- style: justAdded
range: {type: line, start: 2, end: 2}
range: {type: line, start: 3, end: 3}
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ finalState:

hello
selections:
- anchor: {line: 3, character: 0}
active: {line: 3, character: 0}
- anchor: {line: 2, character: 9}
active: {line: 2, character: 9}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 3, character: 0}
end: {line: 3, character: 0}
start: {line: 2, character: 9}
end: {line: 2, character: 9}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 1, end: 1}
- style: justAdded
range: {type: line, start: 2, end: 2}
range: {type: line, start: 3, end: 3}
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis19.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ finalState:


selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 0}
end: {line: 1, character: 0}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 1, end: 1}
- style: justAdded
range: {type: line, start: 3, end: 3}
range: {type: line, start: 2, end: 2}
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ finalState:

hello
selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 5}
active: {line: 1, character: 5}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 5}
end: {line: 1, character: 5}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 0, end: 0}
- style: justAdded
range: {type: line, start: 1, end: 1}
range: {type: line, start: 2, end: 2}
10 changes: 5 additions & 5 deletions data/fixtures/recorded/actions/insertEmptyLines/puffThis20.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ finalState:

there
selections:
- anchor: {line: 2, character: 0}
active: {line: 2, character: 0}
- anchor: {line: 1, character: 0}
active: {line: 1, character: 0}
thatMark:
- type: UntypedTarget
contentRange:
start: {line: 2, character: 0}
end: {line: 2, character: 0}
start: {line: 1, character: 0}
end: {line: 1, character: 0}
isReversed: false
hasExplicitRange: true
ide:
flashes:
- style: justAdded
range: {type: line, start: 1, end: 1}
- style: justAdded
range: {type: line, start: 3, end: 3}
range: {type: line, start: 2, end: 2}
Loading