[haskell/ghcide#518] Build ghcide with GHC 8.10.1 (haskell/ghcide#519)

* [haskell/ghcide#518] Build ghcide with GHC 8.10.1 Resolves haskell/ghcide#518 * Move CPP logic to the Compat module * Revert changes to mkHieFile * Add local fork of HieAst for 8.10.1 The fix for mkHieFile didn't make it into 8.10.1, so the override is still needed * Ignore hlint in src-ghc810/HieAst.hs * Whitelist CPP for Development.IDE.GHC.Orphans * [haskell/ghcide#518] Build ghcide with GHC 8.10.1 Resolves haskell/ghcide#518 * Move CPP logic to the Compat module * Revert changes to mkHieFile * Add local fork of HieAst for 8.10.1 The fix for mkHieFile didn't make it into 8.10.1, so the override is still needed * Ignore hlint in src-ghc810/HieAst.hs * Whitelist CPP for Development.IDE.GHC.Orphans * Plugin tests known broken in 8.10.1 (haskell/ghcide#556) * Bump up ghc-check version Co-authored-by: Pepe Iborra <pepeiborra@gmail.com> Co-authored-by: pepe iborra <pepeiborra@gmail.com>
pepeiborra · May 11, 2020 · b21472a · b21472a
1 parent f40a57a
commit b21472a
Show file tree

Hide file tree

Showing 12 changed files with 1,985 additions and 5 deletions.
diff --git a/ghcide/.azure/linux-stack.yml b/ghcide/.azure/linux-stack.yml
@@ -5,6 +5,8 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
+      stack_810:
+        STACK_YAML: "stack810.yaml"
       stack_88:
         STACK_YAML: "stack88.yaml"
       stack_86:

diff --git a/ghcide/.azure/windows-stack.yml b/ghcide/.azure/windows-stack.yml
@@ -5,6 +5,8 @@ jobs:
     vmImage: 'windows-2019'
   strategy:
     matrix:
+      stack_810:
+        STACK_YAML: "stack810.yaml"
       stack_88:
         STACK_YAML: "stack88.yaml"
       stack_86:

diff --git a/ghcide/.hlint.yaml b/ghcide/.hlint.yaml
@@ -81,6 +81,7 @@
     - Development.IDE.Core.Compile
     - Development.IDE.Core.Rules
     - Development.IDE.GHC.Compat
+    - Development.IDE.GHC.Orphans
     - Development.IDE.GHC.Util
     - Development.IDE.Import.FindImports
     - Development.IDE.LSP.Outline

diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -149,7 +149,12 @@ library
         Development.IDE.Plugin.CodeAction.RuleTypes
         Development.IDE.Plugin.Completions.Logic
         Development.IDE.Plugin.Completions.Types
-    if impl(ghc > 8.7) || flag(ghc-lib)
+    if (impl(ghc > 8.7) && impl(ghc < 8.10)) || flag(ghc-lib)
+      hs-source-dirs: src-ghc88
+      other-modules:
+        Development.IDE.GHC.HieAst
+    if (impl(ghc > 8.9))
+      hs-source-dirs: src-ghc810
       other-modules:
         Development.IDE.GHC.HieAst
     ghc-options: -Wall -Wno-name-shadowing