tolerate invalid languages

scrollup · Oct 5, 2019 · df2cf16 · df2cf16
1 parent 5715499
commit df2cf16
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/modules/syntax.js b/modules/syntax.js
@@ -167,6 +167,10 @@ class Syntax extends Module {
         'Syntax module requires highlight.js. Please include the library on the page before Quill.',
       );
     }
+    this.languages = this.options.languages.reduce((memo, { key }) => {
+      memo[key] = true;
+      return memo;
+    }, {});
     this.highlightBlot = this.highlightBlot.bind(this);
     this.initListener();
     this.initTimer();
@@ -225,6 +229,7 @@ class Syntax extends Module {
   }
 
   highlightBlot(text, language = 'plain') {
+    language = this.languages[language] ? language : 'plain';
     if (language === 'plain') {
       return escapeText(text)
         .split('\n')

diff --git a/test/unit/modules/syntax.js b/test/unit/modules/syntax.js
@@ -116,6 +116,27 @@ describe('Syntax', function() {
       }, HIGHLIGHT_INTERVAL + 1);
     });
 
+    it('invalid language', function(done) {
+      this.quill.formatLine(0, 20, 'code-block', 'invalid');
+      setTimeout(() => {
+        expect(this.quill.root).toEqualHTML(`
+          <div class="ql-code-block-container" spellcheck="false">
+            <div class="ql-code-block" data-language="plain">var test = 1;</div>
+            <div class="ql-code-block" data-language="plain">var bugz = 0;</div>
+          </div>
+          <p><br></p>`);
+        expect(this.quill.getContents()).toEqual(
+          new Delta()
+            .insert('var test = 1;')
+            .insert('\n', { 'code-block': 'plain' })
+            .insert('var bugz = 0;')
+            .insert('\n', { 'code-block': 'plain' })
+            .insert('\n'),
+        );
+        done();
+      }, HIGHLIGHT_INTERVAL + 1);
+    });
+
     it('unformat first line', function(done) {
       this.quill.formatLine(0, 1, 'code-block', false);
       setTimeout(() => {