Skip to content

Commit 60264bc

Browse files
committed
Move makeHieAstResult function to RuleTypes
1 parent 192446b commit 60264bc

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

ghcide/src/Development/IDE/Core/RuleTypes.hs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,19 @@ data HieAstResult
217217
-- ^ Is this hie file loaded from the disk, or freshly computed?
218218
}
219219

220+
-- | Make an HieAstResult from a loaded HieFile
221+
makeHieAstResult :: HieFile -> HieAstResult
222+
makeHieAstResult hieFile =
223+
HAR
224+
(hie_module hieFile)
225+
hieAsts
226+
(generateReferencesMap $ M.elems $ getAsts hieAsts)
227+
mempty
228+
(HieFromDisk hieFile)
229+
where
230+
hieAsts :: HieASTs TypeIndex
231+
hieAsts = hie_asts hieFile
232+
220233
data HieKind a where
221234
HieFromDisk :: !HieFile -> HieKind TypeIndex
222235
HieFresh :: HieKind Type

ghcide/src/Development/IDE/Core/Rules.hs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -589,18 +589,6 @@ getHieAstsRule recorder =
589589
tmr <- use_ TypeCheck f
590590
hsc <- hscEnv <$> use_ GhcSessionDeps f
591591
getHieAstRuleDefinition f hsc tmr
592-
where
593-
makeHieAstResult :: Compat.HieFile -> HieAstResult
594-
makeHieAstResult hieFile =
595-
HAR
596-
(Compat.hie_module hieFile)
597-
hieAsts
598-
(Compat.generateReferencesMap $ M.elems $ getAsts hieAsts)
599-
mempty
600-
(HieFromDisk hieFile)
601-
where
602-
hieAsts :: HieASTs TypeIndex
603-
hieAsts = Compat.hie_asts hieFile
604592

605593
persistentHieFileRule :: Recorder (WithPriority Log) -> Rules ()
606594
persistentHieFileRule recorder = addPersistentRule GetHieAst $ \file -> runMaybeT $ do

0 commit comments

Comments
 (0)