501a4a1 · ghcide · git.iko.soy

on master help sign in

Make it explicit that contract key maintainers are computed from key (#1527)

501a4a1Martin Huschenbett7 years ago

src/Development/IDE/Compat.hs+5−2

@@ -6,6 +6,7 @@

6-- | Attempt at hiding the GHC version differences we can.

7module Development.IDE.Compat(

8 HieFile(..),

9+ HieFileResult(..),

9 mkHieFile,

10 mkHieFile,

10 writeHieFile,

11 writeHieFile,

11 readHieFile

12 readHieFile

@@ -30,9 +31,11 @@ mkHieFile _ _ _ = return (HieFile () [])

30writeHieFile :: FilePath -> HieFile -> IO ()

31writeHieFile :: FilePath -> HieFile -> IO ()

31writeHieFile _ _ = return ()

32writeHieFile _ _ = return ()

33−readHieFile :: NameCache -> FilePath -> IO (HieFile, ())

34+readHieFile :: NameCache -> FilePath -> IO (HieFileResult, ())

34−readHieFile _ _ = return (HieFile () [], ())

35+readHieFile _ _ = return (HieFileResult $ HieFile () [], ())

36data HieFile = HieFile {hie_module :: (), hie_exports :: [AvailInfo]}

37data HieFile = HieFile {hie_module :: (), hie_exports :: [AvailInfo]}

39+data HieFileResult = HieFileResult {hie_file_result :: HieFile}

40+

38#endif

41#endif

src/Development/IDE/State/Rules.hs+1−1

@@ -306,7 +306,7 @@ getHieFileRule =

306 defineNoFile $ \(GetHieFile f) -> do

307 u <- liftIO $ mkSplitUniqSupply 'a'

308 let nameCache = initNameCache u []

309− liftIO $ fmap fst $ readHieFile nameCache f

309+ liftIO $ fmap (hie_file_result . fst) $ readHieFile nameCache f

310

311-- | A rule that wires per-file rules together

312mainRule :: Rules ()