Merge pull request #35 from Rosuavio/tasklist

Add TASKLIST node type

Author: kivikakk

CMarkGFM.hsc

@@ -46,7 +46,7 @@ import Data.Maybe (fromMaybe)
 import GHC.Generics (Generic)
 import Data.Data (Data)
 import Data.Typeable (Typeable)
-import Data.Text (Text, empty, snoc)
+import Data.Text (Text, empty, pack, snoc)
 import qualified Data.Text.Foreign as TF
 import Data.ByteString.Unsafe (unsafePackMallocCString)
 import Data.Text.Encoding (decodeUtf8)
@@ -239,6 +239,7 @@ data NodeType =
   | HEADING Level
   | LIST ListAttributes
   | ITEM
+  | TASKLIST Bool
   | TEXT Text
   | SOFTBREAK
   | LINEBREAK
@@ -335,7 +336,11 @@ ptrToNodeType ptr = do
        #const CMARK_NODE_LIST
          -> LIST <$> listAttr
        #const CMARK_NODE_ITEM
-         -> return ITEM
+         -> do
+           ts <- typeString
+           if ts == pack "tasklist"
+             then TASKLIST <$> checked
+             else return ITEM
        #const CMARK_NODE_HEADING
          -> HEADING <$> level
        #const CMARK_NODE_EMPH
@@ -372,7 +377,8 @@ ptrToNodeType ptr = do
               return TABLE_CELL
             else
               error $ "Unknown node type " ++ (show nodeType)
-  where literal   = c_cmark_node_get_literal ptr >>= totext
+  where typeString = c_cmark_node_get_type_string ptr >>= totext
+        literal   = c_cmark_node_get_literal ptr >>= totext
         level     = c_cmark_node_get_heading_level ptr
         onEnter    = c_cmark_node_get_on_enter ptr >>= totext
         onExit     = c_cmark_node_get_on_exit  ptr >>= totext
@@ -400,6 +406,7 @@ ptrToNodeType ptr = do
           ncols <- c_cmark_gfm_extensions_get_table_columns ptr
           cols <- c_cmark_gfm_extensions_get_table_alignments ptr
           mapM (fmap ucharToAlignment . peekElemOff cols) [0..(fromIntegral ncols) - 1]
+        checked   = c_cmark_gfm_extensions_get_tasklist_item_checked ptr
         ucharToAlignment (CUChar 108) = LeftAligned
         ucharToAlignment (CUChar 99)  = CenterAligned
         ucharToAlignment (CUChar 114) = RightAligned
@@ -464,7 +471,13 @@ fromNode (Node _ nodeType children) = do
                      c_cmark_node_set_list_tight n $ listTight attr
                      c_cmark_node_set_list_start n $ listStart attr
                      return n
-            ITEM        -> c_cmark_node_new (#const CMARK_NODE_ITEM)
+            ITEM         -> c_cmark_node_new (#const CMARK_NODE_ITEM)
+            TASKLIST checked -> do
+              n <- c_cmark_node_new (#const CMARK_NODE_ITEM)
+              tasklistExt <- withCString (unCMarkExtension extTaskList) c_cmark_find_syntax_extension
+              c_cmark_node_set_syntax_extension n tasklistExt
+              c_cmark_gfm_extensions_set_tasklist_item_checked n checked
+              return n
             HEADING lev  -> do
                      n <- c_cmark_node_new (#const CMARK_NODE_HEADING)
                      c_cmark_node_set_heading_level n lev
@@ -555,6 +568,9 @@ foreign import ccall "cmark-gfm.h cmark_parser_free"
 foreign import ccall "cmark-gfm.h cmark_node_get_type"
     c_cmark_node_get_type :: NodePtr -> IO Int
 
+foreign import ccall "cmark-gfm.h cmark_node_get_type_string"
+    c_cmark_node_get_type_string :: NodePtr -> IO CString
+
 foreign import ccall "cmark-gfm.h cmark_node_first_child"
     c_cmark_node_first_child :: NodePtr -> IO NodePtr
 
@@ -680,3 +696,12 @@ foreign import ccall "cmark-gfm-core-extensions.h cmark_gfm_extensions_get_table
 
 foreign import ccall "cmark-gfm-core-extensions.h cmark_gfm_extensions_get_table_alignments"
     c_cmark_gfm_extensions_get_table_alignments :: NodePtr -> IO (Ptr CUChar)
+
+foreign import ccall "cmark-gfm-core-extensions.h cmark_node_set_syntax_extension"
+    c_cmark_node_set_syntax_extension :: NodePtr -> ExtensionPtr -> IO Int
+
+foreign import ccall "cmark-gfm-core-extensions.h cmark_gfm_extensions_set_tasklist_item_checked"
+    c_cmark_gfm_extensions_set_tasklist_item_checked :: NodePtr -> Bool -> IO Int
+
+foreign import ccall "cmark-gfm-core-extensions.h cmark_gfm_extensions_get_tasklist_item_checked"
+    c_cmark_gfm_extensions_get_tasklist_item_checked :: NodePtr -> IO Bool

test/test-cmark.hs

@@ -34,5 +34,8 @@ tests = TestList [
   , "&lt;xmp>\n" ~=? commonmarkToHtml [optUnsafe] [extTagfilter] "<xmp>"
   , "<ul>\n<li><input type=\"checkbox\" disabled=\"\" /> foo</li>\n<li><input type=\"checkbox\" checked=\"\" disabled=\"\" /> bar</li>\n</ul>\n" ~=? commonmarkToHtml [] [extTaskList] "- [ ] foo\n- [x] bar"
   , "<p>Here is footnote<sup class=\"footnote-ref\"><a href=\"#fn-1\" id=\"fnref-1\" data-footnote-ref>1</a></sup></p>\n<section class=\"footnotes\" data-footnotes>\n<ol>\n<li id=\"fn-1\">\n<p>abc <a href=\"#fnref-1\" class=\"footnote-backref\" data-footnote-backref data-footnote-backref-idx=\"1\" aria-label=\"Back to reference 1\">↩</a></p>\n</li>\n</ol>\n</section>\n" ~=? commonmarkToHtml [optFootnotes] [] "Here is footnote[^1]\n\n[^1]: abc"
+  , Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) DOCUMENT [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) (LIST (ListAttributes {listType = BULLET_LIST, listTight = True, listStart = 0, listDelim = PERIOD_DELIM})) [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) (TASKLIST False) [Node (Just (PosInfo {startLine = 1, startColumn = 7, endLine = 1, endColumn = 11})) PARAGRAPH [Node (Just (PosInfo {startLine = 1, startColumn = 7, endLine = 1, endColumn = 11})) (TEXT "hello") []]]]] ~=? commonmarkToNode [] [extTaskList] "- [ ] hello"
+  , Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) DOCUMENT [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) (LIST (ListAttributes {listType = BULLET_LIST, listTight = True, listStart = 0, listDelim = PERIOD_DELIM})) [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) ITEM [Node (Just (PosInfo {startLine = 1, startColumn = 3, endLine = 1, endColumn = 11})) PARAGRAPH [Node (Just (PosInfo {startLine = 1, startColumn = 3, endLine = 1, endColumn = 11})) (TEXT "[ ] hello") []]]]] ~=? commonmarkToNode [] [] "- [ ] hello"
+  , "- [x] hello\n" ~=? nodeToCommonmark [] Nothing (Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) DOCUMENT [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) (LIST (ListAttributes {listType = BULLET_LIST, listTight = True, listStart = 0, listDelim = PERIOD_DELIM})) [Node (Just (PosInfo {startLine = 1, startColumn = 1, endLine = 1, endColumn = 11})) (TASKLIST True) [Node (Just (PosInfo {startLine = 1, startColumn = 7, endLine = 1, endColumn = 11})) PARAGRAPH [Node (Just (PosInfo {startLine = 1, startColumn = 7, endLine = 1, endColumn = 11})) (TEXT "hello") []]]]])
   ]