diff --git a/src/Formatting/Rules.hs b/src/Formatting/Rules.hs index dc6c5cd..46acb9c 100644 --- a/src/Formatting/Rules.hs +++ b/src/Formatting/Rules.hs @@ -25,7 +25,6 @@ import Core.NodePath (NodeSelector (..)) import Data.Function (on) import Data.List (find, intercalate) import Data.Map (Map) -import Data.Maybe (fromMaybe) import Data.Sequence (Seq (..)) import Data.Text (Text) import Data.Type.Equality ((:~:) (Refl)) @@ -134,14 +133,14 @@ lookupProp targetKey m = applyPadLogic :: (Int -> Bool -> Node -> Text) -> Rule -> Node -> Text applyPadLogic f rs n = let padAmount = sum $ lookupProp PadAmount rs - padZeros = fromMaybe False $ lookupProp PadZeros rs + padZeros = (Just True == lookupProp PadZeros rs) in f padAmount padZeros n noComplexNewLine :: RuleSet -> NC.NodeCursor -> Bool noComplexNewLine rs cursor = let ps = findPropertiesForCursor cursor rs maybeProp = lookupProp NoComplexNewLine ps - in fromMaybe False maybeProp + in (Just True == maybeProp) comparePC :: NodePatternSelector -> NC.NodeBreadcrumb -> Bool comparePC AnyKey (NC.ObjectIndexAndKey (_, _)) = True diff --git a/src/Parsing/DSL.hs b/src/Parsing/DSL.hs index 737e9cf..f4f4c90 100644 --- a/src/Parsing/DSL.hs +++ b/src/Parsing/DSL.hs @@ -56,10 +56,9 @@ patternParser :: Parser NodePattern patternParser = NodePattern . Seq.fromList <$> MP.some patternSelectorParser tryDecodeKey :: [Word8] -> (Text -> Maybe SomeKey) -> Maybe SomeKey -tryDecodeKey bs f = do - case decodeUtf8' (BS.pack bs) of - Right text' -> f text' - Left _ -> Nothing +tryDecodeKey bs f = case decodeUtf8' (BS.pack bs) of + Right text' -> f text' + Left _ -> Nothing propertyParser :: SomeKey -> Parser (SomeKey, SomeProperty) propertyParser (SomeKey key) = do