33 Commits

Author SHA1 Message Date
2b21aeae89 Added implementation and tests for subscript and superscript; fixed nested list parsing 2025-07-22 09:56:41 -04:00
ca328a464a Add prettyPrint definition for horizontal rule 2025-07-15 10:51:10 -04:00
7d45b1123f Renamed md-to-html-runner to mdtoh 2025-06-18 15:21:54 -04:00
9627abcd12 Updated test 2025-06-10 14:14:56 -04:00
82277e9ea8 Only add newlines for linebreak when pretty printing 2025-06-10 14:14:26 -04:00
d074b0131c Parse linebreaks as a backslash before a newline 2025-06-10 14:10:45 -04:00
57cb3e68fa Import module for word wrapping; add package to cabal file 2025-06-10 14:02:20 -04:00
4e9f84c2bb Add function to pretty print; commented out my word wrap and use a
built-in one instead
2025-06-10 14:01:52 -04:00
e025614324 Print extra newline if output text doesn't include a newline 2025-06-10 09:13:40 -04:00
e711444066 Add more packages to cabal file 2025-06-10 09:13:15 -04:00
6b99a1835d Created a separate parser list for all parsers (except the unit parser
is replaced with the non-newline unit parser); use that parser when
parsing list lines
2025-06-10 09:12:42 -04:00
04167e0f96 Parse CSS classes in image and figure 2025-06-10 09:11:56 -04:00
0528e813c5 Parser for CSS classes 2025-06-10 09:11:34 -04:00
b1b99189c9 Link tect can be empty; inline code cannot be empty and can have nested
backticks; created a unit parser for all characters except newline
2025-06-10 09:11:19 -04:00
ade3768e29 Try and backtrack 2025-06-10 09:10:10 -04:00
fd6d39ecd6 Parse space at beginning of list 2025-06-10 09:09:53 -04:00
0f04342867 More trying and backtracking; parse and discard extraneous spaces at
beginning of list
2025-06-10 09:09:31 -04:00
80ef93bbc9 Try parsing an ordered list item, backtrack if not possible 2025-06-10 09:08:52 -04:00
b73d4131b6 Added support for tables and codeblocks
Defined the types, defined 'show', created the parsers, added them to
parser list
2025-06-10 09:08:30 -04:00
c48b8c5ae8 Images and figures now support CSS classes 2025-06-10 09:05:31 -04:00
cf4282b26e More imports 2025-06-10 09:04:28 -04:00
7b40d6fe7c Imports 2025-06-10 09:04:18 -04:00
c4255d4578 Added a test for a list with just one item 2025-06-10 09:04:02 -04:00
dcbbff13cb Spacing change 2025-06-10 09:03:48 -04:00
592fad2b46 Added tests for tables 2025-06-10 09:03:32 -04:00
b8ba27f240 Strip newlines when comparing in test 2025-06-03 15:37:27 -04:00
bb08b40512 Replaced nested bold with asterisks, with asterisks and underscores 2025-06-03 15:37:12 -04:00
93548a4533 Never mind, doesn't seem to work well 2025-06-03 15:31:13 -04:00
160cb0edeb Trying to get nested bold and italic to work 2025-06-03 15:30:35 -04:00
2893fa25e6 Include new packages 2025-06-03 11:20:02 -04:00
324e5da82d Use new definition for lefmostLongestParse 2025-06-03 11:19:42 -04:00
05e5548aa9 Huge rewrite - use megaparsec instead of readP 2025-06-03 11:19:19 -04:00
1915628a2b Used 'in-order' parsing for headers, instead of leftmostLongestParse 2025-05-27 14:12:13 -04:00
4 changed files with 328 additions and 164 deletions

View File

@@ -23,5 +23,8 @@ main = do
fileContents <- case args of fileContents <- case args of
[] -> getContents [] -> getContents
x : _ -> readFile x x : _ -> readFile x
let res = fst $ leftmostLongestParse parseDocument fileContents let res = leftmostLongestParse parseDocument fileContents
print res let toPrint = prettyPrint res
case reverse toPrint of
'\n' : _ -> putStr toPrint
_ -> putStrLn toPrint

View File

@@ -58,9 +58,14 @@ library
exposed-modules: MdToHTML exposed-modules: MdToHTML
other-modules: MdToHtmlTest other-modules: MdToHtmlTest
build-depends: base ^>=4.19.1.0, build-depends: base ^>=4.19.1.0,
HUnit HUnit,
megaparsec,
parser-combinators,
text,
MissingH,
word-wrap
executable md-to-html-runner executable mdtoh
-- Import common warning flags. -- Import common warning flags.
import: warnings import: warnings

View File

@@ -4,24 +4,31 @@
module MdToHTML where module MdToHTML where
import Control.Applicative import Control.Applicative hiding (many, some)
import Control.Monad import Control.Monad
import Control.Monad.Combinators (count)
import Data.Char import Data.Char
import Data.List import Data.List
import Data.Ord (comparing) import Data.Ord (comparing)
import Data.String.Utils
import qualified Data.Text as T
import Data.Void
import Debug.Trace import Debug.Trace
import Text.ParserCombinators.ReadP import Text.Megaparsec
import Text.Megaparsec.Char
import Text.Printf import Text.Printf
import Text.Wrap
type Parser = Parsec Void T.Text
type HeaderLevel = Int type HeaderLevel = Int
type CssClass = String
newtype URL = URL {getUrl :: String} deriving (Eq) newtype URL = URL {getUrl :: String} deriving (Eq)
newtype ImgPath = ImgPath {getPath :: String} deriving (Eq) newtype ImgPath = ImgPath {getPath :: String} deriving (Eq)
parseMany :: ReadP a -> ReadP [a]
parseMany = Text.ParserCombinators.ReadP.many
data MdToken data MdToken
= Document [MdToken] = Document [MdToken]
| Header HeaderLevel MdToken | Header HeaderLevel MdToken
@@ -34,12 +41,15 @@ data MdToken
| UnordList [MdToken] | UnordList [MdToken]
| OrdList [MdToken] | OrdList [MdToken]
| Code MdToken | Code MdToken
| Codeblock String | Table [[MdToken]]
| Codeblock MdToken
| Link MdToken URL | Link MdToken URL
| Image MdToken ImgPath | Image MdToken URL (Maybe [CssClass])
| Figure MdToken ImgPath | Figure MdToken URL (Maybe [CssClass])
| Bold MdToken | Bold MdToken
| Italic MdToken | Italic MdToken
| Superscript MdToken
| Subscript MdToken
| Strikethrough MdToken | Strikethrough MdToken
| Unit String | Unit String
deriving (Eq) deriving (Eq)
@@ -50,22 +60,37 @@ instance Show MdToken where
show (Header level token) = "<h" ++ show level ++ ">" ++ show token ++ "</h" ++ show level ++ ">" show (Header level token) = "<h" ++ show level ++ ">" ++ show token ++ "</h" ++ show level ++ ">"
show (Para token) = "<p>" ++ show token ++ "</p>" show (Para token) = "<p>" ++ show token ++ "</p>"
show (Line tokens) = concatMap show tokens show (Line tokens) = concatMap show tokens
show Linebreak = "<br>" show Linebreak = "<br />"
show SingleNewline = " " show SingleNewline = " "
show HorizontalRule = "<hr>" show HorizontalRule = "<hr>"
show (Blockquote tokens) = "<blockquote>" ++ concatMap show tokens ++ "</blockquote>" show (Blockquote tokens) = "<blockquote>" ++ concatMap show tokens ++ "</blockquote>"
show (UnordList tokens) = "<ul>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ul>" show (UnordList tokens) = "<ul>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ul>"
show (OrdList tokens) = "<ol>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ol>" show (OrdList tokens) = "<ol>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ol>"
show (Code code) = "<code>" ++ show code ++ "</code>" show (Code code) = "<code>" ++ strip (show code) ++ "</code>"
show (Codeblock code) = show code show (Table (thead : tokenGrid)) = "<table><thead><tr>" ++ concatMap (\x -> "<th>" ++ rstrip (show x) ++ "</th>") thead ++ "</tr></thead>" ++ "<tbody>" ++ concatMap (\x -> "<tr>" ++ concatMap (\y -> "<td>" ++ rstrip (show y) ++ "</td>") x ++ "</tr>") tokenGrid ++ "</tbody></table>"
show (Codeblock code) = "<pre><code>" ++ show code ++ "</code></pre>"
show (Link txt url) = "<a href=\"" ++ getUrl url ++ "\">" ++ show txt ++ "</a>" show (Link txt url) = "<a href=\"" ++ getUrl url ++ "\">" ++ show txt ++ "</a>"
show (Image txt imgPath) = "<img src=\"" ++ getPath imgPath ++ "\"" ++ " alt=\"" ++ show txt ++ "\" />" show (Image txt url cssClasses) = "<img src=\"" ++ getUrl url ++ "\"" ++ " alt=\"" ++ show txt ++ "\"" ++ maybe "" (\classes -> " class=\"" ++ unwords classes ++ "\"") cssClasses ++ "/>"
show (Figure txt imgPath) = "<figure><img src=\"" ++ getPath imgPath ++ "\" alt=\"" ++ show txt ++ "\"/><figcaption aria-hidden=\"true\">" ++ show txt ++ "</figcaption></figure>" show (Figure txt url cssClasses) = "<figure><img src=\"" ++ getUrl url ++ "\" alt=\"" ++ show txt ++ "\"" ++ maybe "" (\classes -> " class=\"" ++ unwords classes ++ "\"") cssClasses ++ "/><figcaption aria-hidden=\"true\">" ++ show txt ++ "</figcaption></figure>"
show (Bold token) = "<b>" ++ show token ++ "</b>" show (Bold token) = "<b>" ++ show token ++ "</b>"
show (Italic token) = "<i>" ++ show token ++ "</i>" show (Italic token) = "<i>" ++ show token ++ "</i>"
show (Superscript token) = "<sup>" ++ show token ++ "</sup>"
show (Subscript token) = "<sub>" ++ show token ++ "</sub>"
show (Strikethrough token) = "<s>" ++ show token ++ "</s>" show (Strikethrough token) = "<s>" ++ show token ++ "</s>"
show (Unit unit) = printf "%s" unit show (Unit unit) = printf "%s" unit
-- Pretty print the given token into a string.
-- This is the same as calling 'show' for most tokens, but is different for paragraphs and tables,
-- which have newlines inserted into them.
prettyPrint :: MdToken -> String
prettyPrint (Para token) = "<p>" ++ T.unpack (wrapText defaultWrapSettings 70 (T.pack $ prettyPrint token)) ++ "</p>\n"
prettyPrint (Table (thead : tokenGrid)) = "<table>\n<thead>\n<tr>\n" ++ concatMap (\x -> "<th>" ++ rstrip (prettyPrint x) ++ "</th>\n") thead ++ "</tr>\n</thead>\n" ++ "<tbody>\n" ++ concatMap (\x -> "<tr>\n" ++ concatMap (\y -> "<td>" ++ rstrip (prettyPrint y) ++ "</td>\n") x ++ "</tr>\n") tokenGrid ++ "</tbody>\n</table>\n"
prettyPrint Linebreak = "<br />\n"
prettyPrint HorizontalRule = "<hr>\n"
prettyPrint (Line tokens) = concatMap prettyPrint tokens
prettyPrint (Document tokens) = concatMap prettyPrint tokens
prettyPrint token = show token
instance Semigroup MdToken where instance Semigroup MdToken where
a <> b = Document [a, b] a <> b = Document [a, b]
@@ -83,27 +108,26 @@ leftmostLongest xs =
(x : xs) -> Just x (x : xs) -> Just x
-- Get the first parse returned by readP_to_S that consumed the most input -- Get the first parse returned by readP_to_S that consumed the most input
leftmostLongestParse :: (Monoid a) => ReadP a -> String -> (a, String) leftmostLongestParse :: (Monoid a) => Parser a -> String -> a
leftmostLongestParse parser input = leftmostLongestParse parser input =
let res = leftmostLongest $ readP_to_S parser input case runParser parser "input" (T.pack input) of
in case res of (Left a) -> mempty
Nothing -> (mempty, mempty) (Right a) -> a
Just x -> x
specialChars = "\n\\`*_{}[]()<>#+|" specialChars = ">\n\\`*_{}[]#+|"
escapableChars = "-~!." ++ specialChars escapableChars = "-~!.$()" ++ specialChars
-- Makes a parser greedy. Instead of returning all possible parses, only the longest one is returned. -- Makes a parser greedy. Instead of returning all possible parses, only the longest one is returned.
greedyParse :: ReadP a -> ReadP [a] greedyParse :: Parser a -> Parser [a]
greedyParse parser = do greedyParse parser = do
greedyParse1 parser <++ return [] greedyParse1 parser <|> return []
-- Like greedyParse, but the parser must succeed atleast once. -- Like greedyParse, but the parser must succeed atleast once.
greedyParse1 :: ReadP a -> ReadP [a] greedyParse1 :: Parser a -> Parser [a]
greedyParse1 parser = do greedyParse1 parser = do
parsed1 <- parser parsed1 <- parser
parsed2 <- greedyParse1 parser <++ return [] parsed2 <- greedyParse1 parser <|> return []
return (parsed1 : parsed2) return (parsed1 : parsed2)
prepend :: [a] -> [a] -> [a] prepend :: [a] -> [a] -> [a]
@@ -113,124 +137,204 @@ append :: [a] -> [a] -> [a]
append x1 x2 = x2 ++ x1 append x1 x2 = x2 ++ x1
-- Parse until EOL or EOF -- Parse until EOL or EOF
parseTillEol :: ReadP String parseTillEol :: Parser String
parseTillEol = manyTill get (void (char '\n') <++ eof) parseTillEol = manyTill anySingle (void (char '\n') <|> eof)
-- Takes a list of parsers. Returns a parser that will try them in -- Takes a list of parsers. Returns a parser that will try them in
-- order, moving to the next one only if the current one fails. -- order, moving to the next one only if the current one fails.
fallthroughParser :: [ReadP a] -> ReadP a fallthroughParser :: [Parser a] -> Parser a
fallthroughParser [x] = x fallthroughParser [x] = x
fallthroughParser (x : xs) = x <++ fallthroughParser xs fallthroughParser (x : xs) = try x <|> fallthroughParser xs
escapeChar :: Char -> String
escapeChar '>' = "&gt;"
escapeChar '<' = "&lt;"
escapeChar '&' = "&amp;"
escapeChar x = [x]
htmlEscapeChars :: T.Text -> T.Text
htmlEscapeChars = T.concatMap (T.pack . escapeChar)
-- -- Wraps a list of words after (at most) the given number of characters, trying to prevent word-breaks
-- wordwrap :: Int -> String -> String
-- wordwrap wraplength str = if (length str) < wraplength
-- then str
-- else
-- let spaceIndex = lastgtSpaceIndex 0 (takeRev (length str) - wraplength str)
--
-- where
-- takeRev n = (reverse . take n . reverse)
-- lastSpaceIndex counter str = case str of
-- [] -> counter
-- x:xs -> if (isSpace x) counter else lastSpaceIndex counter+1 xs
-- --------------- -- ---------------
-- Parse a markdown header, denoted by 1-6 #'s followed by some text, followed by EOL. -- Parse a markdown header, denoted by 1-6 #'s followed by some text, followed by EOL.
parseHeader :: ReadP MdToken parseHeader :: Parser MdToken
parseHeader = do parseHeader = do
skipSpaces space
headers <- munch1 (== '#') headers <- greedyParse1 (char '#')
when when
(length headers > 6) (length headers > 6)
pfail empty
skipSpaces space
text <- munch1 (/= '\n') parsedText <- manyTill parseLineToken (void (char '\n') <|> eof)
-- Text.ParserCombinators.ReadP.optional (char '\n') greedyParse (char '\n')
skipSpaces return (Header (length headers) (Line parsedText))
let parsedText = fst $ leftmostLongestParse parseLine text
return (Header (length headers) parsedText) asteriskBold = T.pack "**"
underscoreBold = T.pack "__"
-- Parse bold text -- Parse bold text
parseBold :: ReadP MdToken parseBold :: Parser MdToken
parseBold = parseBoldWith "**" <|> parseBoldWith "__" parseBold = parseBoldWith asteriskBold <|> parseBoldWith underscoreBold
where where
parseBoldWith delim = do parseBoldWith delim = do
string delim string delim
inside <- greedyParse1 parseLineToken inside <- someTill parseLineToken $ string delim
string delim
return (Bold (Line inside)) return (Bold (Line inside))
-- Parse italic text -- Parse italic text
parseItalic :: ReadP MdToken parseItalic :: Parser MdToken
parseItalic = parseItalicWith "*" <|> parseItalicWith "_" parseItalic = parseItalicWith '*' <|> parseItalicWith '_'
where where
parseItalicWith delim = do parseItalicWith delim = do
string delim char delim
inside <- greedyParse1 parseLineToken inside <- someTill parseLineToken (char delim)
string delim
return (Italic (Line inside)) return (Italic (Line inside))
-- Parse subscript
parseSubscript :: Parser MdToken
parseSubscript = do
char '~'
inside <- someTill parseLineToken (char '~')
return (Subscript (Line inside))
-- Parse superscript
parseSuperscript :: Parser MdToken
parseSuperscript = do
char '^'
inside <- someTill parseLineToken (char '^')
return (Superscript (Line inside))
-- Parse strikethrough text -- Parse strikethrough text
parseStrikethrough :: ReadP MdToken parseStrikethrough :: Parser MdToken
parseStrikethrough = do parseStrikethrough = do
string "~~" string (T.pack "~~")
inside <- many1 parseLineToken inside <- someTill parseLineToken $ string (T.pack "~~")
string "~~"
return (Strikethrough (Line inside)) return (Strikethrough (Line inside))
-- Parse code -- Parse code
parseCode :: ReadP MdToken parseCode :: Parser MdToken
parseCode = do parseCode = do
string "`" opening <- some $ char '`'
inside <- many1 get inside <- someTill (satisfy (/= '\n')) (char '`')
string "`" closing <- count (length opening - 1) (char '`')
return (Code (Unit inside)) return (Code (Unit (concatMap escapeChar inside)))
-- Parse a link -- Parse a link
parseLink :: ReadP MdToken parseLink :: Parser MdToken
parseLink = do parseLink = do
linkText <- between (string "[") (string "]") (many1 get) char '['
linkURL <- between (string "(") (string ")") (many1 get) linkText <- manyTill parseLineToken (char ']')
let parsedLinkText = fst $ leftmostLongestParse parseLine linkText char '('
return $ Link parsedLinkText (URL linkURL) linkURL <- manyTill anySingle (char ')')
return $ Link (Line linkText) (URL linkURL)
-- Parse a linebreak character -- Parse a linebreak character
parseLinebreak :: ReadP MdToken parseLinebreak :: Parser MdToken
parseLinebreak = do parseLinebreak = parseLinebreakSpace <|> parseLinebreakBackslash
char ' ' where
many1 (char ' ') parseLinebreakSpace = do
char '\n' char ' '
return Linebreak some (char ' ')
char '\n'
return Linebreak
parseLinebreakBackslash = try $ do
char '\\'
char '\n'
return Linebreak
parseSingleNewline :: ReadP MdToken parseTableRow :: Parser [MdToken]
parseTableRow = do
char '|'
row <- some (many (satisfy (\x -> x == ' ' || x == '\t')) *> someTill parseListLineToken (char '|'))
return (map Line row)
parseTable :: Parser MdToken
parseTable = do
tableHead <- parseTableRow
char '\n'
char '|'
sepEndBy1 (some (char '-')) (char '|') *> char '\n'
tableBody <- sepEndBy parseTableRow (char '\n')
many (char '\n') -- Parse trailing newlines, if any
return $ Table (tableHead : tableBody)
parseSingleNewline :: Parser MdToken
parseSingleNewline = do parseSingleNewline = do
char '\n' char '\n'
remaining <- look remaining <- getInput
case remaining of case T.unpack remaining of
[] -> return $ Unit "" [] -> return $ Unit ""
_ -> return SingleNewline _ -> return SingleNewline
parseImage :: ReadP MdToken parseCssClasses :: Parser [CssClass]
parseCssClasses = do
char '{'
classes <- some parseCssClass
char '}'
return classes
where
parseCssClass :: Parser CssClass
parseCssClass = do
char '.'
let firstLetterParser = char '_' <|> char '-' <|> label "letter" (satisfy isAlpha)
cssClassFirstLetter <- firstLetterParser
cssClass <- many (firstLetterParser <|> label "digit" (satisfy isDigit))
space
return (cssClassFirstLetter : cssClass)
parseImage :: Parser MdToken
parseImage = do parseImage = do
char '!' char '!'
char '[' link <- parseLink
altText <- many1 (parseEscapedChar <++ parseUnit) cssClasses <- optional $ try parseCssClasses
char ']' case link of
char '(' Link text path -> return $ Image text path cssClasses
path <- many1 get _ -> empty -- This should never be reached
char ')'
return $ Image (Line altText) (ImgPath path)
parseFigure = do parseFigure = do
img <- parseImage img <- parseImage
void (string "\n\n") <++ eof void (string doubleNewlineText) <|> eof
case img of case img of
Image text path -> return $ Figure text path Image text path cssClasses -> return $ Figure text path cssClasses
_ -> return img _ -> return img
-- Parse an escaped character -- Parse an escaped character
parseEscapedChar :: ReadP MdToken parseEscapedChar :: Parser MdToken
parseEscapedChar = do parseEscapedChar = do
char '\\' char '\\'
escapedChar <- choice (map char escapableChars) -- Parse any of the special chars. escapedChar <- choice (map char escapableChars) -- Parse any of the special chars.
return (Unit [escapedChar]) return (Unit [escapedChar])
-- Parse a character as a Unit. -- Parse a character as a Unit.
parseUnit :: ReadP MdToken parseUnit :: Parser MdToken
parseUnit = do parseUnit = do
text <- satisfy (`notElem` specialChars) -- text <- satisfy (`notElem` specialChars)
text <- anySingle
return (Unit [text]) return (Unit [text])
lineParsers :: [ReadP MdToken] -- Parse any character except a newline
parseUnitExceptNewline :: Parser MdToken
parseUnitExceptNewline = do
-- text <- satisfy (`notElem` specialChars)
text <- satisfy (/= '\n')
return (Unit [text])
lineParsers :: [Parser MdToken]
lineParsers = lineParsers =
[ parseLinebreak, [ parseLinebreak,
parseSingleNewline, parseSingleNewline,
@@ -240,102 +344,112 @@ lineParsers =
parseBold, parseBold,
parseItalic, parseItalic,
parseStrikethrough, parseStrikethrough,
parseSubscript,
parseSuperscript,
parseLink, parseLink,
parseUnit parseUnit
] -- A 'line' doesn't include a 'header' ] -- A 'line' doesn't include a 'header'
listLineParsers :: [ReadP MdToken] lineParsersWithoutNewline :: [Parser MdToken]
listLineParsers = lineParsersWithoutNewline =
[ parseLinebreak, [ parseEscapedChar,
parseEscapedChar,
parseCode, parseCode,
parseImage, parseImage,
parseBold, parseBold,
parseItalic, parseItalic,
parseStrikethrough, parseStrikethrough,
parseSubscript,
parseSuperscript,
parseLink, parseLink,
parseUnit parseUnitExceptNewline
] -- A list line cannot contain newlines. ] -- A list line cannot contain newlines.
-- List of all parsers -- List of all parsers
allParsers :: [ReadP MdToken] allParsers :: [Parser MdToken]
allParsers = parseHeader : lineParsers allParsers = parseHeader : lineParsers
-- Parse any of the line tokens. -- Parse any of the line tokens.
parseLineToken :: ReadP MdToken parseLineToken :: Parser MdToken
parseLineToken = fallthroughParser lineParsers parseLineToken = fallthroughParser lineParsers
-- Parse any of the list line tokens. -- Parse any of the list line tokens.
parseListLineToken :: ReadP MdToken parseListLineToken :: Parser MdToken
parseListLineToken = fallthroughParser listLineParsers parseListLineToken = fallthroughParser lineParsersWithoutNewline
-- Parse a line, consisting of one or more tokens. -- Parse a line, consisting of one or more tokens.
parseLine :: ReadP MdToken parseLine :: Parser MdToken
parseLine = do parseLine = do
skipSpaces space
-- Fail if we have reached the end of the document. -- Fail if we have reached the end of the document.
parsed <- manyTill parseLineToken eof parsed <- manyTill parseLineToken eof
return (Line parsed) return (Line parsed)
-- Parse a paragraph, which is a 'Line' (can span multiple actual lines), separated by double-newlines. -- Parse a paragraph, which is a 'Line' (can span multiple actual lines), separated by double-newlines.
parsePara :: ReadP MdToken parsePara :: Parser MdToken
parsePara = do parsePara = do
parseMany (char '\n') space
-- text <- many1 (lookaheadParse (\x -> ((length x) < 2) || (take 2 x) /= "\n\n")) -- Parse until a double-newline. -- text <- many1 (lookaheadParse (\x -> ((length x) < 2) || (take 2 x) /= "\n\n")) -- Parse until a double-newline.
-- string "\n\n" <|> (eof >> return "") -- Consume the next double-newline or EOF. -- string "\n\n" <|> (eof >> return "") -- Consume the next double-newline or EOF.
text <- manyTill get (string "\n\n" <|> (eof >> return "")) parsedText <- someTill parseLineToken (try paraEnding)
when (null text) pfail many (char '\n')
let parsedText = fst $ leftmostLongestParse parseLine text -- Parse a line return (Para (Line parsedText))
parseMany (char '\n') where
return (Para parsedText) paraEnding = void (char '\n' *> (char '\n' <|> lookAhead (char '>'))) <|> eof
-- Parse a line starting with '>', return the line except for the '>'. -- Parse a line starting with '>', return the line except for the '>'.
parseQuotedLine :: ReadP String parseQuotedLine :: Parser String
parseQuotedLine = do parseQuotedLine = do
char '>' char '>'
greedyParse (char ' ' +++ char '\t') many (char ' ' <|> char '\t')
restOfLine <- munch (/= '\n') restOfLine <- many (satisfy (/= '\n'))
Text.ParserCombinators.ReadP.optional (char '\n') >> return "" void (char '\n') <|> eof
return restOfLine return restOfLine
-- Parse many 'quoted lines' until I see a non-quoted line. -- Parse many 'quoted lines' until I see a non-quoted line.
parseQuotedLines :: ReadP [String] parseQuotedLines :: Parser [String]
parseQuotedLines = parseQuotedLines = some parseQuotedLine
greedyParse1 $ do
look >>= \line -> -- some $ do
case line of -- getInput >>= \line ->
('>' : _) -> parseQuotedLine -- case T.unpack line of
_ -> pfail -- ('>' : _) -> parseQuotedLine
-- _ -> empty
-- Parse a blockquote, which is a greater-than sign followed by a paragraph. -- Parse a blockquote, which is a greater-than sign followed by a paragraph.
parseBlockquote :: ReadP MdToken parseBlockquote :: Parser MdToken
parseBlockquote = do parseBlockquote = do
quotedLines <- parseQuotedLines quotedLines <- parseQuotedLines
-- remaining <- look -- remaining <- look
-- let quotedLines = fst $ leftmostLongestParse parseQuotedLines remaining -- let quotedLines = fst $ leftmostLongestParse parseQuotedLines remaining
-- string (init $ unlines quotedLines) -- string (init $ unlines quotedLines)
let parsedQuotedLines = fst $ leftmostLongestParse (many1 (parseBlockquote <++ parsePara)) (init $ unlines quotedLines) -- unlines joins the lines together with a newline, and adds a trailing newline. init removes the trailing newline. let parsedQuotedLines = leftmostLongestParse (some (parseBlockquote <|> parsePara)) (init $ unlines quotedLines) -- unlines joins the lines together with a newline, and adds a trailing newline. init removes the trailing newline.
return (Blockquote parsedQuotedLines) return (Blockquote parsedQuotedLines)
-- Parse a nested list item. -- Parse a nested list item.
parseListNested :: ReadP MdToken parseListNested :: Parser MdToken
parseListNested = do parseListNested = do
let firstCharParser = string " " <++ string "\t" let firstCharParser = (<>) <$> (string (T.pack " ") <|> string (T.pack "\t")) <*> (T.pack <$> many (char ' '))
let restOfLineParser = manyTill get (void (char '\n') <++ eof) let restOfLineParser = manyTill anySingle (void (char '\n') <|> eof)
lines <- greedyParse1 (firstCharParser *> restOfLineParser) -- For the first line, I manually run firstCharParser and restOfLineParser. The
let linesParsed = fst $ leftmostLongestParse (parseUnorderedList <++ parseOrderedList) (init $ unlines lines) -- result of firstCharParser is saved. For every subsequent line, I parse exactly
when (null (show linesParsed)) pfail -- the same string as firstCharParser.
firstLineSpaces <- firstCharParser
firstLine <- restOfLineParser
lines <- greedyParse (string firstLineSpaces *> restOfLineParser)
let allLines = firstLine : lines
let linesParsed = leftmostLongestParse (parseUnorderedList <|> parseOrderedList) (init $ unlines allLines)
when (null (show linesParsed)) empty
return linesParsed return linesParsed
-- Parse an unordered list line item. -- Parse an unordered list line item.
parseUListLineItem :: ReadP MdToken parseUListLineItem :: Parser MdToken
parseUListLineItem = do parseUListLineItem = do
firstChar <- choice (map char ['*', '+', '-']) firstChar <- choice (map char ['*', '+', '-'])
char ' ' -- At least one space between list indicator and list text. char ' ' -- At least one space between list indicator and list text.
parseListLineItemCommon parseListLineItemCommon
-- Parse an ordered list line item. -- Parse an ordered list line item.
parseOListLineItem :: ReadP MdToken parseOListLineItem :: Parser MdToken
parseOListLineItem = do parseOListLineItem = do
num <- greedyParse1 (satisfy isDigit) num <- greedyParse1 (satisfy isDigit)
char '.' char '.'
@@ -343,23 +457,22 @@ parseOListLineItem = do
parseListLineItemCommon parseListLineItemCommon
-- Common code for parsing list line items -- Common code for parsing list line items
parseListLineItemCommon :: ReadP MdToken parseListLineItemCommon :: Parser MdToken
parseListLineItemCommon = do parseListLineItemCommon = do
skipSpaces space
restOfLine <- many1 parseListLineToken restOfLine <- manyTill parseListLineToken (void (char '\n') <|> eof)
void (char '\n') <++ eof nestedList <- try parseListNested <|> return (Unit "")
nestedList <- parseListNested <++ return (Unit "")
return $ Line [Line restOfLine, nestedList] return $ Line [Line restOfLine, nestedList]
-- Parse an unordered list paragraph item. -- Parse an unordered list paragraph item.
parseUListParaItem :: ReadP MdToken parseUListParaItem :: Parser MdToken
parseUListParaItem = do parseUListParaItem = do
firstLine <- parseUListLineItem firstLine <- parseUListLineItem
res <- parseListParaItemCommon res <- parseListParaItemCommon
return $ Document (Para firstLine : res) -- I only wrap this in a document because I want some way of converting [MdToken] to MdToken, without any overhead. There is no other reason to wrap it in a Document. return $ Document (Para firstLine : res) -- I only wrap this in a document because I want some way of converting [MdToken] to MdToken, without any overhead. There is no other reason to wrap it in a Document.
-- Parse an unordered list paragraph item. -- Parse an unordered list paragraph item.
parseOListParaItem :: ReadP MdToken parseOListParaItem :: Parser MdToken
parseOListParaItem = do parseOListParaItem = do
firstLine <- parseOListLineItem firstLine <- parseOListLineItem
res <- parseListParaItemCommon res <- parseListParaItemCommon
@@ -369,50 +482,65 @@ parseOListParaItem = do
-- A list paragraph item is defined as a line item, followed by an empty line, followed by one or more -- A list paragraph item is defined as a line item, followed by an empty line, followed by one or more
-- lines indented by a space or tab. -- lines indented by a space or tab.
-- A list paragraph item can also be a blockquote. -- A list paragraph item can also be a blockquote.
parseListParaItemCommon :: ReadP [MdToken] parseListParaItemCommon :: Parser [MdToken]
parseListParaItemCommon = do parseListParaItemCommon = do
char '\n' char '\n'
lines <- greedyParse1 ((string " " <|> string "\t") *> parseTillEol) lines <- greedyParse1 ((string (T.pack " ") <|> string (T.pack "\t")) *> parseTillEol)
let res = fst $ leftmostLongestParse (greedyParse1 parseBlockquote <++ greedyParse1 parsePara) (init $ unlines lines) let res = leftmostLongestParse (greedyParse1 parseBlockquote <|> greedyParse1 parsePara) (init $ unlines lines)
char '\n' char '\n'
return res -- I only wrap this in a document because I want some way of converting [MdToken] to MdToken, without any overhead. There is no other reason to wrap it in a Document. return res -- I only wrap this in a document because I want some way of converting [MdToken] to MdToken, without any overhead. There is no other reason to wrap it in a Document.
-- Parse an unordered list item, which can be a line item or another list. -- Parse an unordered list item, which can be a line item or another list.
parseUListItem :: ReadP MdToken parseUListItem :: Parser MdToken
parseUListItem = parseUListParaItem <++ parseUListLineItem parseUListItem = space *> (try parseUListParaItem <|> parseUListLineItem)
-- Parse an unordered list. -- Parse an unordered list.
parseUnorderedList :: ReadP MdToken parseUnorderedList :: Parser MdToken
parseUnorderedList = do parseUnorderedList = do
lineItems <- greedyParse1 parseUListItem lineItems <- some $ try parseUListItem
void (char '\n') <++ eof -- A list must end in an extra newline or eof void (char '\n') <|> eof -- A list must end in an extra newline or eof
return $ UnordList lineItems return $ UnordList lineItems
-- -------- -- --------
parseOListItem :: ReadP MdToken parseOListItem :: Parser MdToken
parseOListItem = parseOListParaItem <++ parseOListLineItem parseOListItem = space *> (try parseOListParaItem <|> parseOListLineItem)
-- Parses the first element of an ordered list, which must start with '1.' -- Parses the first element of an ordered list, which must start with '1.'
parseFirstOListItem :: ReadP MdToken parseFirstOListItem :: Parser MdToken
parseFirstOListItem = do parseFirstOListItem = do
remaining <- look space
when (take 2 remaining /= "1.") pfail remaining <- getInput
when (take 2 (T.unpack remaining) /= "1.") empty
parseOListLineItem parseOListLineItem
parseOrderedList :: ReadP MdToken parseOrderedList :: Parser MdToken
parseOrderedList = do parseOrderedList = do
firstLine <- parseFirstOListItem firstLine <- try parseFirstOListItem
lineItems <- greedyParse1 parseOListItem lineItems <- many $ try parseOListItem
void (char '\n') <++ eof void (char '\n') <|> eof
return $ OrdList (firstLine : lineItems) return $ OrdList (firstLine : lineItems)
parseHorizontalRule :: ReadP MdToken horizontalRuleText :: T.Text
parseHorizontalRule = string "---" *> (void (string "\n\n") <++ eof) *> return HorizontalRule horizontalRuleText = T.pack "---"
documentParsers :: [ReadP MdToken] doubleNewlineText :: T.Text
doubleNewlineText = T.pack "\n\n"
parseHorizontalRule :: Parser MdToken
parseHorizontalRule = string horizontalRuleText *> (void (string doubleNewlineText) <|> eof) *> return HorizontalRule
parseCodeblock :: Parser MdToken
parseCodeblock = do
string (T.pack "```\n")
inside <- someTill anySingle (string (T.pack "\n```"))
return $ Codeblock (Unit (concatMap escapeChar inside))
documentParsers :: [Parser MdToken]
documentParsers = documentParsers =
[ parseHorizontalRule, [ parseHorizontalRule,
parseCodeblock,
parseTable,
parseHeader, parseHeader,
parseBlockquote, parseBlockquote,
parseUnorderedList, parseUnorderedList,
@@ -422,7 +550,7 @@ documentParsers =
] ]
-- Parse a document, which is multiple paragraphs. -- Parse a document, which is multiple paragraphs.
parseDocument :: ReadP MdToken parseDocument :: Parser MdToken
parseDocument = do parseDocument = do
res <- manyTill (fallthroughParser documentParsers) eof res <- manyTill (fallthroughParser documentParsers) eof
return (Document res) return (Document res)

View File

@@ -7,7 +7,7 @@ check_equal :: String -> String -> String -> Test
check_equal desc expected actual = TestCase (assertEqual desc expected actual) check_equal desc expected actual = TestCase (assertEqual desc expected actual)
convert :: String -> String convert :: String -> String
convert md = show . fst $ leftmostLongestParse parseDocument md convert md = show $ leftmostLongestParse parseDocument md
headerTests = headerTests =
TestList TestList
@@ -24,14 +24,14 @@ boldTests =
[ check_equal "Should convert bold" "<p><b>Hello</b></p>" (convert "__Hello__"), [ check_equal "Should convert bold" "<p><b>Hello</b></p>" (convert "__Hello__"),
check_equal "Should convert italic" "<p><i>Hello</i></p>" (convert "_Hello_"), check_equal "Should convert italic" "<p><i>Hello</i></p>" (convert "_Hello_"),
check_equal "Should convert bold and italic in a sentence" "<p>It <i>is</i> a <b>wonderful</b> day</p>" (convert "It _is_ a __wonderful__ day"), check_equal "Should convert bold and italic in a sentence" "<p>It <i>is</i> a <b>wonderful</b> day</p>" (convert "It _is_ a __wonderful__ day"),
check_equal "Should convert nested bold and italic" "<p><b>Bold then <i>Italic</i></b></p>" (convert "**Bold then *Italic***"), check_equal "Should convert nested bold and italic" "<p><b>Bold then <i>Italic</i></b></p>" (convert "**Bold then _Italic_**"),
check_equal "Should convert nested bold and italic" "<p><i>Italic then <b>Bold</b></i></p>" (convert "*Italic then **Bold***") check_equal "Should convert nested bold and italic" "<p><i>Italic then <b>Bold</b></i></p>" (convert "*Italic then __Bold__*")
] ]
strikethroughTests = strikethroughTests =
TestList TestList
[ check_equal "Should convert strikethrough" "<p><s>Hello</s></p>" (convert "~~Hello~~"), [ check_equal "Should convert strikethrough" "<p><s>Hello</s></p>" (convert "~~Hello~~"),
check_equal "Should convert long sentence with tilde" "<p><s>The universe is ~7 days old</s>. The universe is 13 billion years old.</p>" (convert "~~The universe is ~7 days old~~. The universe is 13 billion years old.") check_equal "Should convert long sentence with tilde" "<p><s>The universe is ~7 days old</s>. The universe is 13 billion years old.</p>" (convert "~~The universe is \\~7 days old~~. The universe is 13 billion years old.")
] ]
linkTests = linkTests =
@@ -74,6 +74,7 @@ unorderedListTests =
check_equal "Paragraph before list" "<p>This is a list</p><ul><li>Item 1</li><li>Item 2</li></ul>" (convert "This is a list\n\n* Item 1\n* Item 2"), check_equal "Paragraph before list" "<p>This is a list</p><ul><li>Item 1</li><li>Item 2</li></ul>" (convert "This is a list\n\n* Item 1\n* Item 2"),
check_equal "Paragraph before list" "<h3>This is a list</h3><ul><li>Item 1</li><li>Item 2</li></ul>" (convert "### This is a list\n\n* Item 1\n* Item 2"), check_equal "Paragraph before list" "<h3>This is a list</h3><ul><li>Item 1</li><li>Item 2</li></ul>" (convert "### This is a list\n\n* Item 1\n* Item 2"),
check_equal "Nested list then back" "<ul><li>Item 1</li><li>Item 2<ul><li>Item 3</li><li>Item 4</li></ul></li><li>Item 5</li></ul>" (convert "- Item 1\n- Item 2\n - Item 3\n - Item 4\n- Item 5"), check_equal "Nested list then back" "<ul><li>Item 1</li><li>Item 2<ul><li>Item 3</li><li>Item 4</li></ul></li><li>Item 5</li></ul>" (convert "- Item 1\n- Item 2\n - Item 3\n - Item 4\n- Item 5"),
check_equal "Triply nested list" "<ul><li>Item 1</li><li>Item 2<ul><li>Item 3<ul><li>Item 4</li></ul></li></ul></li><li>Item 5</li></ul>" (convert "- Item 1\n- Item 2\n - Item 3\n - Item 4\n- Item 5"),
check_equal "Blockquote in list" "<ul><li>Item 1</li><li><p>Item 2</p><blockquote><p>Quote</p></blockquote></li><li>Item 3</li></ul>" (convert "- Item 1\n- Item 2\n\n > Quote\n\n- Item 3"), check_equal "Blockquote in list" "<ul><li>Item 1</li><li><p>Item 2</p><blockquote><p>Quote</p></blockquote></li><li>Item 3</li></ul>" (convert "- Item 1\n- Item 2\n\n > Quote\n\n- Item 3"),
check_equal "Ordered list in unordered list" "<ul><li>Item 1</li><li>Item 2<ol><li>Item 1</li><li>Item 2</li></ol></li><li>Item 3</li></ul>" (convert "- Item 1\n- Item 2\n 1. Item 1\n 2. Item 2\n- Item 3") check_equal "Ordered list in unordered list" "<ul><li>Item 1</li><li>Item 2<ol><li>Item 1</li><li>Item 2</li></ol></li><li>Item 3</li></ul>" (convert "- Item 1\n- Item 2\n 1. Item 1\n 2. Item 2\n- Item 3")
] ]
@@ -90,19 +91,25 @@ orderedListTests =
check_equal "Paragraph before list" "<h3>This is a list</h3><ol><li>Item 1</li><li>Item 2</li></ol>" (convert "### This is a list\n\n1. Item 1\n200. Item 2"), check_equal "Paragraph before list" "<h3>This is a list</h3><ol><li>Item 1</li><li>Item 2</li></ol>" (convert "### This is a list\n\n1. Item 1\n200. Item 2"),
check_equal "Nested list then back" "<ol><li>Item 1</li><li>Item 2<ol><li>Item 3</li><li>Item 4</li></ol></li><li>Item 5</li></ol>" (convert "1. Item 1\n2. Item 2\n 1. Item 3\n 3. Item 4\n5. Item 5"), check_equal "Nested list then back" "<ol><li>Item 1</li><li>Item 2<ol><li>Item 3</li><li>Item 4</li></ol></li><li>Item 5</li></ol>" (convert "1. Item 1\n2. Item 2\n 1. Item 3\n 3. Item 4\n5. Item 5"),
check_equal "Blockquote in list" "<ol><li>Item 1</li><li><p>Item 2</p><blockquote><p>Quote</p></blockquote></li><li>Item 3</li></ol>" (convert "1. Item 1\n2. Item 2\n\n > Quote\n\n3. Item 3"), check_equal "Blockquote in list" "<ol><li>Item 1</li><li><p>Item 2</p><blockquote><p>Quote</p></blockquote></li><li>Item 3</li></ol>" (convert "1. Item 1\n2. Item 2\n\n > Quote\n\n3. Item 3"),
check_equal "Unordered list in ordered list" "<ol><li>Item 1</li><li>Item 2<ul><li>Item 1</li><li>Item 2</li></ul></li><li>Item 3</li></ol>" (convert "1. Item 1\n2. Item 2\n - Item 1\n * Item 2\n4. Item 3") check_equal "Unordered list in ordered list" "<ol><li>Item 1</li><li>Item 2<ul><li>Item 1</li><li>Item 2</li></ul></li><li>Item 3</li></ol>" (convert "1. Item 1\n2. Item 2\n - Item 1\n * Item 2\n4. Item 3"),
check_equal "List with just 1 item" "<ol><li>Item 1</li></ol>" (convert "1. Item 1")
] ]
htmlTests =
TestList
[check_equal "Convert HTML element" "<p><center>a</center></p>" (convert "<center>a</center>")]
codeTests = codeTests =
TestList TestList
[ check_equal "Code by itself" "<p><code>Hello world!</code></p>" (convert "`Hello world!`"), [ check_equal "Code by itself" "<p><code>Hello world!</code></p>" (convert "`Hello world!`"),
check_equal "Code in a paragraph" "<p>The following <code>text</code> is code</p>" (convert "The following `text` is code"), check_equal "Code in a paragraph" "<p>The following <code>text</code> is code</p>" (convert "The following `text` is code"),
check_equal "Code across paragraphs (shouldn't work" "<p></p><p></p>" (convert "`Incomplete\n\nCode`") -- At the moment, this is just treated as a syntax error, so nothing is rendered. check_equal "Code across paragraphs (shouldn't work)" "<p>`Incomplete</p><p>Code`</p>" (convert "`Incomplete\n\nCode`") -- At the moment, this is just treated as a syntax error, so nothing is rendered.
] ]
imageTests = imageTests =
TestList TestList
[ check_equal "Image with text" "<p>This is an image <img src=\"img.png\" alt=\"Image 1\" /></p>" (convert "This is an image ![Image 1](img.png)") [ check_equal "Image with text" "<p>This is an image <img src=\"img.png\" alt=\"Image 1\"/></p>" (convert "This is an image ![Image 1](img.png)"),
check_equal "Image with classes" "<p>This is an image <img src=\"img.png\" alt=\"Image 1\" class=\"new-img\"/></p>" (convert "This is an image ![Image 1](img.png){.new-img}")
] ]
figureTests = figureTests =
@@ -114,6 +121,25 @@ horizontalRuleTests =
TestList TestList
[check_equal "Horizontal Rule" "<p>a</p><hr><p>b</p>" (convert "a\n\n---\n\nb")] [check_equal "Horizontal Rule" "<p>a</p><hr><p>b</p>" (convert "a\n\n---\n\nb")]
subscriptTests =
TestList
[check_equal "Should convert subscript" "A<sub>b</sub>" (convert "A~b~")]
superscriptTests =
TestList
[check_equal "Should convert superscript" "A<sup>b</sup>" (convert "A^b^")]
tableTests =
TestList
[ check_equal
"Basic table"
"<table>\
\<thead><tr><th>Col 1</th><th>Col 2</th><th>Col 3</th></tr></thead>\
\<tbody><tr><td>Data 1</td><td>Data 2</td><td>Data 3</td></tr>\
\<tr><td>More Data 1</td><td>More Data 2</td><td>More Data 3</td></tr></tbody></table>"
(convert "| Col 1 | Col 2 | Col 3 |\n|---|---|---|\n| Data 1 | Data 2 | Data 3 |\n| More Data 1 | More Data 2 | More Data 3 |")
]
integrationTests = integrationTests =
TestList TestList
[ check_equal "Integration 1" "<h1>Sample Markdown</h1><p>This is some basic, sample markdown.</p><h2><b>Second</b> <i>Heading</i></h2>" (convert "# Sample Markdown\n\n This is some basic, sample markdown.\n\n ## __Second__ _Heading_"), [ check_equal "Integration 1" "<h1>Sample Markdown</h1><p>This is some basic, sample markdown.</p><h2><b>Second</b> <i>Heading</i></h2>" (convert "# Sample Markdown\n\n This is some basic, sample markdown.\n\n ## __Second__ _Heading_"),
@@ -121,7 +147,7 @@ integrationTests =
check_equal "Integration 3" "<h1>Hello</h1><p>World</p>" (convert "# Hello\nWorld"), check_equal "Integration 3" "<h1>Hello</h1><p>World</p>" (convert "# Hello\nWorld"),
check_equal "Integration 4" "<p>a b</p>" (convert "a\nb"), check_equal "Integration 4" "<p>a b</p>" (convert "a\nb"),
check_equal "Integration 5" "<h1>Hello</h1>" (convert "# Hello\n"), check_equal "Integration 5" "<h1>Hello</h1>" (convert "# Hello\n"),
check_equal "Integration 6" "<p>First line<br>Second line</p>" (convert "First line \nSecond line"), check_equal "Integration 6" "<p>First line<br />Second line</p>" (convert "First line \nSecond line"),
check_equal check_equal
"Integration 7" "Integration 7"
"<h1>Sample Markdown</h1><p>This is some basic, sample markdown.</p><h2>Second \ "<h1>Sample Markdown</h1><p>This is some basic, sample markdown.</p><h2>Second \
@@ -134,7 +160,7 @@ integrationTests =
"# Sample Markdown\n\nThis is some basic, sample markdown.\n\n## Second \ "# Sample Markdown\n\nThis is some basic, sample markdown.\n\n## Second \
\Heading\n\n- Unordered lists, and:\n 1. One\n 2. Two\n 3. Three\n\ \Heading\n\n- Unordered lists, and:\n 1. One\n 2. Two\n 3. Three\n\
\- More\n\n> Blockquote\n\nAnd **bold**, *italics*, and even *italics and \ \- More\n\n> Blockquote\n\nAnd **bold**, *italics*, and even *italics and \
\later **bold***. Even ~~strikethrough~~. [A link](https://markdowntohtml.com) to somewhere." \later __bold__*. Even ~~strikethrough~~. [A link](https://markdowntohtml.com) to somewhere."
) )
] ]
@@ -149,9 +175,11 @@ tests =
unorderedListTests, unorderedListTests,
orderedListTests, orderedListTests,
imageTests, imageTests,
htmlTests,
figureTests, figureTests,
codeTests, codeTests,
horizontalRuleTests, horizontalRuleTests,
tableTests,
integrationTests integrationTests
] ]