Commit 686fa1a
Update refactor/splice/hlint/fourmolu/retrie/gadt plugin for GHC 9.4 (#3317)
* Set buildable on GHC 9.4
* Start work on GHC 9.4 compat
* Use patched `retrie`
* update retrie with github address. circumvent nix-prefetch-url.
* handle ExactPrint
* fix ghc 9.0 env.
* unwrap big CPP conditional for GHC 9.4
* GHC 9.4 buildable by disabling a few suggest.. functions
* enable disabled suggest...!
* hls-fourmolu-plugin is buildable
* hls-splice-plugin is buildable
* hls-hlint-plugin is buildable
* Enable plugins on GHC 9.4
* Add fourmolu for GHC 9.4
* fourmolu tweawk
* Fix `hls-hlint-plugin` build
- Build against GHC 9.4 API
- Increase upper bound on `hlint`
* Fix build of `hls-splice-plugin`
* annotation on close parenthesis. still need more work.
* found where closing parenthesis were missing
* examine internal annotation information.
* make use of makeDeltaAst. This fixes most of test failures in GHC 9.4
* remove dead code
* update apply-refact and hlint deps
* temporarily comment out hls-fourmolu-plugin.
* comment out build-tool-depends. then hls-fourmolu-plugin build succeeds with cabal v2-build
* remove unused fourmolu flake inputs
* fix ghc 9.0 build again.
* hlint and fourmolu for GHC 9.2!
* fix mistakenly overriden nix exp.
* remove unused hlint-3.3.6
* Fix CPP in hls-refactor-plugin
* Fix build error in hls-refactor-plugin
* Fix import
* Use `showErrors` instead of `showBag`
* fix initialization test error in refactor plugin.
* alternateNumberFormat and explicitFixity don't build on GHC 9.4
* force demoteIfDefer = id in typecheckModule for GHC 9.4.
* ignore tests which were already ignored with GHC 9.2
* fix extractDoesNotExportModuleName for GHC 9.4 by adjusting regex match
* use makeDeltaAst in removeRedundantConstraints
* fix addTypeAnnotationsToLiteralsTest
* Revert "alternateNumberFormat and explicitFixity don't build on GHC 9.4"
This reverts commit 4903092.
* Update flake lockfile
* Use upstream `retrie`
* Use upstream `retrie`
* Update lockfile
* Use upstream fourmolu
* fix arrow annotation on ghc 9.4
* fix flake.nix issue
* revert demoteIfDefer change for GHC 9.4.
* fix hls-splice-plugin build on GHC 9.0.2
* disable tracy on darwin.
* disable fourmolu plugin and ekg-json for now.
* fourmolu update to 0.10.1.0
* build fix for hls-refactor-plugin after merge
* update index-state.
* downgrade fourmolu to 0.9 for ghc 9.2 and 9.0
* remove unnecessary problematic Cabal-syntax dependency.
* update Cabal for ormolu in ghc 9.0 nix env.
* use custom apply-refact for now for both ghc 9.2 and 9.4
* added ghc >= 9.2 condition
* fix fourmolu with -f-fixity-th in nix env
* limit implicit-hie < 0.1.3
* add fourmolu back to build-tools-depends
* mark GHC92-failing tests to be failed on GHC 9.4
* ci failure test
* bump nix file.
* disable cachix action
* further comment out
* revive cachix action.
* remove commented-out
* fix hls-cabal-plugin by removing Cabal-syntax.
note that this is an opposite to #3383, to prioritize CI fix first.
* limit implicit-hie < 0.1.3
* added a small comment and link to the issue.
* put implicit-hie to ghcide dep
* update apply-refact rev
* use apply-refact-0.11.0.0 on hackage.
* 9.4 support for gadt and retrie plugins
Co-authored-by: Ian-Woo Kim <ianwookim@gmail.com>
Co-authored-by: Gabriella Gonzalez <gabriella@mercury.com>
Co-authored-by: Zubin Duggal <zubin.duggal@gmail.com>1 parent 6e4612d commit 686fa1a
File tree
27 files changed
+438
-202
lines changed- plugins
- hls-fourmolu-plugin
- hls-gadt-plugin
- src/Ide/Plugin
- test
- hls-hlint-plugin
- src/Ide/Plugin
- hls-refactor-plugin
- src/Development/IDE
- GHC
- Compat
- Plugin
- CodeAction
- Plugins
- test
- hls-retrie-plugin
- src/Ide/Plugin
- hls-splice-plugin
- src/Ide/Plugin
- test/functional
27 files changed
+438
-202
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
| 54 | + | |
56 | 55 | | |
57 | 56 | | |
58 | 57 | | |
| |||
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
69 | | - | |
| 68 | + | |
| 69 | + | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
| 21 | + | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
| 27 | + | |
| 28 | + | |
30 | 29 | | |
31 | 30 | | |
32 | 31 | | |
| |||
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
40 | 43 | | |
41 | 44 | | |
42 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
27 | | - | |
28 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
29 | | - | |
30 | | - | |
| 28 | + | |
31 | 29 | | |
32 | 30 | | |
33 | 31 | | |
34 | 32 | | |
35 | 33 | | |
36 | 34 | | |
37 | 35 | | |
| 36 | + | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments