From 701180b1a3aa6c1d531c90ee6ab01be837f630b4 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 22 Sep 2021 23:12:43 +0200 Subject: [PATCH 1/3] Fix build with fbghc --- .../src/Development/IDE/GHC/Compat/Units.hs | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/ghcide/src/Development/IDE/GHC/Compat/Units.hs b/ghcide/src/Development/IDE/GHC/Compat/Units.hs index 9f69100559..a2c7b860b7 100644 --- a/ghcide/src/Development/IDE/GHC/Compat/Units.hs +++ b/ghcide/src/Development/IDE/GHC/Compat/Units.hs @@ -49,46 +49,45 @@ module Development.IDE.GHC.Compat.Units ( #if MIN_VERSION_ghc(9,0,0) #if MIN_VERSION_ghc(9,2,0) -import qualified GHC.Data.ShortText as ST -import GHC.Driver.Env (hsc_unit_dbs) +import qualified GHC.Data.ShortText as ST +import GHC.Driver.Env (hsc_unit_dbs) import GHC.Unit.Env import GHC.Unit.External #else import GHC.Driver.Types #endif import GHC.Data.FastString -import GHC.Driver.Session (PackageArg (..), - PackageFlag (..)) -import qualified GHC.Driver.Session as DynFlags +import GHC.Driver.Session (PackageArg (..), + PackageFlag (..)) +import qualified GHC.Driver.Session as DynFlags import GHC.Types.Unique.Set -import qualified GHC.Unit.Info as UnitInfo -import GHC.Unit.Module.Name (ModuleName) -import GHC.Unit.State (LookupResult, PackageName, - UnitInfo, - UnitState (unitInfoMap)) -import qualified GHC.Unit.State as State -import GHC.Unit.Types hiding (moduleUnit, toUnitId) -import qualified GHC.Unit.Types as Unit +import qualified GHC.Unit.Info as UnitInfo +import GHC.Unit.Module.Name (ModuleName) +import GHC.Unit.State (LookupResult, PackageName, + UnitInfo, + UnitState (unitInfoMap)) +import qualified GHC.Unit.State as State +import GHC.Unit.Types hiding (moduleUnit, toUnitId) +import qualified GHC.Unit.Types as Unit #else -import DynFlags (PackageArg (..), - PackageFlag (..)) import qualified DynFlags import FastString import HscTypes -import Module hiding (moduleUnitId) +import Module hiding (moduleUnitId) import qualified Module -import Packages (InstalledPackageInfo (haddockInterfaces, packageName), - LookupResult, PackageConfig, - PackageConfigMap, PackageName, - PackageState, - getPackageConfigMap, - lookupPackage') +import Packages (InstalledPackageInfo (haddockInterfaces, packageName), + LookupResult, PackageConfig, + PackageConfigMap, + PackageState, + getPackageConfigMap, + lookupPackage') import qualified Packages #endif +import Development.IDE.GHC.Compat.Core import Development.IDE.GHC.Compat.Env #if MIN_VERSION_ghc(9,0,0) && !MIN_VERSION_ghc(9,2,0) -import Data.Map (Map) +import Data.Map (Map) #endif import Data.Either import Data.Version From 68339d67c8961d4bf71f8240833b3478dd883263 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 22 Sep 2021 23:14:41 +0200 Subject: [PATCH 2/3] bump ghcide version number --- ghcide/ghcide.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index aebe7c8bd0..281b44500a 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -2,7 +2,7 @@ cabal-version: 2.4 build-type: Simple category: Development name: ghcide -version: 1.4.2.1 +version: 1.4.2.2 license: Apache-2.0 license-file: LICENSE author: Digital Asset and Ghcide contributors From 620ea550808abb97e903c79704284a3d6781294b Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Thu, 23 Sep 2021 07:56:58 +0200 Subject: [PATCH 3/3] fix GHC 9 imports --- ghcide/src/Development/IDE/GHC/Compat/Units.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghcide/src/Development/IDE/GHC/Compat/Units.hs b/ghcide/src/Development/IDE/GHC/Compat/Units.hs index a2c7b860b7..d36ad94bc8 100644 --- a/ghcide/src/Development/IDE/GHC/Compat/Units.hs +++ b/ghcide/src/Development/IDE/GHC/Compat/Units.hs @@ -57,14 +57,10 @@ import GHC.Unit.External import GHC.Driver.Types #endif import GHC.Data.FastString -import GHC.Driver.Session (PackageArg (..), - PackageFlag (..)) import qualified GHC.Driver.Session as DynFlags import GHC.Types.Unique.Set import qualified GHC.Unit.Info as UnitInfo -import GHC.Unit.Module.Name (ModuleName) -import GHC.Unit.State (LookupResult, PackageName, - UnitInfo, +import GHC.Unit.State (LookupResult, UnitInfo, UnitState (unitInfoMap)) import qualified GHC.Unit.State as State import GHC.Unit.Types hiding (moduleUnit, toUnitId)