e97a996 · typeable/pandoc

git.iko.soy/typeable/pandoc

Clean up after "hlint --refactor" (#6129)

HLint's automatic refactoring isn't quite perfect, so some of its changes were overcomplicated, wrong, or created new findings. Clean these up.

commite97a99616e05c3cfb7baea37a5b9fac7689f9b18 authorJoseph C. Sible <josephcsible@users.noreply.github.com> dateSat 8 Feb 2020, 12:11 (7 years ago) parent02ff42b

3 files changed+7−8

compare with master

unifiedsplit

src/Text/Pandoc/Readers/Docx/Fields.hs+2−2 src/Text/Pandoc/Writers/AsciiDoc.hs+1−1 src/Text/Pandoc/Writers/MediaWiki.hs+4−5

src/Text/Pandoc/Readers/Docx/Fields.hs+2−2

@@ -17,7 +17,7 @@ module Text.Pandoc.Readers.Docx.Fields ( FieldInfo(..)

1717 ) where

1818

1919import Prelude

20−import Data.Functor (($>))

20+import Data.Functor (($>), void)

2121import qualified Data.Text as T

2222import Text.Parsec

2323import Text.Parsec.Text (Parser)

@@ -50,7 +50,7 @@ quotedString = do

5050 T.concat <$> manyTill inQuotes (try (char '"'))

5151

5252unquotedString :: Parser T.Text

53−unquotedString = T.pack <$> manyTill anyChar (try $ lookAhead space Data.Functor.$> () <|> eof)

53+unquotedString = T.pack <$> manyTill anyChar (try $ void (lookAhead space) <|> eof)

5454

5555fieldArgument :: Parser T.Text

5656fieldArgument = quotedString <|> unquotedString

src/Text/Pandoc/Writers/AsciiDoc.hs+1−1

@@ -263,7 +263,7 @@ blockToAsciiDoc opts (OrderedList (start, sty, _delim) items) = do

263263 Decimal -> ["arabic"]

264264 Example -> []

265265 _ -> [T.toLower (tshow sty)]

266− let listStart = ["start=" <> tshow start | not (start == 1)]

266+ let listStart = ["start=" <> tshow start | start /= 1]

267267 let listoptions = case T.intercalate ", " (listStyle ++ listStart) of

268268 "" -> empty

269269 x -> brackets (literal x)

src/Text/Pandoc/Writers/MediaWiki.hs+4−5

@@ -16,7 +16,6 @@ MediaWiki: <http://www.mediawiki.org/wiki/MediaWiki>

1616-}

1717module Text.Pandoc.Writers.MediaWiki ( writeMediaWiki, highlightingLangs ) where

1818import Prelude

19−import Control.Applicative

2019import Control.Monad.Reader

2120import Control.Monad.State.Strict

2221import Data.Maybe (fromMaybe)

@@ -168,7 +167,7 @@ blockToMediaWiki (Table capt aligns widths headers rows') = do

168167

169168blockToMediaWiki x@(BulletList items) = do

170169 tags <-

171− (|| not (isSimpleList x)) Control.Applicative.<$> asks useTags

170+ (|| not (isSimpleList x)) <$> asks useTags

172171 if tags

173172 then do

174173 contents <- local (\ s -> s { useTags = True }) $ mapM listItemToMediaWiki items

@@ -180,7 +179,7 @@ blockToMediaWiki x@(BulletList items) = do

180179

181180blockToMediaWiki x@(OrderedList attribs items) = do

182181 tags <-

183− (|| not (isSimpleList x)) Control.Applicative.<$> asks useTags

182+ (|| not (isSimpleList x)) <$> asks useTags

184183 if tags

185184 then do

186185 contents <- local (\s -> s { useTags = True }) $ mapM listItemToMediaWiki items

@@ -192,7 +191,7 @@ blockToMediaWiki x@(OrderedList attribs items) = do

192191

193192blockToMediaWiki x@(DefinitionList items) = do

194193 tags <-

195− (|| not (isSimpleList x)) Control.Applicative.<$> asks useTags

194+ (|| not (isSimpleList x)) <$> asks useTags

196195 if tags

197196 then do

198197 contents <- local (\s -> s { useTags = True }) $ mapM definitionListItemToMediaWiki items

@@ -346,7 +345,7 @@ blockListToMediaWiki :: PandocMonad m

346345 => [Block] -- ^ List of block elements

347346 -> MediaWikiWriter m Text

348347blockListToMediaWiki blocks =

349− vcat Control.Applicative.<$> mapM blockToMediaWiki blocks

348+ vcat <$> mapM blockToMediaWiki blocks

350349

351350-- | Convert list of Pandoc inline elements to MediaWiki.

352351inlineListToMediaWiki :: PandocMonad m => [Inline] -> MediaWikiWriter m Text