on develop help sign in
fix hlint complaints
ffbe01fDaniel Haraj
src/Reflex/Dom/Builder/Class.hs+8−21
@@ -38,6 +38,7 @@ import Data.Default
38import Data.Functor.Misc
38import Data.Functor.Misc
39import Data.Map (Map)
39import Data.Map (Map)
40import qualified Data.Map as Map
40import qualified Data.Map as Map
41+import Data.Maybe
41import Data.Proxy
42import Data.Proxy
42import Data.Semigroup
43import Data.Semigroup
43import Data.String
44import Data.String
@@ -319,63 +320,49 @@ concat <$> mapM (uncurry makeLensesWithoutField)
319-- | 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'.
320-- | 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'.
320textNodeConfig_setContents :: Reflex t => Lens (TextNodeConfig t) (TextNodeConfig t) (Event t Text) (Event t Text)
321textNodeConfig_setContents :: Reflex t => Lens (TextNodeConfig t) (TextNodeConfig t) (Event t Text) (Event t Text)
321textNodeConfig_setContents =
322textNodeConfig_setContents =
322− let getter t = case _textNodeConfig_setContents t of
323+ let getter = fromMaybe never . _textNodeConfig_setContents
323− Nothing -> never
324− Just e -> e
325 setter t e = t { _textNodeConfig_setContents = Just e }
324 setter t e = t { _textNodeConfig_setContents = Just e }
326 in lens getter setter
325 in lens getter setter
327
326
328-- | 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'.
327-- | 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'.
329inputElementConfig_setValue :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Text) (Event t Text)
328inputElementConfig_setValue :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Text) (Event t Text)
330inputElementConfig_setValue =
329inputElementConfig_setValue =
331− let getter t = case _inputElementConfig_setValue t of
330+ let getter = fromMaybe never . _inputElementConfig_setValue
332− Nothing -> never
333− Just e -> e
334 setter t e = t { _inputElementConfig_setValue = Just e }
331 setter t e = t { _inputElementConfig_setValue = Just e }
335 in lens getter setter
332 in lens getter setter
336
333
337-- | 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'.
334-- | 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'.
338inputElementConfig_setChecked :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Bool) (Event t Bool)
335inputElementConfig_setChecked :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Bool) (Event t Bool)
339inputElementConfig_setChecked =
336inputElementConfig_setChecked =
340− let getter t = case _inputElementConfig_setChecked t of
337+ let getter = fromMaybe never . _inputElementConfig_setChecked
341− Nothing -> never
342− Just e -> e
343 setter t e = t { _inputElementConfig_setChecked = Just e }
338 setter t e = t { _inputElementConfig_setChecked = Just e }
344 in lens getter setter
339 in lens getter setter
345
340
346-- | 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'.
341-- | 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'.
347rawElementConfig_modifyAttributes :: Reflex t => Lens (RawElementConfig er t m) (RawElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
342rawElementConfig_modifyAttributes :: Reflex t => Lens (RawElementConfig er t m) (RawElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
348rawElementConfig_modifyAttributes =
343rawElementConfig_modifyAttributes =
349− let getter t = case _rawElementConfig_modifyAttributes t of
344+ let getter = fromMaybe never . _rawElementConfig_modifyAttributes
350− Nothing -> never
351− Just e -> e
352 setter t e = t { _rawElementConfig_modifyAttributes = Just e }
345 setter t e = t { _rawElementConfig_modifyAttributes = Just e }
353 in lens getter setter
346 in lens getter setter
354
347
355-- | 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'.
348-- | 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'.
356elementConfig_modifyAttributes :: Reflex t => Lens (ElementConfig er t m) (ElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
349elementConfig_modifyAttributes :: Reflex t => Lens (ElementConfig er t m) (ElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
357elementConfig_modifyAttributes =
350elementConfig_modifyAttributes =
358− let getter t = case _elementConfig_modifyAttributes t of
351+ let getter = fromMaybe never . _elementConfig_modifyAttributes
359− Nothing -> never
360− Just e -> e
361 setter t e = t { _elementConfig_modifyAttributes = Just e }
352 setter t e = t { _elementConfig_modifyAttributes = Just e }
362 in lens getter setter
353 in lens getter setter
363
354
364-- | 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'.
355-- | 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'.
365textAreaElementConfig_setValue :: Reflex t => Lens (TextAreaElementConfig er t m) (TextAreaElementConfig er t m) (Event t Text) (Event t Text)
356textAreaElementConfig_setValue :: Reflex t => Lens (TextAreaElementConfig er t m) (TextAreaElementConfig er t m) (Event t Text) (Event t Text)
366textAreaElementConfig_setValue =
357textAreaElementConfig_setValue =
367− let getter t = case _textAreaElementConfig_setValue t of
358+ let getter = fromMaybe never . _textAreaElementConfig_setValue
368− Nothing -> never
369− Just e -> e
370 setter t e = t { _textAreaElementConfig_setValue = Just e }
359 setter t e = t { _textAreaElementConfig_setValue = Just e }
371 in lens getter setter
360 in lens getter setter
372
361
373-- | 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'.
362-- | 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'.
374selectElementConfig_setValue :: Reflex t => Lens (SelectElementConfig er t m) (SelectElementConfig er t m) (Event t Text) (Event t Text)
363selectElementConfig_setValue :: Reflex t => Lens (SelectElementConfig er t m) (SelectElementConfig er t m) (Event t Text) (Event t Text)
375selectElementConfig_setValue =
364selectElementConfig_setValue =
376− let getter t = case _selectElementConfig_setValue t of
365+ let getter = fromMaybe never . _selectElementConfig_setValue
377− Nothing -> never
378− Just e -> e
379 setter t e = t { _selectElementConfig_setValue = Just e }
366 setter t e = t { _selectElementConfig_setValue = Just e }
380 in lens getter setter
367 in lens getter setter
381
368
src/Reflex/Dom/Builder/Immediate.hs+2−2
@@ -288,7 +288,7 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
288 {-# INLINABLE textNode #-}
288 {-# INLINABLE textNode #-}
289 textNode (TextNodeConfig initialContents mSetContents) = do
289 textNode (TextNodeConfig initialContents mSetContents) = do
290 n <- textNodeInternal initialContents
290 n <- textNodeInternal initialContents
291− mapM_ (lift . performEvent_ . fmap (\t -> setNodeValue n (Just t))) mSetContents
291+ mapM_ (lift . performEvent_ . fmap (setNodeValue n . Just)) mSetContents
292 return $ TextNode n
292 return $ TextNode n
293 {-# INLINABLE element #-}
293 {-# INLINABLE element #-}
294 element elementTag cfg child = fst <$> makeElement elementTag cfg child
294 element elementTag cfg child = fst <$> makeElement elementTag cfg child
@@ -312,7 +312,7 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
312 Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
312 Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
313 checkedChangedByUI <- wrapDomEvent domInputElement (`on` Element.click) $ do
313 checkedChangedByUI <- wrapDomEvent domInputElement (`on` Element.click) $ do
314 Input.getChecked domInputElement
314 Input.getChecked domInputElement
315− checkedChangedBySetChecked <- case (_inputElementConfig_setChecked cfg) of
315+ checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
316 Nothing -> return never
316 Nothing -> return never
317 Just eNewchecked -> performEvent $ ffor eNewchecked $ \newChecked -> do
317 Just eNewchecked -> performEvent $ ffor eNewchecked $ \newChecked -> do
318 oldChecked <- Input.getChecked domInputElement
318 oldChecked <- Input.getChecked domInputElement