Skip to content

Commit 07cf929

Browse files
chshershpepeiborra
andauthored
[#518] Build ghcide with GHC 8.10.1 (#519)
* [#518] Build ghcide with GHC 8.10.1 Resolves #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 * [#518] Build ghcide with GHC 8.10.1 Resolves #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 (#556) * Bump up ghc-check version Co-authored-by: Pepe Iborra <pepeiborra@gmail.com> Co-authored-by: pepe iborra <pepeiborra@gmail.com>
1 parent d7c2bb6 commit 07cf929

File tree

12 files changed

+1985
-5
lines changed

12 files changed

+1985
-5
lines changed

.azure/linux-stack.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ jobs:
55
vmImage: 'ubuntu-latest'
66
strategy:
77
matrix:
8+
stack_810:
9+
STACK_YAML: "stack810.yaml"
810
stack_88:
911
STACK_YAML: "stack88.yaml"
1012
stack_86:

.azure/windows-stack.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ jobs:
55
vmImage: 'windows-2019'
66
strategy:
77
matrix:
8+
stack_810:
9+
STACK_YAML: "stack810.yaml"
810
stack_88:
911
STACK_YAML: "stack88.yaml"
1012
stack_86:

.hlint.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
- Development.IDE.Core.Compile
8282
- Development.IDE.Core.Rules
8383
- Development.IDE.GHC.Compat
84+
- Development.IDE.GHC.Orphans
8485
- Development.IDE.GHC.Util
8586
- Development.IDE.Import.FindImports
8687
- Development.IDE.LSP.Outline

ghcide.cabal

+6-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,12 @@ library
149149
Development.IDE.Plugin.CodeAction.RuleTypes
150150
Development.IDE.Plugin.Completions.Logic
151151
Development.IDE.Plugin.Completions.Types
152-
if impl(ghc > 8.7) || flag(ghc-lib)
152+
if (impl(ghc > 8.7) && impl(ghc < 8.10)) || flag(ghc-lib)
153+
hs-source-dirs: src-ghc88
154+
other-modules:
155+
Development.IDE.GHC.HieAst
156+
if (impl(ghc > 8.9))
157+
hs-source-dirs: src-ghc810
153158
other-modules:
154159
Development.IDE.GHC.HieAst
155160
ghc-options: -Wall -Wno-name-shadowing

0 commit comments

Comments
 (0)