Markdown: Split up render function into toHTML/toPlaintext

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>

src/Markdown.js

@@ -23,7 +23,9 @@ import commonmark from 'commonmark';
  */
 export default class Markdown {
     constructor(input) {
-        this.input = input
+        this.input = input;
+        this.parser = new commonmark.Parser();
+        this.renderer = new commonmark.HtmlRenderer({safe: false});
     }
 
     isPlainText() {
@@ -57,13 +59,10 @@ export default class Markdown {
         return is_plain;
     }
 
-    render(html) {
+    toHTML(html) {
-        const parser = new commonmark.Parser();
+        const real_paragraph = this.renderer.paragraph;
 
-        const renderer = new commonmark.HtmlRenderer({safe: true});
+        this.renderer.paragraph = function(node, entering) {
-        const real_paragraph = renderer.paragraph;
-        if (html) {
-            renderer.paragraph = function(node, entering) {
             // If there is only one top level node, just return the
             // bare text: it's a single line of text and so should be
             // 'inline', rather than unnecessarily wrapped in its own
@@ -77,15 +76,27 @@ export default class Markdown {
                 real_paragraph.call(this, node, entering);
             }
         }
-        } else {
+
+        var parsed = this.parser.parse(this.input);
+        var rendered = this.renderer.render(parsed);
+
+        this.renderer.paragraph = real_paragraph;
+
+        return rendered;
+    }
+
+    toPlaintext() {
+        const real_paragraph = this.renderer.paragraph;
+
         // The default `out` function only sends the input through an XML
         // escaping function, which causes messages to be entity encoded,
         // which we don't want in this case.
-            renderer.out = function(s) {
+        this.renderer.out = function(s) {
+            // The `lit` function adds a string literal to the output buffer.
             this.lit(s);
         }
 
-            renderer.paragraph = function(node, entering) {
+        this.renderer.paragraph = function(node, entering) {
             // If there is only one top level node, just return the
             // bare text: it's a single line of text and so should be
             // 'inline', rather than unnecessarily wrapped in its own
@@ -102,9 +113,12 @@ export default class Markdown {
                 }
             }
         }
-        }
 
-        var parsed = parser.parse(this.input);
+        var parsed = this.parser.parse(this.input);
-        return renderer.render(parsed);
+        var rendered = this.renderer.render(parsed);
+
+        this.renderer.paragraph = real_paragraph;
+
+        return rendered;
     }
 }

src/components/views/rooms/MessageComposerInput.js

@@ -401,7 +401,7 @@ export default class MessageComposerInput extends React.Component {
         let contentState = null;
         if (enabled) {
             const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
-            contentState = RichText.HTMLtoContentState(md.render(true));
+            contentState = RichText.HTMLtoContentState(md.toHTML());
         } else {
             let markdown = stateToMarkdown(this.state.editorState.getCurrentContent());
             if (markdown[markdown.length - 1] === '\n') {
@@ -524,9 +524,9 @@ export default class MessageComposerInput extends React.Component {
         } else {
             const md = new Markdown(contentText);
             if (md.isPlainText()) {
-                contentText = md.render(false);
+                contentText = md.toPlaintext();
             } else {
-                contentHTML = md.render(true);
+                contentHTML = md.toHTML(true);
             }
         }
 

src/components/views/rooms/MessageComposerInputOld.js

@@ -325,13 +325,13 @@ module.exports = React.createClass({
         }
 
         if (send_markdown) {
-            const htmlText = mdown.render(true);
+            const htmlText = mdown.toHTML();
             sendMessagePromise = isEmote ?
                 MatrixClientPeg.get().sendHtmlEmote(this.props.room.roomId, contentText, htmlText) :
                 MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText);
         }
         else {
-            const contentText = mdown.render(false);
+            const contentText = mdown.toPlaintext(false);
             sendMessagePromise = isEmote ?
                 MatrixClientPeg.get().sendEmoteMessage(this.props.room.roomId, contentText) :
                 MatrixClientPeg.get().sendTextMessage(this.props.room.roomId, contentText);