fix bug where copied syntax block is off by 1 char

bbigelow · Aug 10, 2018 · e5b543e · e5b543e
1 parent 6577825
commit e5b543e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/formats/code.js b/formats/code.js
@@ -2,7 +2,7 @@ import Block from '../blots/block';
 import Break from '../blots/break';
 import Cursor from '../blots/cursor';
 import Inline from '../blots/inline';
-import TextBlot from '../blots/text';
+import TextBlot, { escapeText } from '../blots/text';
 import Container from '../blots/container';
 import Quill from '../core/quill';
 
@@ -14,8 +14,13 @@ class CodeBlockContainer extends Container {
   }
 
   html(index, length) {
-    const html = this.domNode.innerText.slice(index, index + length);
-    return `<pre>${html}</pre>`;
+    let text = this.domNode.innerText;
+    // TODO find more robust solution for <select> turning into \n
+    if (text.startsWith('\n')) {
+      text = text.slice(1);
+    }
+    text = text.slice(index, index + length);
+    return `<pre>${escapeText(text)}</pre>`;
   }
 }
 

diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
@@ -622,5 +622,11 @@ describe('Editor', function() {
       editor.insertText(0, '<b>Test</b>');
       expect(editor.getHTML(0, 11)).toEqual('&lt;b&gt;Test&lt;/b&gt;');
     });
+
+    it('multiline code', function() {
+      const editor = this.initialize(Editor, '<p>0123</p><p>4567</p>');
+      editor.formatLine(0, 9, { 'code-block': 'javascript' });
+      expect(editor.getHTML(0, 9)).toEqual('<pre>0123\n4567</pre>');
+    });
   });
 });