on develop help sign in
fix hlint complaints
commitffbe01f31e33f86a14292b8f1144ab0f5104549f authorDaniel Haraj <dan@obsidian.systems> dateSat 28 Jan 2017, 20:41 (10 years ago) parentebb00bd
2 files changed+10−23
src/Reflex/Dom/Builder/Class.hs+8−21 src/Reflex/Dom/Builder/Immediate.hs+2−2
src/Reflex/Dom/Builder/Class.hs+8−21
@@ -38,6 +38,7 @@ import Data.Default
3838import Data.Functor.Misc
3939import Data.Map (Map)
4040import qualified Data.Map as Map
41+import Data.Maybe
4142import Data.Proxy
4243import Data.Semigroup
4344import Data.String
@@ -319,63 +320,49 @@ concat <$> mapM (uncurry makeLensesWithoutField)
319320-- | This lens is technically illegal. The implementation of 'TextNodeConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'TextNodeConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
320321textNodeConfig_setContents :: Reflex t => Lens (TextNodeConfig t) (TextNodeConfig t) (Event t Text) (Event t Text)
321322textNodeConfig_setContents =
322− let getter t = case _textNodeConfig_setContents t of
323− Nothing -> never
324− Just e -> e
323+ let getter = fromMaybe never . _textNodeConfig_setContents
325324 setter t e = t { _textNodeConfig_setContents = Just e }
326325 in lens getter setter
327326
328327-- | This lens is technically illegal. The implementation of 'InputElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'InputElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
329328inputElementConfig_setValue :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Text) (Event t Text)
330329inputElementConfig_setValue =
331− let getter t = case _inputElementConfig_setValue t of
332− Nothing -> never
333− Just e -> e
330+ let getter = fromMaybe never . _inputElementConfig_setValue
334331 setter t e = t { _inputElementConfig_setValue = Just e }
335332 in lens getter setter
336333
337334-- | This lens is technically illegal. The implementation of 'InputElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'InputElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
338335inputElementConfig_setChecked :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Bool) (Event t Bool)
339336inputElementConfig_setChecked =
340− let getter t = case _inputElementConfig_setChecked t of
341− Nothing -> never
342− Just e -> e
337+ let getter = fromMaybe never . _inputElementConfig_setChecked
343338 setter t e = t { _inputElementConfig_setChecked = Just e }
344339 in lens getter setter
345340
346341-- | This lens is technically illegal. The implementation of 'RawElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'RawElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
347342rawElementConfig_modifyAttributes :: Reflex t => Lens (RawElementConfig er t m) (RawElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
348343rawElementConfig_modifyAttributes =
349− let getter t = case _rawElementConfig_modifyAttributes t of
350− Nothing -> never
351− Just e -> e
344+ let getter = fromMaybe never . _rawElementConfig_modifyAttributes
352345 setter t e = t { _rawElementConfig_modifyAttributes = Just e }
353346 in lens getter setter
354347
355348-- | This lens is technically illegal. The implementation of 'RawElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'RawElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
356349elementConfig_modifyAttributes :: Reflex t => Lens (ElementConfig er t m) (ElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
357350elementConfig_modifyAttributes =
358− let getter t = case _elementConfig_modifyAttributes t of
359− Nothing -> never
360− Just e -> e
351+ let getter = fromMaybe never . _elementConfig_modifyAttributes
361352 setter t e = t { _elementConfig_modifyAttributes = Just e }
362353 in lens getter setter
363354
364355-- | This lens is technically illegal. The implementation of 'TextAreaElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'TextAreaElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
365356textAreaElementConfig_setValue :: Reflex t => Lens (TextAreaElementConfig er t m) (TextAreaElementConfig er t m) (Event t Text) (Event t Text)
366357textAreaElementConfig_setValue =
367− let getter t = case _textAreaElementConfig_setValue t of
368− Nothing -> never
369− Just e -> e
358+ let getter = fromMaybe never . _textAreaElementConfig_setValue
370359 setter t e = t { _textAreaElementConfig_setValue = Just e }
371360 in lens getter setter
372361
373362-- | This lens is technically illegal. The implementation of 'SelectElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'SelectElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
374363selectElementConfig_setValue :: Reflex t => Lens (SelectElementConfig er t m) (SelectElementConfig er t m) (Event t Text) (Event t Text)
375364selectElementConfig_setValue =
376− let getter t = case _selectElementConfig_setValue t of
377− Nothing -> never
378− Just e -> e
365+ let getter = fromMaybe never . _selectElementConfig_setValue
379366 setter t e = t { _selectElementConfig_setValue = Just e }
380367 in lens getter setter
381368
src/Reflex/Dom/Builder/Immediate.hs+2−2
@@ -288,7 +288,7 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
288288 {-# INLINABLE textNode #-}
289289 textNode (TextNodeConfig initialContents mSetContents) = do
290290 n <- textNodeInternal initialContents
291− mapM_ (lift . performEvent_ . fmap (\t -> setNodeValue n (Just t))) mSetContents
291+ mapM_ (lift . performEvent_ . fmap (setNodeValue n . Just)) mSetContents
292292 return $ TextNode n
293293 {-# INLINABLE element #-}
294294 element elementTag cfg child = fst <$> makeElement elementTag cfg child
@@ -312,7 +312,7 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
312312 Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
313313 checkedChangedByUI <- wrapDomEvent domInputElement (`on` Element.click) $ do
314314 Input.getChecked domInputElement
315− checkedChangedBySetChecked <- case (_inputElementConfig_setChecked cfg) of
315+ checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
316316 Nothing -> return never
317317 Just eNewchecked -> performEvent $ ffor eNewchecked $ \newChecked -> do
318318 oldChecked <- Input.getChecked domInputElement