Skip to content
Snippets Groups Projects
Commit 2464f639 authored by stuebinm's avatar stuebinm
Browse files

small fixes

parent c74a9c7f
Branches
No related tags found
No related merge requests found
......@@ -62,12 +62,11 @@ newtype MissingAsset = MissingAsset MissingDep
resultIsFatal :: LintConfig' -> DirResult -> Bool
resultIsFatal config res =
(not (null (dirresultMissingAssets res)))
&& (configMaxLintLevel config) <= maxObservedLevel
not (null (dirresultMissingAssets res))
&& configMaxLintLevel config <= maxObservedLevel
where maxObservedLevel = maximum
. map hintLevel
. concatMap keys
. map mapresultLayer
. concatMap (keys . mapresultLayer)
. elems
. dirresultMaps
$ res
......@@ -134,16 +133,16 @@ recursiveCheckDir :: LintConfig' -> FilePath -> FilePath -> IO DirResult
recursiveCheckDir config prefix root = do
linted <- recursiveCheckDir' config prefix [root] mempty mempty
mAssets <- missingAssets prefix linted
pure $ linted <> mempty { dirresultDeps = missingDeps linted
pure $ linted <> mempty { dirresultDeps = missingDeps root linted
, dirresultMissingAssets = mAssets
}
-- | Given a (partially) completed DirResult, check which local
-- maps are referenced but do not actually exist.
missingDeps :: DirResult -> [MissingDep]
missingDeps res =
let simple = M.insert "main.json" [] used \\ M.union defined trivial
missingDeps :: FilePath -> DirResult -> [MissingDep]
missingDeps entrypoint res =
let simple = M.insert (T.pack entrypoint) [] used \\ M.union defined trivial
in M.foldMapWithKey (\f n -> [MissingDep f n]) simple
where
-- which maps are linked somewhere?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment