Merge branch 'master' into mangoiv/concurrency-bug-fixes

Author: mergify[bot]

CODEOWNERS

@@ -4,7 +4,6 @@
 /hls-graph @wz1000
 /hls-plugin-api @michaelpj @fendor
 /hls-test-utils @fendor
-/hie-compat @wz1000
 
 # HLS main
 /src @fendor

RELEASING.md

@@ -9,7 +9,6 @@
 - [ ] bump package versions in all `*.cabal` files (same version as hls)
   - HLS uses lockstep versioning. The core packages and all plugins use the same version number, and only support exactly this version.
     - Exceptions:
-      - `hie-compat` requires no automatic version bump.
       - `shake-bench` is an internal testing tool, not exposed to the outside world. Thus, no version bump required for releases.
   - For updating cabal files, the following script can be used:
     - ```sh

cabal.project

@@ -1,6 +1,5 @@
 packages:
          ./
-         ./hie-compat
          ./shake-bench
          ./hls-graph
          ./ghcide

docs/contributing/contributing.md

@@ -197,7 +197,6 @@ pre-commit install
 #### Why are some components excluded from automatic formatting?
 
 - `test/testdata` and `test/data` are excluded because we want to test formatting plugins.
-- `hie-compat` is excluded because we want to keep its code as close to GHC as possible.
 
 ## Plugin tutorial
 

ghcide/ghcide.cabal

@@ -74,7 +74,6 @@ library
     , haddock-library              >=1.8      && <1.12
     , hashable
     , hie-bios                     ^>=0.16.0
-    , hie-compat                   ^>=0.3.0.0
     , hiedb                        ^>= 0.7.0.0
     , hls-graph                    == 2.11.0.0
     , hls-plugin-api               == 2.11.0.0

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

@@ -28,6 +28,7 @@ import           Development.IDE.Graph
 import qualified Development.IDE.Spans.AtPoint        as AtPoint
 import           Development.IDE.Types.HscEnvEq       (hscEnv)
 import           Development.IDE.Types.Location
+import           GHC.Iface.Ext.Types                  (Identifier)
 import qualified HieDb
 import           Language.LSP.Protocol.Types          (DocumentHighlight (..),
                                                        SymbolInformation (..),

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

@@ -109,6 +109,7 @@ import qualified Data.Set                                     as Set
 import qualified GHC                                          as G
 import           GHC.Core.Lint.Interactive
 import           GHC.Driver.Config.CoreToStg.Prep
+import           GHC.Iface.Ext.Types                          (HieASTs)
 import qualified GHC.Runtime.Loader                           as Loader
 import           GHC.Tc.Gen.Splice
 import           GHC.Types.Error
@@ -145,6 +146,7 @@ import           Development.IDE.GHC.Compat                   hiding
 import qualified Data.List.NonEmpty                           as NE
 import           Data.Time                                    (getCurrentTime)
 import           GHC.Driver.Env                               (hsc_all_home_unit_ids)
+import           GHC.Iface.Ext.Types                          (NameEntityInfo)
 #endif
 
 #if MIN_VERSION_ghc(9,12,0)

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

@@ -34,6 +34,9 @@ import           Development.IDE.Import.DependencyInformation
 import           Development.IDE.Types.HscEnvEq               (HscEnvEq)
 import           Development.IDE.Types.KnownTargets
 import           GHC.Generics                                 (Generic)
+import           GHC.Iface.Ext.Types                          (HieASTs,
+                                                               TypeIndex)
+import           GHC.Iface.Ext.Utils                          (RefMap)
 
 import           Data.ByteString                              (ByteString)
 import           Data.Text.Utf16.Rope.Mixed                   (Rope)

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

@@ -138,6 +138,8 @@ import           Development.IDE.Types.HscEnvEq
 import           Development.IDE.Types.Location
 import           Development.IDE.Types.Options
 import qualified Development.IDE.Types.Shake                  as Shake
+import           GHC.Iface.Ext.Types                          (HieASTs (..))
+import           GHC.Iface.Ext.Utils                          (generateReferencesMap)
 import qualified GHC.LanguageExtensions                       as LangExt
 import           HIE.Bios.Ghc.Gap                             (hostIsDynamic)
 import qualified HieDb
@@ -510,7 +512,7 @@ persistentHieFileRule recorder = addPersistentRule GetHieAst $ \file -> runMaybe
   (currentSource, ver) <- liftIO $ case M.lookup (filePathToUri' file) vfsData of
     Nothing -> (,Nothing) . T.decodeUtf8 <$> BS.readFile (fromNormalizedFilePath file)
     Just vf -> pure (virtualFileText vf, Just $ virtualFileVersion vf)
-  let refmap = Compat.generateReferencesMap . Compat.getAsts . Compat.hie_asts $ res
+  let refmap = generateReferencesMap . getAsts . Compat.hie_asts $ res
       del = deltaFromDiff (T.decodeUtf8 $ Compat.hie_hs_src res) currentSource
   pure (HAR (Compat.hie_module res) (Compat.hie_asts res) refmap mempty (HieFromDisk res),del,ver)
 
@@ -538,8 +540,8 @@ getHieAstRuleDefinition f hsc tmr = do
           liftIO $ writeAndIndexHieFile hsc se modSummary f exports asts source
     _ -> pure []
 
-  let refmap = Compat.generateReferencesMap . Compat.getAsts <$> masts
-      typemap = AtPoint.computeTypeReferences . Compat.getAsts <$> masts
+  let refmap = generateReferencesMap . getAsts <$> masts
+      typemap = AtPoint.computeTypeReferences . getAsts <$> masts
   pure (diags <> diagsWrite, HAR (ms_mod $ tmrModSummary tmr) <$> masts <*> refmap <*> typemap <*> pure HieFresh)
 
 getImportMapRule :: Recorder (WithPriority Log) -> Rules ()

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -45,8 +45,6 @@ module Development.IDE.GHC.Compat(
     readHieFile,
     setHieDir,
     dontWriteHieFiles,
-    module Compat.HieTypes,
-    module Compat.HieUtils,
     -- * Compat modules
     module Development.IDE.GHC.Compat.Core,
     module Development.IDE.GHC.Compat.Env,
@@ -112,14 +110,8 @@ module Development.IDE.GHC.Compat(
 #if MIN_VERSION_ghc(9,7,0)
     tcInitTidyEnv,
 #endif
-    ) where
 
-import           Compat.HieAst                           (enrichHie)
-import           Compat.HieBin
-import           Compat.HieTypes                         hiding
-                                                         (nodeAnnotations)
-import qualified Compat.HieTypes                         as GHC (nodeAnnotations)
-import           Compat.HieUtils
+    ) where
 import           Control.Applicative                     ((<|>))
 import qualified Data.ByteString                         as BS
 import           Data.Coerce                             (coerce)
@@ -146,12 +138,18 @@ import           GHC.Core.Tidy                           (tidyExpr)
 import           GHC.CoreToStg.Prep                      (corePrepPgm)
 import qualified GHC.CoreToStg.Prep                      as GHC
 import           GHC.Driver.Hooks                        (hscCompileCoreExprHook)
+import           GHC.Iface.Ext.Types                     hiding
+                                                         (nodeAnnotations)
+import qualified GHC.Iface.Ext.Types                     as GHC (nodeAnnotations)
+import           GHC.Iface.Ext.Utils
 
 import           GHC.ByteCode.Asm                        (bcoFreeNames)
 import           GHC.Core
 import           GHC.Data.FastString
 import           GHC.Data.StringBuffer
 import           GHC.Driver.Session                      hiding (ExposePackage)
+import           GHC.Iface.Ext.Ast                       (enrichHie)
+import           GHC.Iface.Ext.Binary
 import           GHC.Iface.Make                          (mkIfaceExports)
 import           GHC.SysTools.Tasks                      (runPp, runUnlit)
 import           GHC.Types.Annotations                   (AnnTarget (ModuleTarget),