a11cedf · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Fix hlint for GHC 8.10, apply suggestions

commita11cedfa6038e8d3cca513dab465eb8ffc90b455 authorTom Smalley <tfsmalley@gmail.com> dateMon 7 Jun 2021, 13:50 (5 years ago) parent6a7782a

7 files changed+10−9

compare with develop

unifiedsplit

reflex-dom-core/reflex-dom-core.cabal+3−1 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+2−1 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2−3 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+1−1 reflex-dom-core/src/Reflex/Dom/Main.hs−1 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1 reflex-dom-core/test/hlint.hs+1−1

reflex-dom-core/reflex-dom-core.cabal+3−1

@@ -176,7 +176,9 @@ library

176176 Reflex.Dom.Builder.Class.TH

177177

178178test-suite hlint

179− build-depends: base, hlint

179+ build-depends:

180+ base,

181+ hlint >= 3.0 && < 4.0

180182 hs-source-dirs: test

181183 main-is: hlint.hs

182184 type: exitcode-stdio-1.0

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+2−1

@@ -9,11 +9,12 @@

99{-# LANGUAGE GeneralizedNewtypeDeriving #-}

1010#if !MIN_VERSION_base(4,9,0)

1111{-# LANGUAGE ImpredicativeTypes #-}

12+#else

13+{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes

1214#endif

1315{-# LANGUAGE LambdaCase #-}

1416{-# LANGUAGE OverloadedStrings #-}

1517{-# LANGUAGE PolyKinds #-}

16−{-# LANGUAGE Rank2Types #-}

1718{-# LANGUAGE RecursiveDo #-}

1819{-# LANGUAGE ScopedTypeVariables #-}

1920{-# LANGUAGE StandaloneDeriving #-}

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2−3

@@ -2,7 +2,6 @@

22{-# LANGUAGE CPP #-}

33{-# LANGUAGE ConstraintKinds #-}

44{-# LANGUAGE DataKinds #-}

5−{-# LANGUAGE DeriveFunctor #-}

65{-# LANGUAGE DeriveTraversable #-}

76{-# LANGUAGE EmptyDataDecls #-}

87{-# LANGUAGE FlexibleContexts #-}

@@ -1877,14 +1876,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda

18771876 getHydrationMode >>= \case

18781877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do

18791878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children

1880− phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

18811880 liftIO $ writeIORef placeholders $! phs

18821881 insertAfterPreviousNode lastPlaceholder

18831882 HydrationMode_Immediate -> do

18841883 let activate i = do

18851884 append $ toNode $ _traverseChildImmediate_fragment i

18861885 pure $ _traverseChildImmediate_placeholder i

1887− phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

18881887 liftIO $ writeIORef placeholders $! phs

18891888 append $ toNode lastPlaceholder

18901889 requestDomAction_ $ ffor children' $ \p -> do

reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+1−1

@@ -274,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh

274274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5

275275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape

276276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8

277− modify . (:) =<< (\c -> "") <$> case mSetContents of

277+ (modify . (:)) . (\c -> "") =<< case mSetContents of

278278 Nothing -> return (pure (escape initialContents))

279279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on

280280 return $ CommentNode ()

reflex-dom-core/src/Reflex/Dom/Main.hs−1

@@ -5,7 +5,6 @@

55{-# LANGUAGE GADTs #-}

66{-# LANGUAGE MultiParamTypeClasses #-}

77{-# LANGUAGE NoMonomorphismRestriction #-}

8−{-# LANGUAGE PatternSynonyms #-}

98{-# LANGUAGE RankNTypes #-}

109{-# LANGUAGE RecursiveDo #-}

1110{-# LANGUAGE ScopedTypeVariables #-}

reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1

@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu

117117 "overflow" =: "hidden" <>

118118 "position" =: "relative"

119119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>

120− "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>

120+ "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>

121121 "position" =: "absolute" <>

122122 "width" =: "100%"

123123 findWindow sizeIncrement windowSize startingPosition =

reflex-dom-core/test/hlint.hs+1−1

@@ -1,4 +1,4 @@

1−import Language.Haskell.HLint3 (hlint)

1+import Language.Haskell.HLint (hlint)

22import System.Exit (exitFailure, exitSuccess)

44main :: IO ()