CPP imports + stack-8.8.1.yaml + ignore hie.yaml

haskell · Dec 23, 2019 · 69c9b1f · 69c9b1f
1 parent f5f850f
commit 69c9b1f
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,4 @@ shake.yaml.lock
 
 # ignore hie.yaml's for testdata 
 test/**/*.yaml
+/hie.yaml
diff --git a/app/MainHie.hs b/app/MainHie.hs
@@ -1,9 +1,12 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE RankNTypes   #-}
 module Main where
 
 import           Control.Monad
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid                           ((<>))
+#endif
 import           Data.Version                          (showVersion)
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes

diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
@@ -14,7 +14,7 @@ build-type:          Simple
 cabal-version:       >=2.0
 
 flag pedantic
-  Description: Enable -Werror -Wwarn=unused-imports
+  Description: Enable -Werror
   Default:     False
 
 library
@@ -102,7 +102,7 @@ library
 
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 executable hie
@@ -121,7 +121,7 @@ executable hie
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
                        -with-rtsopts=-T
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 
@@ -142,7 +142,7 @@ executable hie-wrapper
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
                        -with-rtsopts=-T
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 library hie-test-utils
@@ -168,7 +168,7 @@ library hie-test-utils
                      , yaml
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 test-suite unit-test
@@ -212,7 +212,7 @@ test-suite unit-test
 
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 test-suite dispatcher-test
@@ -236,7 +236,7 @@ test-suite dispatcher-test
 
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
   build-tool-depends:  hspec-discover:hspec-discover
 
@@ -256,7 +256,7 @@ test-suite plugin-dispatcher-test
 
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 test-suite func-test
@@ -301,7 +301,7 @@ test-suite func-test
                      , containers
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
   build-tool-depends:  hspec-discover:hspec-discover
                      , haskell-ide-engine:hie
@@ -320,7 +320,7 @@ test-suite wrapper-test
                      , hie-plugin-api
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror -Wwarn=unused-imports
+     ghc-options:      -Werror
   default-language:    Haskell2010
 
 

diff --git a/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs b/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

diff --git a/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs b/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveAnyClass #-}
@@ -112,12 +113,16 @@ 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 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 qualified HIE.Bios.Ghc.Api as BIOS

diff --git a/install/shake.yaml b/install/shake.yaml
@@ -1,5 +1,5 @@
 # Used to provide a different environment for the shake build script
-resolver: lts-14.17 # GHC 8.6.5
+resolver: lts-14.11 # GHC 8.6.5
 packages:
 - .
 

diff --git a/src/Haskell/Ide/Engine/Completions.hs b/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 )
 

diff --git a/src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs b/src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveAnyClass        #-}
 {-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -16,7 +17,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

diff --git a/src/Haskell/Ide/Engine/Plugin/Brittany.hs b/src/Haskell/Ide/Engine/Plugin/Brittany.hs
@@ -14,7 +14,8 @@ import           Haskell.Ide.Engine.PluginUtils
 import           Language.Haskell.Brittany
 import qualified Language.Haskell.LSP.Types            as J
 import qualified Language.Haskell.LSP.Types.Lens       as J
-import           System.FilePath (FilePath, takeDirectory)
+
+import           System.FilePath
 import           Data.Maybe (maybeToList)
 
 brittanyDescriptor :: PluginId -> PluginDescriptor

diff --git a/src/Haskell/Ide/Engine/Plugin/Generic.hs b/src/Haskell/Ide/Engine/Plugin/Generic.hs
@@ -14,7 +14,9 @@ import           Data.Function
 import qualified Data.HashMap.Strict               as HM
 import           Data.List
 import           Data.Maybe
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid ((<>))
+#endif
 import qualified Data.Text                         as T
 import           Name
 import           GHC.Generics

diff --git a/src/Haskell/Ide/Engine/Plugin/HsImport.hs b/src/Haskell/Ide/Engine/Plugin/HsImport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
@@ -10,7 +11,9 @@ import           Control.Monad
 import           Data.Aeson
 import           Data.Foldable
 import           Data.Maybe
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid                    ( (<>) )
+#endif
 import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import qualified GHC.Generics                  as Generics

diff --git a/src/Haskell/Ide/Engine/Plugin/Package.hs b/src/Haskell/Ide/Engine/Plugin/Package.hs
@@ -19,11 +19,14 @@ import qualified Data.ByteString as B
 import           Data.Foldable
 import           Data.List
 import qualified Data.HashMap.Strict           as HM
-import qualified Data.Set                      as S
 import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as T
 import           Data.Maybe
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid ((<>))
+#else
+import qualified Data.Set                      as S
+#endif
 #if MIN_VERSION_Cabal(2,2,0)
 import           Distribution.PackageDescription.Parsec
 import           Distribution.Types.VersionRange

diff --git a/src/Haskell/Ide/Engine/Plugin/Pragmas.hs b/src/Haskell/Ide/Engine/Plugin/Pragmas.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveAnyClass    #-}
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -6,7 +7,9 @@ module Haskell.Ide.Engine.Plugin.Pragmas where
 import           Control.Lens
 import           Data.Aeson
 import qualified Data.HashMap.Strict             as H
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Monoid                     ((<>))
+#endif
 import qualified Data.Text                       as T
 import qualified GHC.Generics                    as Generics
 import           Haskell.Ide.Engine.MonadTypes   hiding (_range)

diff --git a/src/Haskell/Ide/Engine/Scheduler.hs b/src/Haskell/Ide/Engine/Scheduler.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses     #-}
 {-# LANGUAGE ExistentialQuantification #-}
@@ -25,9 +26,11 @@ where
 import           Control.Concurrent.Async
 import           GHC.Conc
 import qualified Control.Concurrent.STM        as STM
-import           Control.Monad.IO.Class         ( liftIO
-                                                , MonadIO
-                                                )
+import           Control.Monad.IO.Class         ( MonadIO )
+#if __GLASGOW_HASKELL__ < 808
+import           Control.Monad.IO.Class         ( liftIO )
+#endif
+
 import           Control.Monad.Reader.Class     ( ask
                                                 , MonadReader
                                                 )

diff --git a/src/Haskell/Ide/Engine/Server.hs b/src/Haskell/Ide/Engine/Server.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
 {-# LANGUAGE RankNTypes            #-}
@@ -32,7 +33,10 @@ import           Data.Default
 import           Data.Foldable
 import qualified Data.Map as Map
 import           Data.Maybe
-import           Data.Semigroup (Semigroup(..), Option(..), option)
+import           Data.Semigroup (Option(..), option)
+#if __GLASGOW_HASKELL__ < 808
+import           Data.Semigroup (Semigroup(..), )
+#endif
 import qualified Data.Set as S
 import qualified Data.SortedList as SL
 import qualified Data.Text as T

diff --git a/src/Haskell/Ide/Engine/Support/HieExtras.hs b/src/Haskell/Ide/Engine/Support/HieExtras.hs
@@ -26,7 +26,11 @@ module Haskell.Ide.Engine.Support.HieExtras
   , getFormattingPlugin
   ) where
 
+#if __GLASGOW_HASKELL__ < 808
 import           Data.Semigroup (Semigroup(..))
+import           Var
+#endif
+
 import           ConLike
 import           Control.Monad.Reader
 import           Control.Monad.Except
@@ -63,7 +67,6 @@ import           Packages
 import           SrcLoc
 import           TcEnv
 import           Type
-import           Var
 import           Module hiding (getModule)
 
 -- ---------------------------------------------------------------------

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.17
+resolver: lts-14.16
 packages:
   - .
   - hie-plugin-api

diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml
@@ -0,0 +1,35 @@
+resolver: nightly-2019-12-18
+packages:
+- .
+- hie-plugin-api
+
+extra-deps:
+# - ./submodules/HaRe
+- ./submodules/cabal-helper
+- ./submodules/ghc-mod/ghc-project-types
+- ./submodules/apply-refact
+- hie-bios-0.3.2
+- bytestring-trie-0.2.5.0
+- constrained-dynamic-0.1.0.0
+- fclabels-2.0.3.3
+- floskell-0.10.2
+- fold-debounce-0.2.0.9
+- haddock-api-2.23.0
+- haddock-library-1.8.0
+- hoogle-5.0.17.13
+- hsimport-0.11.0
+- monad-dijkstra-0.1.1.2
+
+flags:
+  haskell-ide-engine:
+    pedantic: true
+  hie-plugin-api:
+    pedantic: true
+
+
+# allow-newer: true
+
+nix:
+  packages: [ icu libcxx zlib ]
+
+concurrent-tests: false
diff --git a/stack.yaml b/stack.yaml
@@ -29,7 +29,7 @@ flags:
     pedantic: true
 
 
-allow-newer: true
+# allow-newer: true
 
 nix:
   packages: [ icu libcxx zlib ]