From 629bae6f51613c4cef1daa066ef3fddaefbdbcd7 Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Sun, 1 Jun 2025 19:57:20 +0200 Subject: [PATCH 1/2] Refactor Bool property checks to explicit `Just True` comparisons - Replace fromMaybe False maybeProp with (Just True == maybeProp) for clarity and precision - Simplify tryDecodeKey by removing unnecessary do block and using direct case expression - Improve readability by making boolean property checks more explicit --- src/Formatting/Rules.hs | 4 ++-- src/Parsing/DSL.hs | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Formatting/Rules.hs b/src/Formatting/Rules.hs index dc6c5cd..39048ff 100644 --- a/src/Formatting/Rules.hs +++ b/src/Formatting/Rules.hs @@ -134,14 +134,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 From b98911e57aea03ddce8bee7a67dfba1ab99e4cb1 Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Sun, 1 Jun 2025 20:05:05 +0200 Subject: [PATCH 2/2] Removed Data.Maybe import --- src/Formatting/Rules.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Formatting/Rules.hs b/src/Formatting/Rules.hs index 39048ff..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))