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

This new implementation allows us to do things like `"puff token"` to
insert spaces. `"float item"` to insert `, ` etc. A bit like
#2651.

This new implementation also fixed a few bugs around where the selection
and highlights ended up.

Note that there is still a bug with the range updater when you have an
empty selection, but that is out of scope for this pr.
#729

Fixes  #742


## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [/] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [/] I have not broken the cheatsheet

---------

Co-authored-by: Phil Cohen <[email protected]>

Author: AndreasArvidsson

changelog/2024-08-supportArbitraryInsertionDelimiterDrinkFloat.md

@@ -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.

data/fixtures/recorded/actions/insertEmptyLines/dropToken.yml

@@ -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

data/fixtures/recorded/actions/insertEmptyLines/floatThis.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis10.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis2.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis3.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis4.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis5.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis6.yml

@@ -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:

data/fixtures/recorded/actions/insertEmptyLines/floatThis7.yml

@@ -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: