Get rid of Position.getLineEndIncludingEOL

The TODO was right, as far as I can tell

Author: J-Fields

src/actions/plugins/replaceWithRegister.ts

@@ -25,7 +25,7 @@ class ReplaceOperator extends BaseOperator {
   public async run(vimState: VimState, start: Position, end: Position): Promise<void> {
     const range =
       vimState.currentRegisterMode === RegisterMode.LineWise
-        ? new Range(start.getLineBegin(), end.getLineEndIncludingEOL())
+        ? new Range(start.getLineBegin(), end.getLineEnd())
         : new Range(start, end.getRight());
 
     const register = await Register.get(vimState.recordedState.registerName, this.multicursorIndex);

src/cmd_line/commands/delete.ts

@@ -52,7 +52,7 @@ export class DeleteCommand extends ExCommand {
    */
   private deleteRange(startLine: number, endLine: number, vimState: VimState): void {
     let start = new Position(startLine, 0);
-    let end = new Position(endLine, 0).getLineEndIncludingEOL();
+    let end = new Position(endLine, 0).getLineEnd();
 
     if (endLine < vimState.document.lineCount - 1) {
       end = end.getRightThroughLineBreaks();
@@ -69,7 +69,7 @@ export class DeleteCommand extends ExCommand {
 
     vimState.recordedState.transformer.addTransformation({
       type: 'deleteRange',
-      range: new vscode.Range(start, end),
+      range,
       manuallySetCursorPositions: true,
     });
     vimState.cursorStopPosition = start.getLineBegin();

src/cmd_line/commands/move.ts

@@ -69,7 +69,7 @@ export class MoveCommand extends ExCommand {
     }
     // delete
     let start = new Position(sourceStart, 0);
-    let end = new Position(sourceEnd, 0).getLineEndIncludingEOL();
+    let end = new Position(sourceEnd, 0).getLineEnd();
 
     if (sourceEnd < vimState.document.lineCount - 1) {
       end = end.getRightThroughLineBreaks();

src/common/motion/position.ts

@@ -211,11 +211,6 @@ declare module 'vscode' {
      */
     getLineEnd(): Position;
 
-    /**
-     * @returns a new Position at the end of this Position's line, including the invisible newline character.
-     */
-    getLineEndIncludingEOL(): Position;
-
     /**
      * @returns a new Position one to the left if this Position is on the EOL. Otherwise, returns this position.
      */
@@ -482,14 +477,6 @@ Position.prototype.getLineEnd = function (this: Position): Position {
   return new Position(this.line, TextEditor.getLineLength(this.line));
 };
 
-/**
- * @returns a new Position at the end of this Position's line, including the invisible newline character.
- */
-Position.prototype.getLineEndIncludingEOL = function (this: Position): Position {
-  // TODO: isn't this one too far?
-  return new Position(this.line, TextEditor.getLineLength(this.line) + 1);
-};
-
 /**
  * @returns a new Position one to the left if this Position is on the EOL. Otherwise, returns this position.
  */

src/mode/modeHandler.ts

@@ -1558,7 +1558,7 @@ export class ModeHandler implements vscode.Disposable, IModeHandler {
         for (const { stop: cursorStop } of this.vimState.cursors) {
           if (cursorStop.isLineEnd(this.vimState.document)) {
             iModeVirtualCharDecorationOptions.push({
-              range: new vscode.Range(cursorStop, cursorStop.getLineEndIncludingEOL()),
+              range: new vscode.Range(cursorStop, cursorStop.getLineEnd()),
               renderOptions: eolRenderOptions,
             });
           } else {

test/cmd_line/delete.test.ts

@@ -0,0 +1,24 @@
+import { newTest } from '../testSimplifier';
+
+suite(':d[elete]', () => {
+  newTest({
+    title: ':d',
+    start: ['line 1', 'li|ne 2', 'line 3'],
+    keysPressed: ':d' + '\n',
+    end: ['line 1', '|line 3'],
+  });
+
+  newTest({
+    title: ':2,3d',
+    start: ['line 1', 'li|ne 2', 'line 3'],
+    keysPressed: ':2,3d' + '\n',
+    end: ['|line 1'],
+  });
+
+  newTest({
+    title: ':d 2',
+    start: ['line 1', 'li|ne 2', 'line 3'],
+    keysPressed: ':d 2' + '\n',
+    end: ['|line 1'],
+  });
+});