voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
Dmitry Zuikov 2024-09-10 06:58:35 +03:00
parent fd4d9f1f55
commit 9bed650a0f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixme-new/lib/Fixme/Run.hs
View File

@ -371,13 +371,13 @@ runTop forms = do
fxs0 <- scanFiles fxs0 <- scanFiles
fxs <- flip filterM fxs0 $ \fme -> do fxs <- flip filterM fxs0 $ \fme -> do
let fn = HM.lookup "file" (fixmeAttr fme) <&> Text.unpack . coerce let fn = fixmeGet "file" fme <&> Text.unpack . coerce
seen <- maybe1 fn (pure False) selectIsAlreadyScanned seen <- maybe1 fn (pure False) selectIsAlreadyScanned
pure (not seen) pure (not seen)
withState $ transactional do withState $ transactional do
for_ fxs $ \fme -> do for_ fxs $ \fme -> do
let fn = HM.lookup "file" (fixmeAttr fme) <&> Text.unpack . coerce let fn = fixmeGet "file" fme <&> Text.unpack . coerce
fmeRich <- lift $ maybe1 fn (pure mempty) (`getMetaDataFromGitBlame` fme) fmeRich <- lift $ maybe1 fn (pure mempty) (`getMetaDataFromGitBlame` fme)
notice $ "fixme" <+> pretty (fixmeKey fme) notice $ "fixme" <+> pretty (fixmeKey fme)
insertFixme (fmeRich <> fme) insertFixme (fmeRich <> fme)

5
fixme-new/lib/Fixme/Types.hs
View File

@ -164,6 +164,11 @@ instance Semigroup Fixme where
, fixmeAttr = fixmeAttr a <> fixmeAttr b , fixmeAttr = fixmeAttr a <> fixmeAttr b
} }
fixmeGet :: FixmeAttrName -> Fixme -> Maybe FixmeAttrVal
fixmeGet name Fixme{..} = HM.lookup name fixmeAttr
fixmeSet :: FixmeAttrName -> FixmeAttrVal -> Fixme -> Fixme
fixmeSet name val fx = fx { fixmeAttr = HM.insert name val (fixmeAttr fx) }
instance FromJSON FixmeOffset where instance FromJSON FixmeOffset where
parseJSON = \case parseJSON = \case