init to ghcide

Author: soulomoon

ghcide/cabal.project

@@ -0,0 +1,6 @@
+packages:
+         ./
+
+allow-newer:
+  base
+  , ghc

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

@@ -470,7 +470,7 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
             core_file = codeGutsToCoreFile iface_hash guts
             iface_hash = getModuleHash final_iface
         core_hash1 <- atomicFileWrite se core_fp $ \fp ->
-          writeBinCoreFile fp core_file
+          writeBinCoreFile (ms_hspp_opts ms) fp core_file
         -- We want to drop references to guts and read in a serialized, compact version
         -- of the core file from disk (as it is deserialised lazily)
         -- This is because we don't want to keep the guts in memory for every file in

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

@@ -230,7 +230,12 @@ module Development.IDE.GHC.Compat.Core (
     ModuleOrigin(..),
     PackageName(..),
     -- * Linker
+#if !MIN_VERSION_ghc(9,11,0)
     Unlinked(..),
+#else
+    LinkablePart(..),
+    Unlinked,
+#endif
     Linkable(..),
     unload,
     -- * Hooks
@@ -537,6 +542,9 @@ import           GHC.Utils.Error             (mkPlainErrorMsgEnvelope)
 import           GHC.Utils.Panic
 import           GHC.Utils.TmpFs
 import           Language.Haskell.Syntax     hiding (FunDep)
+#if MIN_VERSION_ghc(9,11,0)
+import           System.OsPath.Types (OsPath)
+#endif
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
@@ -549,7 +557,11 @@ import           GHC.Types.Avail             (greNamePrintableName)
 import           GHC.Hs                      (SrcSpanAnn')
 #endif
 
+#if !MIN_VERSION_ghc(9,11,0)
 mkHomeModLocation :: DynFlags -> ModuleName -> FilePath -> IO Module.ModLocation
+#else
+mkHomeModLocation :: DynFlags -> ModuleName -> OsPath -> IO Module.ModLocation
+#endif
 mkHomeModLocation df mn f = pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn f
 
 pattern RealSrcSpan :: SrcLoc.RealSrcSpan -> Maybe BufSpan -> SrcLoc.SrcSpan
@@ -709,7 +721,7 @@ pattern GRE{gre_name, gre_par, gre_lcl, gre_imp} <- RdrName.GRE
 #endif
     ,gre_par, gre_lcl, gre_imp = (toList -> gre_imp)}
 
-collectHsBindsBinders :: CollectPass p => Bag (XRec p (HsBindLR p idR)) -> [IdP p]
+collectHsBindsBinders :: CollectPass p => LHsBinds p -> [IdP p]
 collectHsBindsBinders x = GHC.collectHsBindsBinders CollNoDictBinders x
 
 
@@ -790,3 +802,8 @@ mkSimpleTarget df fp = Target (TargetFile fp Nothing) True (homeUnitId_ df) Noth
 #if MIN_VERSION_ghc(9,7,0)
 lookupGlobalRdrEnv gre_env occ = lookupGRE gre_env (LookupOccName occ AllRelevantGREs)
 #endif
+
+
+#if MIN_VERSION_ghc(9,11,0)
+type Unlinked = LinkablePart
+#endif

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

@@ -40,10 +40,12 @@ import           GHC.Utils.Logger
 import           GHC.Utils.Outputable
 import           GHC.Utils.Panic.Plain
 
+#if !MIN_VERSION_ghc(9,11,0)
 hscTypecheckRenameWithDiagnostics :: HscEnv -> ModSummary -> HsParsedModule
                    -> IO ((TcGblEnv, RenamedStuff), Messages GhcMessage)
 hscTypecheckRenameWithDiagnostics hsc_env mod_summary rdr_module =
     runHsc' hsc_env $ hsc_typecheck True mod_summary (Just rdr_module)
+#endif
 
 -- ============================================================================
 -- DO NOT EDIT - Refer to top of file

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

@@ -21,7 +21,11 @@ import           GHC.Iface.Errors.Types                (IfaceMessage)
 #endif
 
 writeIfaceFile :: HscEnv -> FilePath -> ModIface -> IO ()
+#if MIN_VERSION_ghc(9,11,0)
+writeIfaceFile env fp iface = Iface.writeIface (hsc_logger env) (targetProfile $ hsc_dflags env) (Iface.flagsToIfCompression $ hsc_dflags env) fp iface
+#else
 writeIfaceFile env fp iface = Iface.writeIface (hsc_logger env) (targetProfile $ hsc_dflags env) fp iface
+#endif
 
 cannotFindModule :: HscEnv -> ModuleName -> FindResult -> SDoc
 cannotFindModule env modname fr =

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

@@ -16,14 +16,18 @@ module Development.IDE.GHC.Compat.Parser (
     Development.IDE.GHC.Compat.Parser.pm_mod_summary,
     Development.IDE.GHC.Compat.Parser.pm_extra_src_files,
     -- * API Annotations
+#if !MIN_VERSION_ghc(9,11,0)
     Anno.AnnKeywordId(..),
+#endif
     pattern EpaLineComment,
     pattern EpaBlockComment
     ) where
 
 import           Development.IDE.GHC.Compat.Core
 import           Development.IDE.GHC.Compat.Util
+#if !MIN_VERSION_ghc(9,11,0)
 import qualified GHC.Parser.Annotation           as Anno
+#endif
 import qualified GHC.Parser.Lexer                as Lexer
 import           GHC.Types.SrcLoc                (PsSpan (..))
 

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

@@ -87,14 +87,18 @@ readBinCoreFile name_cache fat_hi_path = do
     return (file, fp)
 
 -- | Write a core file
-writeBinCoreFile :: FilePath -> CoreFile -> IO Fingerprint
-writeBinCoreFile core_path fat_iface = do
+writeBinCoreFile :: DynFlags -> FilePath -> CoreFile -> IO Fingerprint
+writeBinCoreFile dflag core_path fat_iface = do
     bh <- openBinMem initBinMemSize
 
     let quietTrace =
           QuietBinIFace
 
+#if !MIN_VERSION_ghc(9,11,0)
     putWithUserData quietTrace bh fat_iface
+#else
+    putWithUserData (Iface.flagsToIfCompression dflag) quietTrace bh fat_iface
+#endif
 
     -- And send the result to the file
     writeBinMem bh core_path