Merge pull request #1482 from Avi-D-coder/hie-bios

GHC 8.8 support

Author: alanz

.azure/linux-stack.yml

@@ -7,6 +7,8 @@ jobs:
     matrix:
       stack-def:
         YAML_FILE: stack.yaml
+      stack-8.8.1:
+        YAML_FILE: stack-8.8.1.yaml
       stack-8.6.5:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:

.azure/macos-stack.yml

@@ -7,6 +7,8 @@ jobs:
     matrix:
       stack-def:
         YAML_FILE: stack.yaml
+      stack-8.8.1:
+        YAML_FILE: stack-8.8.1.yaml
       stack-8.6.5:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:

.azure/windows-stack.yml

@@ -5,8 +5,9 @@ jobs:
     vmImage: windows-2019
   strategy:
     matrix:
-      stack-def:
-        YAML_FILE: stack.yaml
+      # We can't use stack.yaml while it uses ghc-8.8.1
+      # stack-def:
+      #   YAML_FILE: stack.yaml
       stack-8.6.5:
         YAML_FILE: stack-8.6.5.yaml
       stack-8.6.4:

.circleci/config.yml

@@ -149,7 +149,7 @@ jobs:
   cabal:
     working_directory: ~/build
     docker:
-      - image: quay.io/haskell_works/ghc-8.6.5
+      - image: haskell:8.8.1
     steps:
       - checkout
       - run:
@@ -161,18 +161,15 @@ jobs:
       - restore-cache:
           keys:
             - cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
-      - run:
-          name: Cabal version
-          command: cabal --version
       - run:
           name: Update
-          command: cabal new-update
+          command: cabal update
       - run:
           name: Configure
-          command: cabal new-configure --enable-tests
+          command: cabal configure --enable-tests
       - run:
           name: Build
-          command: cabal new-build -j1 # need j1, else ghc-lib-parser triggers OOM
+          command: cabal build -j1 # need j1, else ghc-lib-parser triggers OOM
           no_output_timeout: 30m
       - save_cache:
           key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}

app/MainHie.hs

@@ -1,10 +1,13 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE RankNTypes   #-}
 module Main where
 
 import qualified Control.Exception                     as E
 import           Control.Monad
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid                           ((<>))
+#endif
 import           Data.Version                          (showVersion)
 import qualified Data.Text as T
 import qualified Data.Text.IO as T

hie-plugin-api/Haskell/Ide/Engine/Ghc.hs

@@ -23,7 +23,6 @@ import           Control.Monad                  ( when )
 import           Data.IORef
 import qualified Data.Map.Strict                   as Map
 -- import qualified Data.IntMap.Strict                   as IM
-import           Data.Semigroup ((<>), Semigroup)
 import qualified Data.Set                          as Set
 import qualified Data.Text                         as T
 import qualified Data.Aeson
@@ -37,7 +36,12 @@ import           Haskell.Ide.Engine.PluginUtils
 import           DynFlags
 import           GHC
 import qualified HscTypes
+
+#if __GLASGOW_HASKELL__ < 808
+import           Data.Semigroup ((<>), Semigroup)
 import           Outputable                        (renderWithStyle)
+#endif
+
 import           Language.Haskell.LSP.Types        ( NormalizedUri(..), toNormalizedUri )
 
 import           Haskell.Ide.Engine.GhcUtils

hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveAnyClass #-}
@@ -111,13 +112,17 @@ import qualified Data.List                     as List
 import           Data.Dynamic                   ( Dynamic )
 import qualified Data.Map                      as Map
 import           Data.Maybe
-import           Data.Monoid                    ( (<>) )
+
 import qualified Data.Set                      as S
 import           Data.String
 import qualified Data.Text                     as T
-import           Data.Typeable                  ( TypeRep
-                                                , Typeable
-                                                )
+import           Data.Typeable                  ( TypeRep )
+
+#if __GLASGOW_HASKELL__ < 808
+import           Data.Monoid                    ( (<>) )
+import           Data.Typeable                  ( Typeable )
+#endif
+
 import System.Directory
 import GhcMonad
 import           GHC.Generics

install/src/Env.hs

@@ -104,8 +104,8 @@ getHieVersions = do
           & mapMaybe
               (T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix)
           & map T.unpack
-        -- the following line excludes `8.6.3` on windows systems
-          & filter (\p -> not isWindowsSystem || p /= "8.6.3")
+        -- the following line excludes `8.6.3` and `8.8.1` on windows systems
+          & filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1"]))
           & sort
   return hieVersions
 

src/Haskell/Ide/Engine/Completions.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE OverloadedStrings      #-}
@@ -23,7 +24,9 @@ import qualified Data.List                     as List
 import qualified Data.Text                     as T
 import qualified Data.Map                      as Map
 import           Data.Maybe
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Semigroup (Semigroup(..))
+#endif
 import           Data.Typeable
 import           GHC.Generics                   ( Generic )
 

src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveAnyClass        #-}
 {-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -19,7 +20,11 @@ import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Except
 import           Data.Aeson                        hiding (Error)
 import           Data.Maybe
+
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid                       ((<>))
+#endif
+
 import qualified Data.Text                         as T
 import           GHC.Generics
 import           Haskell.Ide.Engine.MonadFunctions