Replace MIN_GHC_API_VERSION with MIN_VERSION_ghc

Author: anka-213

ghcide/session-loader/Development/IDE/Session.hs

@@ -504,7 +504,7 @@ cradleToOptsAndLibDir cradle file = do
 emptyHscEnv :: IORef NameCache -> FilePath -> IO HscEnv
 emptyHscEnv nc libDir = do
     env <- runGhc (Just libDir) getSession
-#if !MIN_GHC_API_VERSION(9,0,0)
+#if !MIN_VERSION_ghc(9,0,0)
     -- This causes ghc9 to crash
     initDynLinker env
 #endif

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

@@ -57,7 +57,7 @@ import           LoadIface                         (loadModuleInterface)
 
 import           Lexer
 import qualified Parser
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
 import           Control.DeepSeq                   (force, rnf)
 #else
 import           Control.DeepSeq                   (rnf)
@@ -81,7 +81,7 @@ import           MkIface
 import           StringBuffer                      as SB
 import           TcIface                           (typecheckIface)
 import           TcRnMonad                         hiding (newUnique)
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
 import           GHC.Builtin.Names
 import           GHC.Iface.Recomp
 import           GHC.Tc.Gen.Splice
@@ -241,7 +241,7 @@ mkHiFileResultNoCompile session tcm = do
       tcGblEnv = tmrTypechecked tcm
   details <- makeSimpleDetails hsc_env_tmp tcGblEnv
   sf <- finalSafeMode (ms_hspp_opts ms) tcGblEnv
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
   iface <- mkIfaceTc hsc_env_tmp sf details tcGblEnv
 #else
   (iface, _) <- mkIfaceTc hsc_env_tmp Nothing sf details tcGblEnv
@@ -275,10 +275,10 @@ mkHiFileResultCompile session' tcm simplified_guts ltype = catchErrs $ do
         (guts, details) <- tidyProgram session simplified_guts
         (diags, linkable) <- genLinkable session ms guts
         pure (linkable, details, diags)
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
   let !partial_iface = force (mkPartialIface session details simplified_guts)
   final_iface <- mkFullIface session partial_iface Nothing
-#elif MIN_GHC_API_VERSION(8,10,0)
+#elif MIN_VERSION_ghc(8,10,0)
   let !partial_iface = force (mkPartialIface session details simplified_guts)
   final_iface <- mkFullIface session partial_iface
 #else
@@ -340,18 +340,18 @@ generateObjectCode session summary guts = do
               (warnings, dot_o_fp) <-
                 withWarnings "object" $ \_tweak -> do
                       let summary' = _tweak summary
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
                           target = defaultObjectTarget $ hsc_dflags session
 #else
                           target = defaultObjectTarget $ targetPlatform $ hsc_dflags session
 #endif
                           session' = session { hsc_dflags = updOptLevel 0 $ (ms_hspp_opts summary') { outputFile = Just dot_o , hscTarget = target}}
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
                       (outputFilename, _mStub, _foreign_files, _cinfos) <- hscGenHardCode session' guts
 #else
                       (outputFilename, _mStub, _foreign_files) <- hscGenHardCode session' guts
 #endif
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
                                 (ms_location summary')
 #else
                                 summary'
@@ -374,7 +374,7 @@ generateByteCode hscEnv summary guts = do
                       let summary' = _tweak summary
                           session = hscEnv { hsc_dflags = ms_hspp_opts summary' }
                       hscInteractive session guts
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
                                 (ms_location summary')
 #else
                                 summary'
@@ -433,7 +433,7 @@ unnecessaryDeprecationWarningFlags
     , Opt_WarnUnusedMatches
     , Opt_WarnUnusedTypePatterns
     , Opt_WarnUnusedForalls
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
     , Opt_WarnUnusedRecordWildcards
 #endif
     , Opt_WarnInaccessibleCode
@@ -478,7 +478,7 @@ generateHieAsts hscEnv tcm =
     -- don't export an interface which allows for additional information to be added to hie files.
     let fake_splice_binds = listToBag (map (mkVarBind unitDataConId) (spliceExpresions $ tmrTopLevelSplices tcm))
         real_binds = tcg_binds $ tmrTypechecked tcm
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
         -- TODO: Use some proper values here!
         evBinds = emptyBag @EvBind :: Bag EvBind
         clsInsts = [] :: [ClsInst]
@@ -760,7 +760,7 @@ getModSummaryFromImports env fp modTime contents = do
         msrModSummary =
             ModSummary
                 { ms_mod          = modl
-#if MIN_GHC_API_VERSION(8,8,0)
+#if MIN_VERSION_ghc(8,8,0)
                 , ms_hie_date     = Nothing
 #endif
                 , ms_hs_date      = modTime
@@ -800,15 +800,15 @@ parseHeader
        => DynFlags -- ^ flags to use
        -> FilePath  -- ^ the filename (for source locations)
        -> SB.StringBuffer -- ^ Haskell module source text (full Unicode is supported)
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
        -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located(HsModule))
 #else
        -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located(HsModule GhcPs))
 #endif
 parseHeader dflags filename contents = do
    let loc  = mkRealSrcLoc (mkFastString filename) 1 1
    case unP Parser.parseHeader (mkPState dflags contents loc) of
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
      PFailed pst ->
         throwE $ diagFromErrMsgs "parser" dflags $ getErrorMessages pst dflags
 #else
@@ -846,7 +846,7 @@ parseFileContents env customPreprocessor filename ms = do
        dflags = ms_hspp_opts ms
        contents = fromJust $ ms_hspp_buf ms
    case unP Parser.parseModule (mkPState dflags contents loc) of
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
      PFailed pst -> throwE $ diagFromErrMsgs "parser" dflags $ getErrorMessages pst dflags
 #else
      PFailed _ locErr msgErr ->
@@ -855,7 +855,7 @@ parseFileContents env customPreprocessor filename ms = do
      POk pst rdr_module ->
          let hpm_annotations :: ApiAnns
              hpm_annotations =
-#if MIN_GHC_API_VERSION(9,0,1)
+#if MIN_VERSION_ghc(9,0,1)
                -- Copied from GHC.Driver.Main
                ApiAnns {
                       apiAnnItems = Map.fromListWith (++) $ annotations pst,

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

@@ -30,12 +30,12 @@ import           FileCleanup
 import           Packages
 import           Panic
 import           SysTools
-#if MIN_GHC_API_VERSION(8,8,2)
+#if MIN_VERSION_ghc(8,8,2)
 import           LlvmCodeGen                (llvmVersionList)
-#elif MIN_GHC_API_VERSION(8,8,0)
+#elif MIN_VERSION_ghc(8,8,0)
 import           LlvmCodeGen                (LlvmVersion (..))
 #endif
-#if MIN_GHC_API_VERSION (8,10,0)
+#if MIN_VERSION_ghc (8,10,0)
 import           Fingerprint
 import           ToolSettings
 #endif
@@ -65,7 +65,7 @@ doCpp dflags raw input_fn output_fn = do
     let verbFlags = getVerbFlags dflags
 
     let cpp_prog args | raw       = SysTools.runCpp dflags args
-#if MIN_GHC_API_VERSION(8,10,0)
+#if MIN_VERSION_ghc(8,10,0)
                       | otherwise = SysTools.runCc Nothing
 #else
                       | otherwise = SysTools.runCc
@@ -149,11 +149,11 @@ getBackendDefs :: DynFlags -> IO [String]
 getBackendDefs dflags | hscTarget dflags == HscLlvm = do
     llvmVer <- figureLlvmVersion dflags
     return $ case llvmVer of
-#if MIN_GHC_API_VERSION(8,8,2)
+#if MIN_VERSION_ghc(8,8,2)
                Just v
                  | [m] <- llvmVersionList v -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m, 0) ]
                  | m:n:_   <- llvmVersionList v -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m, n) ]
-#elif MIN_GHC_API_VERSION(8,8,0)
+#elif MIN_VERSION_ghc(8,8,0)
                Just (LlvmVersion n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (n,0) ]
                Just (LlvmVersionOld m n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m,n) ]
 #else
@@ -169,7 +169,7 @@ getBackendDefs _ =
     return []
 
 addOptP :: String -> DynFlags -> DynFlags
-#if MIN_GHC_API_VERSION (8,10,0)
+#if MIN_VERSION_ghc (8,10,0)
 addOptP f = alterToolSettings $ \s -> s
           { toolSettings_opt_P             = f : toolSettings_opt_P s
           , toolSettings_opt_P_fingerprint = fingerprintStrings (f : toolSettings_opt_P s)