501a4a1 · ghcide · git.iko.soy

git.iko.soy/ghcide

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

* Use ghc-lib-0.20190604 * HieFile fix * Update to ghc-lib-0.20190604.1 * Make maintainers depend directly on key * Remove useless tests * Adjust documentation * Add release notes * Simplify some code * Fix tests to use new syntax * Fix template desugaring docs * Fix more tests

commit501a4a1b9f0b0a8c7d7342a4e2bccfd0c061bcf7 authorMartin Huschenbett <martin.huschenbett@posteo.me> dateWed 5 Jun 2019, 10:27 (7 years ago) parentb6fd3c1

2 files changed+6−3

compare with master

unifiedsplit

src/Development/IDE/Compat.hs+5−2 src/Development/IDE/State/Rules.hs+1−1

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

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

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

77module Development.IDE.Compat(

88 HieFile(..),

9+ HieFileResult(..),

910 mkHieFile,

1011 writeHieFile,

1112 readHieFile

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

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

3132writeHieFile _ _ = return ()

3233

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

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

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

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

3536

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

3738

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

40+

3841#endif

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

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

306306 defineNoFile $ \(GetHieFile f) -> do

307307 u <- liftIO $ mkSplitUniqSupply 'a'

308308 let nameCache = initNameCache u []

309− liftIO $ fmap fst $ readHieFile nameCache f

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

310310

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

312312mainRule :: Rules ()