Use positions and helpers

VSCodeVim · Jul 23, 2016 · 6b21500 · 6b21500
1 parent e914271
commit 6b21500
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -2418,9 +2418,17 @@ abstract class MoveQuoteMatch extends BaseMovement {
         failed: true
       };
     }
+
+    let startPos = new Position(position.line, start);
+    let endPos = new Position(position.line, end);
+    if (!this.includeSurrounding) {
+      startPos = startPos.getRight();
+      endPos = endPos.getLeft();
+    }
+
     return {
-      start: new Position(position.line, start + (this.includeSurrounding ? 0 : 1)),
-      stop: new Position(position.line, end + (this.includeSurrounding ? 0 : -1))
+      start: startPos,
+      stop: endPos
     };
   }