Added test

cursorless-dev · Nov 19, 2023 · a37c7b0 · a37c7b0
1 parent 719a76c
commit a37c7b0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/packages/cursorless-engine/src/actions/JoinLines.ts b/packages/cursorless-engine/src/actions/JoinLines.ts
@@ -58,7 +58,7 @@ function getEdits(editor: TextEditor, contentRanges: Range[]): Edit[] {
           nextLine.range.start.line,
           nextLine.firstNonWhitespaceCharacterIndex,
         ),
-        text: " ",
+        text: nextLine.isEmptyOrWhitespace ? "" : " ",
         isReplace: true,
       });
 

diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/joinLineThis.yml b/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/joinLineThis.yml
@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: join this
+  action:
+    name: joinLines
+    target:
+      type: primitive
+      mark: {type: cursor}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    aaa
+
+    bbb
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa
+    bbb
+  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