From 7ecdd21874e1b9c638502c47d61facd3be581c65 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Thu, 19 Mar 2020 12:49:46 +0000 Subject: [PATCH] Pass correct SafeHaskell information to mkIfaceTc (#489) Seems like this was never implemented the first time, woops! Fixes #424 --- src/Development/IDE/Core/Compile.hs | 5 +++-- test/exe/Main.hs | 31 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/Development/IDE/Core/Compile.hs b/src/Development/IDE/Core/Compile.hs index b44cc1e0..e8a70925 100644 --- a/src/Development/IDE/Core/Compile.hs +++ b/src/Development/IDE/Core/Compile.hs @@ -234,10 +234,11 @@ mkTcModuleResult -> m TcModuleResult mkTcModuleResult tcm = do session <- getSession + let sf = modInfoSafe (tm_checked_module_info tcm) #if MIN_GHC_API_VERSION(8,10,0) - iface <- liftIO $ mkIfaceTc session Sf_None details tcGblEnv + iface <- liftIO $ mkIfaceTc session sf details tcGblEnv #else - (iface, _) <- liftIO $ mkIfaceTc session Nothing Sf_None details tcGblEnv + (iface, _) <- liftIO $ mkIfaceTc session Nothing sf details tcGblEnv #endif let mod_info = HomeModInfo iface details Nothing return $ TcModuleResult tcm mod_info diff --git a/test/exe/Main.hs b/test/exe/Main.hs index fd286c77..a9891aff 100644 --- a/test/exe/Main.hs +++ b/test/exe/Main.hs @@ -63,6 +63,7 @@ main = defaultMainWithRerun $ testGroup "HIE" , pluginTests , preprocessorTests , thTests + , safeTests , unitTests , haddockTests , positionMappingTests @@ -1485,6 +1486,36 @@ preprocessorTests = testSessionWait "preprocessor" $ do ) ] + +safeTests :: TestTree +safeTests = + testGroup + "SafeHaskell" + [ -- Test for https://github.com/digital-asset/ghcide/issues/424 + testSessionWait "load" $ do + let sourceA = + T.unlines + ["{-# LANGUAGE Trustworthy #-}" + ,"module A where" + ,"import System.IO.Unsafe" + ,"import System.IO" + ,"trustWorthyId :: a -> a" + ,"trustWorthyId i = unsafePerformIO $ do" + ," putStrLn \"I'm safe\"" + ," return i"] + sourceB = + T.unlines + ["{-# LANGUAGE Safe #-}" + ,"module B where" + ,"import A" + ,"safeId :: a -> a" + ,"safeId = trustWorthyId" + ] + + _ <- openDoc' "A.hs" "haskell" sourceA + _ <- openDoc' "B.hs" "haskell" sourceB + expectNoMoreDiagnostics 1 ] + thTests :: TestTree thTests = testGroup