Small refactor: isValid does not need the editor, just the document

Author: J-Fields

src/common/motion/cursor.ts

@@ -1,4 +1,4 @@
-import { Position, Selection, TextDocument, TextEditor } from 'vscode';
+import { Position, Selection, TextDocument } from 'vscode';
 
 export class Cursor {
   public readonly start: Position;
@@ -20,8 +20,8 @@ export class Cursor {
     return new Cursor(sel.anchor, sel.active);
   }
 
-  public isValid(textEditor: TextEditor) {
-    return this.start.isValid(textEditor) && this.stop.isValid(textEditor);
+  public isValid(document: TextDocument) {
+    return this.start.isValid(document) && this.stop.isValid(document);
   }
 
   public equals(other: Cursor): boolean {

src/common/motion/position.ts

@@ -247,7 +247,7 @@ declare module 'vscode' {
      */
     obeyStartOfLine(document: vscode.TextDocument): Position;
 
-    isValid(textEditor: vscode.TextEditor): boolean;
+    isValid(document: vscode.TextDocument): boolean;
   }
 }
 
@@ -559,17 +559,13 @@ Position.prototype.obeyStartOfLine = function (
     : this;
 };
 
-Position.prototype.isValid = function (this: Position, textEditor: vscode.TextEditor): boolean {
+Position.prototype.isValid = function (this: Position, document: vscode.TextDocument): boolean {
   try {
-    // line
-    // TODO: this `|| 1` seems dubious...
-    const lineCount = TextEditor.getLineCount(textEditor) || 1;
-    if (this.line >= lineCount) {
+    if (this.line >= document.lineCount) {
       return false;
     }
 
-    // char
-    const charCount = TextEditor.getLineLength(this.line);
+    const charCount = document.lineAt(this.line).range.end.character;
     if (this.character > charCount + 1) {
       return false;
     }

src/state/vimState.ts

@@ -131,7 +131,7 @@ export class VimState implements vscode.Disposable {
     return this.cursor.start;
   }
   public set cursorStartPosition(value: Position) {
-    if (!value.isValid(this.editor)) {
+    if (!value.isValid(this.document)) {
       Logger.warn(`invalid cursor start position. ${value.toString()}.`);
     }
     this.cursor = this.cursor.withNewStart(value);
@@ -144,7 +144,7 @@ export class VimState implements vscode.Disposable {
     return this.cursor.stop;
   }
   public set cursorStopPosition(value: Position) {
-    if (!value.isValid(this.editor)) {
+    if (!value.isValid(this.document)) {
       Logger.warn(`invalid cursor stop position. ${value.toString()}.`);
     }
     this.cursor = this.cursor.withNewStop(value);
@@ -178,8 +178,8 @@ export class VimState implements vscode.Disposable {
 
     const map = new Map<string, Cursor>();
     for (const cursor of value) {
-      if (!cursor.isValid(this.editor)) {
-        Logger.warn(`invalid cursor position. ${cursor.toString()}.`);
+      if (!cursor.isValid(this.document)) {
+        Logger.warn(`Invalid cursor position: ${cursor.toString()}`);
       }
 
       // use a map to ensure no two cursors are at the same location.