From db488ebcc9699ef97c21bd6695f0983006947dfd Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 31 Dec 2018 10:18:31 -0800
Subject: [PATCH] Reflow combined chars

---
 src/Buffer.test.ts | 15 +++++++++++++++
 src/BufferLine.ts  |  9 +++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index faed1808..4c348ec6 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -377,6 +377,21 @@ describe('Buffer', () => {
           assert.equal(buffer.lines.get(i).translateToString(), '          ');
         }
       });
+      it('should transfer combined char data over to reflowed lines', () => {
+        buffer.fillViewportRows();
+        buffer.resize(4, 2);
+        const firstLine = buffer.lines.get(0);
+        firstLine.set(0, [ null, 'a', 1, 'a'.charCodeAt(0) ]);
+        firstLine.set(1, [ null, 'b', 1, 'b'.charCodeAt(0) ]);
+        firstLine.set(2, [ null, 'c', 1, 'c'.charCodeAt(0) ]);
+        firstLine.set(3, [ null, '😁', 1, '😁'.charCodeAt(0) ]);
+        assert.equal(buffer.lines.length, 2);
+        assert.equal(buffer.lines.get(0).translateToString(), 'abc😁');
+        assert.equal(buffer.lines.get(1).translateToString(), '    ');
+        buffer.resize(2, 2);
+        assert.equal(buffer.lines.get(0).translateToString(), 'ab');
+        assert.equal(buffer.lines.get(1).translateToString(), 'c😁');
+      });
     });
   });
 
diff --git a/src/BufferLine.ts b/src/BufferLine.ts
index fd28af84..619fa9ca 100644
--- a/src/BufferLine.ts
+++ b/src/BufferLine.ts
@@ -319,6 +319,15 @@ export class BufferLine implements IBufferLine {
         }
       }
     }
+
+    // Move any combined data over as needed
+    const srcCombinedKeys = Object.keys(src._combined);
+    for (let i = 0; i < srcCombinedKeys.length; i++) {
+      const key = parseInt(srcCombinedKeys[i], 10);
+      if (key >= srcCol) {
+        this._combined[key - srcCol + destCol] = src._combined[key];
+      }
+    }
   }
 
   public translateToString(trimRight: boolean = false, startCol: number = 0, endCol: number = this.length): string {