Merge pull request RefactoringTools#59 from alanz/ghc-mod-5.8

alanz · web-flow · commit 4055ef45f0de · 2017-06-12T12:48:51.000+02:00
Update for ghc-mod 5.8
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+2017-06-12 v0.8.4.1
+	* Update for ghc-mod 5.8.0.0
 2017-02-11 v0.8.4.0
 	* Update for GHC 8.0.2
 	* Use ghc-mod version to 5.7
diff --git a/HaRe.cabal b/HaRe.cabal
@@ -1,5 +1,5 @@
 Name:                           HaRe
-Version:                        0.8.4.0
+Version:                        0.8.4.1
 
 Author:                         Chris Brown, Huiqing Li, Simon Thompson,
                                 Alan Zimmerman, Stephen Adams
@@ -125,8 +125,8 @@ Library
                                , directory
                                , filepath
                                , ghc
-                               , ghc-exactprint == 0.5.3.*
-                               , ghc-mod == 5.7.0.*
+                               , ghc-exactprint >= 0.5.3.0
+                               , ghc-mod == 5.8.0.*
                                , ghc-syb-utils
                                , hslogger
                                , monad-control
@@ -146,7 +146,7 @@ Library
         -- real	0m36.427s
         -- user 0m41.448s
         -- sys 0m2.544s
-        GHC-Options:            -O0
+        GHC-Options:            -O0 -Wall
         Hs-Source-Dirs:         src
         -- Other-Modules:          Paths_HaRe
         Exposed-modules:
@@ -188,17 +188,17 @@ Library
 Executable ghc-hare
         Main-Is:                MainHaRe.hs
         -- Other-Modules:          Paths_HaRe
-        GHC-Options:            -O0
+        GHC-Options:            -O0 -Wall
         -- GHC-Options:            -prof -fprof-auto -rtsopts -caf-all
         Hs-Source-Dirs:
           ./app
 
         -- GHC 7.10.2 ships with base 4.8.1.0
         Build-Depends:          base >= 4.8.1.0  && < 5
-                                , ghc-mod
+                                , ghc-mod == 5.8.0.*
                                 , gitrev >= 1.1
                                 , mtl
-                                , optparse-applicative
+                                , optparse-applicative == 0.13.2.*
                                 , optparse-simple
                                 , Cabal
                                 -- , Paths_HaRe
@@ -213,7 +213,7 @@ test-suite spec
   ghc-options:
       -O0
       -- reinstate these later  -Wall
-      -- -Wall
+      -Wall
       -- reinstate these later  -Werror
       -- -fhpc
       -- -fhpc -hpcdir dist/hpc/app-1.0
@@ -270,8 +270,8 @@ test-suite spec
     , directory
     , foldl
     , ghc
-    , ghc-exactprint == 0.5.3.*
-    , ghc-mod == 5.7.0.*
+    , ghc-exactprint >= 0.5.3.0
+    , ghc-mod == 5.8.0.*
     , ghc-syb-utils
     , hslogger
     , hspec
@@ -286,7 +286,7 @@ test-suite spec
     , conversion-text
     , parsec
     , case-insensitive
-    , HaRe >= 0.8.2.1
+    , HaRe
   Extensions:      CPP
   if impl (ghc < 7.10.2)
     buildable: False
diff --git a/app/MainHaRe.hs b/app/MainHaRe.hs
@@ -12,12 +12,10 @@ import           Distribution.Text (display)
 import           Language.Haskell.Refact.API
 import           Language.Haskell.Refact.HaRe
 import           Options.Applicative.Simple
-import qualified Language.Haskell.GhcMod as GM
+import qualified GhcMod as GM
 import qualified Paths_HaRe as Meta
 
--- temporary until exposed by ghc-mod
--- import           Options
-import           Language.Haskell.GhcMod.Options.Options
+import           GhcMod.Options.Options
 
 main :: IO ()
 main = do
diff --git a/src/Language/Haskell/Refact/HaRe.hs b/src/Language/Haskell/Refact/HaRe.hs
@@ -41,4 +41,4 @@ import Language.Haskell.Refact.Refactoring.GenApplicative
 import Language.Haskell.Refact.Refactoring.RoundTrip
 import Language.Haskell.Refact.Utils.Monad
 import Language.Haskell.Refact.Utils.Types
-import qualified Language.Haskell.GhcMod as GM (Options(..),defaultOptions)
+import qualified GhcMod as GM (Options(..),defaultOptions)
diff --git a/src/Language/Haskell/Refact/Refactoring/AddRmParam.hs b/src/Language/Haskell/Refact/Refactoring/AddRmParam.hs
@@ -12,8 +12,8 @@ import qualified GHC
 import qualified Name                  as GHC
 import qualified Outputable            as GHC
 
-import qualified Language.Haskell.GhcMod as GM
-import Language.Haskell.GhcMod.Internal  as GM
+import qualified GhcMod       as GM
+import qualified GhcMod.Types as GM
 import Language.Haskell.Refact.API
 
 import Language.Haskell.GHC.ExactPrint.Types
diff --git a/src/Language/Haskell/Refact/Refactoring/Case.hs b/src/Language/Haskell/Refact/Refactoring/Case.hs
@@ -11,7 +11,7 @@ import qualified GHC.SYB.Utils         as SYB
 import qualified BasicTypes    as GHC
 import qualified GHC           as GHC
 
-import qualified Language.Haskell.GhcMod as GM (Options(..))
+import qualified GhcMod as GM (Options(..))
 import Language.Haskell.Refact.API
 
 -- To be moved into HaRe API
diff --git a/src/Language/Haskell/Refact/Refactoring/DeleteDef.hs b/src/Language/Haskell/Refact/Refactoring/DeleteDef.hs
@@ -9,11 +9,11 @@ import BasicTypes
 import qualified GHC
 import Control.Monad
 import Control.Monad.State
-import Language.Haskell.GhcMod
+import GhcMod
 import Language.Haskell.Refact.API
 import Data.Generics.Strafunski.StrategyLib.StrategyLib
-import qualified Language.Haskell.GhcMod as GM
-import qualified Language.Haskell.GhcMod.Internal as GM
+import qualified GhcMod       as GM
+import qualified GhcMod.Types as GM
 import System.Directory
 import Language.Haskell.GHC.ExactPrint
 import Language.Haskell.GHC.ExactPrint.Types
diff --git a/src/Language/Haskell/Refact/Refactoring/DupDef.hs b/src/Language/Haskell/Refact/Refactoring/DupDef.hs
@@ -11,13 +11,13 @@ import qualified Data.Generics as SYB
 import qualified GHC.SYB.Utils as SYB
 
 import qualified GHC
-import qualified RdrName               as GHC
+import qualified RdrName       as GHC
 
 import Data.List
 import Data.Maybe
 
-import qualified Language.Haskell.GhcMod as GM
-import Language.Haskell.GhcMod.Internal  as GM
+import qualified GhcMod       as GM
+import qualified GhcMod.Types as GM
 import Language.Haskell.Refact.API
 
 import Language.Haskell.GHC.ExactPrint.Types
diff --git a/src/Language/Haskell/Refact/Refactoring/GenApplicative.hs b/src/Language/Haskell/Refact/Refactoring/GenApplicative.hs
@@ -4,7 +4,8 @@ module Language.Haskell.Refact.Refactoring.GenApplicative
   (genApplicative, compGenApplicative) where
 
 import Language.Haskell.Refact.API
-import qualified Language.Haskell.GhcMod as GM
+import qualified GhcMod       as GM
+import qualified GhcMod.Types as GM
 import qualified GHC as GHC
 import qualified RdrName as GHC
 import System.Directory
diff --git a/src/Language/Haskell/Refact/Refactoring/MoveDef.hs b/src/Language/Haskell/Refact/Refactoring/MoveDef.hs
@@ -31,7 +31,7 @@ import Data.Foldable
 import Data.List
 import Data.Maybe
 
-import qualified Language.Haskell.GhcMod as GM
+import qualified GhcMod as GM
 import Language.Haskell.Refact.API
 
 import Language.Haskell.GHC.ExactPrint.Types
diff --git a/src/Language/Haskell/Refact/Refactoring/Renaming.hs b/src/Language/Haskell/Refact/Refactoring/Renaming.hs
@@ -21,7 +21,7 @@ import Language.Haskell.GHC.ExactPrint
 import Language.Haskell.GHC.ExactPrint.Utils
 import Language.Haskell.Refact.API
 import System.Directory
-import qualified Language.Haskell.GhcMod as GM (Options(..))
+import qualified GhcMod as GM (Options(..))
 import qualified Data.Map as Map
 
 {-# ANN module "HLint: ignore Redunant do" #-}
diff --git a/src/Language/Haskell/Refact/Refactoring/RoundTrip.hs b/src/Language/Haskell/Refact/Refactoring/RoundTrip.hs
@@ -1,6 +1,6 @@
 module Language.Haskell.Refact.Refactoring.RoundTrip(roundTrip) where
 
-import qualified Language.Haskell.GhcMod as GM (Options(..))
+import qualified GhcMod as GM (Options(..))
 import Language.Haskell.Refact.API
 
 import System.Directory
diff --git a/src/Language/Haskell/Refact/Refactoring/Simple.hs b/src/Language/Haskell/Refact/Refactoring/Simple.hs
@@ -6,7 +6,7 @@ import qualified Data.Generics         as SYB
 
 import qualified GHC           as GHC
 
-import qualified Language.Haskell.GhcMod as GM (Options(..))
+import qualified GhcMod as GM (Options(..))
 import Language.Haskell.Refact.API
 
 -- To be moved into HaRe API
diff --git a/src/Language/Haskell/Refact/Refactoring/SwapArgs.hs b/src/Language/Haskell/Refact/Refactoring/SwapArgs.hs
@@ -8,7 +8,7 @@ import qualified GHC.SYB.Utils         as SYB
 import qualified Name                  as GHC
 import qualified GHC
 
-import qualified Language.Haskell.GhcMod as GM (Options(..))
+import qualified GhcMod as GM (Options(..))
 import Language.Haskell.Refact.API
 
 import Data.Generics.Schemes
diff --git a/src/Language/Haskell/Refact/Utils/Monad.hs b/src/Language/Haskell/Refact/Utils/Monad.hs
@@ -49,10 +49,11 @@ import Control.Monad.State
 --import Data.Time.Clock
 import Distribution.Helper
 import Exception
-import qualified Language.Haskell.GhcMod             as GM
-import qualified Language.Haskell.GhcMod.Internal    as GM
-import qualified Language.Haskell.GhcMod.Monad.Out   as GM
-import qualified Language.Haskell.GhcMod.Monad.Types as GM
+import qualified GhcMod             as GM
+import qualified GhcMod.Monad.Out   as GM
+import qualified GhcMod.Monad.Types as GM
+import qualified GhcMod.Target      as GM
+import qualified GhcMod.Types       as GM
 import Language.Haskell.Refact.Utils.Types
 import Language.Haskell.GHC.ExactPrint
 import Language.Haskell.GHC.ExactPrint.Utils
diff --git a/src/Language/Haskell/Refact/Utils/TypeUtils.hs b/src/Language/Haskell/Refact/Utils/TypeUtils.hs
@@ -258,8 +258,8 @@ equivalentNameInNewMod old = do
   -- So ignore the packagekey for now
   -- See https://github.com/DanielG/ghc-mod/issues/811
   -- TODO: revisit this
-  -- let eqModules (GHC.Module pk1 mn1) (GHC.Module pk2 mn2) = mn1 == mn2
-  let eqModules (GHC.Module pk1 mn1) (GHC.Module pk2 mn2) = mn1 == mn2 && pk1 == pk2
+  let eqModules (GHC.Module pk1 mn1) (GHC.Module pk2 mn2) = mn1 == mn2
+  -- let eqModules (GHC.Module pk1 mn1) (GHC.Module pk2 mn2) = mn1 == mn2 && pk1 == pk2
 
   gnames <- GHC.getNamesInScope
   -- logm $ "equivalentNameInNewMod:gnames=" ++ showGhcQual (map (\n -> (GHC.nameModule n,n)) gnames)
diff --git a/src/Language/Haskell/Refact/Utils/Utils.hs b/src/Language/Haskell/Refact/Utils/Utils.hs
@@ -48,8 +48,9 @@ import Language.Haskell.GHC.ExactPrint.Preprocess
 import Language.Haskell.GHC.ExactPrint.Print
 import Language.Haskell.GHC.ExactPrint.Utils
 
-import qualified Language.Haskell.GhcMod          as GM
-import qualified Language.Haskell.GhcMod.Internal as GM
+import qualified GhcMod          as GM
+import qualified GhcMod.Target   as GM
+import qualified GhcMod.Types    as GM
 
 import Language.Haskell.Refact.Utils.GhcModuleGraph
 import Language.Haskell.Refact.Utils.GhcVersionSpecific
diff --git a/test/Main.hs b/test/Main.hs
@@ -4,7 +4,7 @@
 module Main where
 
 import Control.Monad
-import TestUtils
+-- import TestUtils
 import qualified Turtle as Tu
 import qualified Control.Foldl as Fold
 
@@ -45,7 +45,7 @@ stackFiles =
 resolver :: String
 resolver =
 #if __GLASGOW_HASKELL__ > 710
-  "resolver: nightly-2016-08-25"
+  "resolver: nightly-2017-05-23"
 #else
   "resolver: lts-6.13"
 #endif
diff --git a/test/TestUtils.hs b/test/TestUtils.hs
@@ -53,8 +53,8 @@ import Language.Haskell.GHC.ExactPrint.Annotate
 import Language.Haskell.GHC.ExactPrint.Parsers
 import Language.Haskell.GHC.ExactPrint.Types
 import Language.Haskell.GHC.ExactPrint.Utils
-import qualified Language.Haskell.GhcMod as GM
-import qualified Language.Haskell.GhcMod.Types as GM
+import qualified GhcMod       as GM
+import qualified GhcMod.Types as GM
 import Language.Haskell.Refact.Utils.Monad
 import Language.Haskell.Refact.Utils.MonadFunctions
 import Language.Haskell.Refact.Utils.Types
diff --git a/test/UtilsSpec.hs b/test/UtilsSpec.hs
@@ -11,9 +11,8 @@ import qualified HscTypes   as GHC
 import Control.Exception
 import Control.Monad.State
 import Data.List
-import Data.Maybe
 
-import qualified Language.Haskell.GhcMod.Internal as GM (mpModule)
+import qualified GhcMod.Types as GM (mpModule)
 
 import Language.Haskell.GHC.ExactPrint.Utils
 import Language.Haskell.Refact.Refactoring.Renaming

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2017-06-12 v0.8.4.1`
	`2`	`+ * Update for ghc-mod 5.8.0.0`
`1`	`3`	`2017-02-11 v0.8.4.0`
`2`	`4`	`* Update for GHC 8.0.2`
`3`	`5`	`* Use ghc-mod version to 5.7`