ghcide 1.9.0.0 → 1.9.1.0

raw patch · 4 files changed

+52/−7 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ghcide.cabal +1/−1
• src/Development/IDE/Core/Compile.hs +29/−4
• src/Development/IDE/Core/FileStore.hs +18/−0
• src/Development/IDE/GHC/Compat.hs +4/−2

@@ -2,7 +2,7 @@ build-type:         Simple category:           Development name:               ghcide-version:            1.9.0.0+version:            1.9.1.0 license:            Apache-2.0 license-file:       LICENSE author:             Digital Asset and Ghcide contributors

@@ -70,7 +70,7 @@ import           Data.Tuple.Extra                  (dupe) import           Data.Unique                       as Unique import           Debug.Trace-import           Development.IDE.Core.FileStore    (resetInterfaceStore)+import           Development.IDE.Core.FileStore    (resetInterfaceStore, shareFilePath) import           Development.IDE.Core.Preprocessor import           Development.IDE.Core.RuleTypes import           Development.IDE.Core.Shake@@ -435,7 +435,31 @@ -- anywhere. So we zero it out. -- The field is not serialized or deserialised from disk, so we don't need to remove it -- while reading an iface from disk, only if we just generated an iface in memory+-- +++-- | See https://github.com/haskell/haskell-language-server/issues/3450+-- GHC's recompilation avoidance in the presense of TH is less precise than+-- HLS. To avoid GHC from pessimising HLS, we filter out certain dependency information+-- that we track ourselves. See also Note [Recompilation avoidance in the presence of TH]+filterUsages :: [Usage] -> [Usage]+#if MIN_VERSION_ghc(9,3,0)+filterUsages = filter $ \case UsageHomeModuleInterface{} -> False+                              _ -> True+#else+filterUsages = id+#endif++-- | Mitigation for https://gitlab.haskell.org/ghc/ghc/-/issues/22744+shareUsages :: ModIface -> ModIface+shareUsages iface = iface {mi_usages = usages}+  where usages = map go (mi_usages iface)+        go usg@UsageFile{} = usg {usg_file_path = fp}+          where !fp = shareFilePath (usg_file_path usg)+        go usg = usg++ mkHiFileResultNoCompile :: HscEnv -> TcModuleResult -> IO HiFileResult mkHiFileResultNoCompile session tcm = do   let hsc_env_tmp = hscSetFlags (ms_hspp_opts ms) session@@ -444,7 +468,7 @@   details <- makeSimpleDetails hsc_env_tmp tcGblEnv   sf <- finalSafeMode (ms_hspp_opts ms) tcGblEnv   iface' <- mkIfaceTc hsc_env_tmp sf details ms tcGblEnv-  let iface = iface' { mi_globals = Nothing } -- See Note [Clearing mi_globals after generating an iface]+  let iface = iface' { mi_globals = Nothing, mi_usages = filterUsages (mi_usages iface') } -- See Note [Clearing mi_globals after generating an iface]   pure $! mkHiFileResult ms iface details (tmrRuntimeModules tcm) Nothing  mkHiFileResultCompile@@ -486,7 +510,7 @@   let !partial_iface = force (mkPartialIface session details simplified_guts)   final_iface' <- mkFullIface session partial_iface #endif-  let final_iface = final_iface' {mi_globals = Nothing} -- See Note [Clearing mi_globals after generating an iface]+  let final_iface = final_iface' {mi_globals = Nothing, mi_usages = filterUsages (mi_usages final_iface')} -- See Note [Clearing mi_globals after generating an iface]    -- Write the core file now   core_file <- case mguts of@@ -1462,7 +1486,8 @@           regenerate linkableNeeded      case (mb_checked_iface, recomp_iface_reqd) of-      (Just iface, UpToDate) -> do+      (Just iface', UpToDate) -> do+             let iface = shareUsages iface'              details <- liftIO $ mkDetailsFromIface sessionWithMsDynFlags iface              -- parse the runtime dependencies from the annotations              let runtime_deps

@@ -18,6 +18,7 @@     getModTime,     isWatchSupported,     registerFileWatches,+    shareFilePath,     Log(..)     ) where @@ -28,6 +29,8 @@ import           Control.Monad.Extra import           Control.Monad.IO.Class import qualified Data.ByteString                              as BS+import qualified Data.HashMap.Strict                          as HashMap+import           Data.IORef import qualified Data.Text                                    as T import qualified Data.Text.Utf16.Rope                         as Rope import           Data.Time@@ -76,6 +79,7 @@ import qualified Language.LSP.Types.Capabilities              as LSP import           Language.LSP.VFS import           System.FilePath+import           System.IO.Unsafe  data Log   = LogCouldNotIdentifyReverseDeps !NormalizedFilePath@@ -297,3 +301,17 @@               , Just True <- _dynamicRegistration                 -> True               | otherwise -> False++filePathMap :: IORef (HashMap.HashMap FilePath FilePath)+filePathMap = unsafePerformIO $ newIORef HashMap.empty+{-# NOINLINE filePathMap #-}++shareFilePath :: FilePath -> FilePath+shareFilePath k = unsafePerformIO $ do+  atomicModifyIORef' filePathMap $ \km ->+    let new_key = HashMap.lookup k km+    in case new_key of+          Just v -> (km, v)+          Nothing -> (HashMap.insert k k km, k)+{-# NOINLINE shareFilePath  #-}+ 

@@ -43,6 +43,8 @@     myCoreToStgExpr, #endif +    Usage(..),+     FastStringCompat,     bytesFS,     mkFastStringByteString,@@ -167,9 +169,9 @@ import           GHC.Unit.Home.ModInfo                 (HomePackageTable,                                                         lookupHpt) #if MIN_VERSION_ghc(9,3,0)-import GHC.Unit.Module.Deps (Dependencies(dep_direct_mods))+import GHC.Unit.Module.Deps (Dependencies(dep_direct_mods), Usage(..)) #else-import GHC.Unit.Module.Deps (Dependencies(dep_mods))+import GHC.Unit.Module.Deps (Dependencies(dep_mods), Usage(..)) #endif #else import           GHC.CoreToByteCode                    (coreExprToBCOs)