From 7d84083f557e1cfd6ac04cc9c8c510afb3fdf036 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 3 Feb 2020 06:43:20 -0800
Subject: [PATCH] Fix algorithm to move the right amount of cells

---
 src/browser/input/MoveToCell.test.ts | 24 ++++++++++++++++--------
 src/browser/input/MoveToCell.ts      | 14 ++++++++------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/browser/input/MoveToCell.test.ts b/src/browser/input/MoveToCell.test.ts
index 735697d9..5753ea46 100644
--- a/src/browser/input/MoveToCell.test.ts
+++ b/src/browser/input/MoveToCell.test.ts
@@ -15,6 +15,9 @@ describe('MoveToCell', () => {
     bufferService = new MockBufferService(5, 5);
     bufferService.buffer.x = 3;
     bufferService.buffer.y = 3;
+    // Lines 2-4 are wrapped
+    bufferService.buffer.lines.get(3)!.isWrapped = true;
+    bufferService.buffer.lines.get(4)!.isWrapped = true;
   });
 
   describe('normal buffer', () => {
@@ -22,16 +25,21 @@ describe('MoveToCell', () => {
       assert.equal(moveToCellSequence(2, 3, bufferService, false), '\x1b[D');
       assert.equal(moveToCellSequence(4, 3, bufferService, false), '\x1b[C');
     });
-    it('should ignore the Y value', () => {
-      assert.equal(moveToCellSequence(1, 1, bufferService, false), '\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D');
-      assert.equal(moveToCellSequence(1, 2, bufferService, false), '\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D');
-      assert.equal(moveToCellSequence(1, 3, bufferService, false), '\u001b[D\u001b[D');
-      assert.equal(moveToCellSequence(1, 4, bufferService, false), '\u001b[C\u001b[C\u001b[C');
-      assert.equal(moveToCellSequence(1, 5, bufferService, false), '\u001b[C\u001b[C\u001b[C');
+    it('should wrap around entire row instead of doing up and down when the Y value differs', () => {
+      assert.equal(moveToCellSequence(2, 2, bufferService, false), '\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D');
+      assert.equal(moveToCellSequence(4, 4, bufferService, false), '\x1b[C\x1b[C\x1b[C');
+    });
+    it('should wrap across 2+ rows', () => {
+      bufferService.buffer.y = 2;
+      assert.equal(moveToCellSequence(3, 4, bufferService, false), '\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D', '(3,2) to (3,4) = 10 cells');
+    });
+    it('should not move the cursor beyond the current wrapped row', () => {
+      assert.equal(moveToCellSequence(1, 1, bufferService, false), '\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D');
+      assert.equal(moveToCellSequence(1, 5, bufferService, false), '\x1b[C\x1b[C\x1b[C');
     });
     it('should use the correct character for application cursor', () => {
-      assert.equal(moveToCellSequence(2, 1, bufferService, false), '\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D');
-      assert.equal(moveToCellSequence(2, 1, bufferService, true), '\u001bOD\u001bOD\u001bOD\u001bOD\u001bOD\u001bOD');
+      assert.equal(moveToCellSequence(2, 1, bufferService, false), '\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D\x1b[D');
+      assert.equal(moveToCellSequence(2, 1, bufferService, true), '\x1bOD\x1bOD\x1bOD\x1bOD\x1bOD\x1bOD');
     });
   });
 
diff --git a/src/browser/input/MoveToCell.ts b/src/browser/input/MoveToCell.ts
index e3b2555a..1113f957 100644
--- a/src/browser/input/MoveToCell.ts
+++ b/src/browser/input/MoveToCell.ts
@@ -35,24 +35,26 @@ export function moveToCellSequence(targetX: number, targetY: number, bufferServi
     direction = startX > targetX ? Direction.LEFT : Direction.RIGHT;
     return repeat(Math.abs(startX - targetX), sequence(direction, applicationCursor));
   }
-    direction = startY > targetY ? Direction.LEFT : Direction.RIGHT;
-    return repeat(colsFromRowEnd(startY > targetY ? targetX : startX, bufferService), sequence(direction, applicationCursor))
-    + repeat((Math.abs(startY - targetY) - 1 ) * bufferService.cols, sequence(direction, applicationCursor))
-    + repeat(colsFromRowBeginning(startY > targetY ? startX : targetX, bufferService), sequence(direction, applicationCursor));
+  direction = startY > targetY ? Direction.LEFT : Direction.RIGHT;
+  const rowDifference = Math.abs(startY - targetY);
+  const cellsToMove = colsFromRowEnd(startY > targetY ? targetX : startX, bufferService) +
+    (rowDifference - 1) * bufferService.cols + 1/*wrap around 1 row*/ +
+    colsFromRowBeginning(startY > targetY ? startX : targetX, bufferService);
+  return repeat(cellsToMove, sequence(direction, applicationCursor));
 }
 
 /**
  * Find the number of cols from a row beginning to a col.
  */
 function colsFromRowBeginning(currX: number, bufferService: IBufferService): number {
-  return Math.abs(currX);
+  return currX - 1;
 }
 
 /**
  * Find the number of cols from a col to row end.
  */
 function colsFromRowEnd(currX: number, bufferService: IBufferService): number {
-  return Math.abs(bufferService.cols - currX);
+  return bufferService.cols - currX;
 }
 
 /**