Add support for MD strikethrough and tables

DanClowry · Nov 30, 2019 · 28e6367 · 28e6367
1 parent 7e41aa8
commit 28e6367
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/com/danclowry/noteapp/controllers/EditorController.java b/src/main/java/com/danclowry/noteapp/controllers/EditorController.java
@@ -6,6 +6,11 @@
 import com.danclowry.noteapp.models.Note;
 import com.danclowry.noteapp.util.AlertBuilder;
 import com.danclowry.noteapp.util.LoadFXML;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.data.DataSet;
+import com.vladsch.flexmark.util.data.MutableDataSet;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -20,6 +25,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.Arrays;
 
 public class EditorController {
     @FXML
@@ -48,7 +54,9 @@ public class EditorController {
     private int currentIndex;
 
     public void initialize() {
-        MarkdownParser mdParser = new MarkdownParser();
+        DataSet parseOptions = new MutableDataSet().set(Parser.EXTENSIONS,
+                Arrays.asList(StrikethroughExtension.create(), TablesExtension.create()));
+        MarkdownParser mdParser = new MarkdownParser(parseOptions);
 
         markdownViewer.getEngine().setUserStyleSheetLocation(getClass().getResource("/css/md-viewer.css").toString());
 

diff --git a/src/main/java/com/danclowry/noteapp/markdown/MarkdownParser.java b/src/main/java/com/danclowry/noteapp/markdown/MarkdownParser.java
@@ -2,14 +2,27 @@
 
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.ast.Node;
+import com.vladsch.flexmark.util.data.DataHolder;
+import com.vladsch.flexmark.util.data.MutableDataHolder;
+import com.vladsch.flexmark.util.data.MutableDataSet;
 
 public class MarkdownParser {
 
-    private Parser parser = Parser.builder().build();
-    private HtmlRenderer renderer = HtmlRenderer.builder().build();
+    private final MutableDataHolder options = new MutableDataSet();
+    private Parser parser;
+    private HtmlRenderer renderer;
     private String htmlTemplate = "<!DOCTYPE html><body>PLACEHOLDER</body>";
 
+    public MarkdownParser() {
+        this(new MutableDataSet());
+    }
+
+    public MarkdownParser(DataHolder parserOptions) {
+        options.setAll(parserOptions);
+        parser =  Parser.builder(options).build();
+        renderer = HtmlRenderer.builder(options).build();
+    }
+
     public String parseToHTML(String input) {
         String mdHTML = renderer.render(parser.parse(input));
         return htmlTemplate.replace("PLACEHOLDER", mdHTML);

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -9,6 +9,8 @@
     requires flexmark;
     requires flexmark.util;
     requires java.desktop;
+    requires flexmark.ext.gfm.strikethrough;
+    requires flexmark.ext.tables;
 
     opens com.danclowry.noteapp to javafx.fxml;
     opens com.danclowry.noteapp.controllers to javafx.fxml;