diff options
| author | Joseph C. Sible <josephcsible@users.noreply.github.com> | 2020-02-07 02:38:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 08:38:24 +0100 |
| commit | a5a3ac994618d71ecaf2e8bd40251d792edc9c22 (patch) | |
| tree | b274d0502eacd468d0cd733b7be505aebad381cf /src/Text/Pandoc/Shared.hs | |
| parent | 013a1647a7c78e92b12c2ae520699ef7a567029a (diff) | |
| download | pandoc-a5a3ac994618d71ecaf2e8bd40251d792edc9c22.tar.gz | |
Various minor cleanups and refactoring (#6117)
* Use concatMap instead of reimplementing it
* Replace an unnecessary multi-way if with a regular if
* Use sortOn instead of sortBy and comparing
* Use guards instead of lots of indents for if and else
* Remove redundant do blocks
* Extract common functions from both branches of maybe
Whenever both the Nothing and the Just branch of maybe do the same
function, do that function on the result of maybe instead.
* Use fmap instead of reimplementing it from maybe
* Use negative forms instead of negating the positive forms
* Use mapMaybe instead of mapping and then using catMaybes
* Use zipWith instead of mapping over the result of zip
* Use unwords instead of reimplementing it
* Use <$ instead of <$> and const
* Replace case of Bool with if and else
* Use find instead of listToMaybe and filter
* Use zipWithM instead of mapM and zip
* Inline lambda wrappers into the real functions
* We get zipWithM from Text.Pandoc.Writers.Shared
* Use maybe instead of fromMaybe and fmap
I'm not sure how this one slipped past me.
* Increase a bit of indentation
Diffstat (limited to 'src/Text/Pandoc/Shared.hs')
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 69ade7e95..933798534 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -115,8 +115,7 @@ import qualified Data.Bifunctor as Bifunctor import Data.Char (isAlpha, isLower, isSpace, isUpper, toLower, isAlphaNum, generalCategory, GeneralCategory(NonSpacingMark, SpacingCombiningMark, EnclosingMark, ConnectorPunctuation)) -import Data.List (find, intercalate, intersperse, stripPrefix, sortBy) -import Data.Ord (comparing) +import Data.List (find, intercalate, intersperse, stripPrefix, sortOn) import qualified Data.Map as M import Data.Maybe (mapMaybe, fromMaybe) import Data.Monoid (Any (..)) @@ -621,7 +620,7 @@ headerLtEq _ _ = False uniqueIdent :: Extensions -> [Inline] -> Set.Set T.Text -> T.Text uniqueIdent exts title' usedIdents = if baseIdent `Set.member` usedIdents - then case find (\x -> not $ numIdent x `Set.member` usedIdents) + then case find (\x -> numIdent x `Set.notMember` usedIdents) ([1..60000] :: [Int]) of Just x -> numIdent x Nothing -> baseIdent @@ -799,7 +798,7 @@ filterIpynbOutput mode = walk go -> Div (ident, ("output":os), kvs) bs | otherwise -> Div (ident, ("output":os), kvs) $ walk removeANSI $ - take 1 $ sortBy (comparing rank) bs + take 1 $ sortOn rank bs where rank (RawBlock (Format "html") _) | fmt == Format "html" = (1 :: Int) |