Skip to content

Commit a375501

Browse files
July541July541
authored
Merge branch 'master' into nix-ghc927
2 parents 1a8d8a2 + 9f489d0 commit a375501

File tree

31 files changed

+48
-55
lines changed

31 files changed

+48
-55
lines changed

‎docs/support/ghc-version-support.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ Support status (see the support policy below for more details):
1717

1818
| GHC version | Last supporting HLS version | Support status |
1919
|--------------|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
20+
| 9.6.1 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
2021
| 9.4.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
21-
| 9.4.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
22-
| 9.4.2 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
23-
| 9.4.1 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
24-
| 9.2.6 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
25-
| 9.2.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
26-
| 9.2.4 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
27-
| 9.2.3 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
22+
| 9.4.3 | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
23+
| 9.4.(1,2) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
24+
| 9.2.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
25+
| 9.2.(5,6) | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
26+
| 9.2.(3,4) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
2827
| 9.2.(1,2) | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated |
2928
| 9.0.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
3029
| 9.0.1 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |

‎docs/support/plugin-support.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ For example, a plugin to provide a formatter which has itself been abandoned has
5252
| `hls-eval-plugin` | 2 | |
5353
| `hls-explicit-fixity-plugin` | 2 | |
5454
| `hls-explicit-record-fields-plugin` | 2 | |
55-
| `hls-floskell-plugin` | 2 | |
56-
| `hls-fourmolu-plugin` | 2 | |
55+
| `hls-floskell-plugin` | 2 | 9.6 |
56+
| `hls-fourmolu-plugin` | 2 | 9.6 |
5757
| `hls-gadt-plugin` | 2 | |
58-
| `hls-hlint-plugin` | 2 | |
58+
| `hls-hlint-plugin` | 2 | 9.6 |
5959
| `hls-module-name-plugin` | 2 | |
6060
| `hls-qualify-imported-names-plugin` | 2 | |
61-
| `hls-ormolu-plugin` | 2 | |
61+
| `hls-ormolu-plugin` | 2 | 9.6 |
6262
| `hls-rename-plugin` | 2 | |
6363
| `hls-refine-imports-plugin` | 2 | |
64-
| `hls-stylish-haskell-plugin` | 2 | |
65-
| `hls-tactics-plugin` | 2 | 9.2, 9.4 |
66-
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4 |
67-
| `hls-stan-plugin` | 3 | 8.6, 9.0, 9.2, 9.4 |
64+
| `hls-stylish-haskell-plugin` | 2 | 9.6 |
65+
| `hls-tactics-plugin` | 2 | 9.2, 9.4, 9.6 |
66+
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4, 9.6 |
67+
| `hls-stan-plugin` | 3 | 8.6, 9.0, 9.2, 9.4, 9.6 |
6868
| `hls-retrie-plugin` | 3 | |
6969
| `hls-splice-plugin` | 3 | |

‎ghcide/src/Development/IDE/Main.hs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ data Log
135135
| LogLspStart [PluginId]
136136
| LogLspStartDuration !Seconds
137137
| LogShouldRunSubset !Bool
138-
| LogOnlyPartialGhc94Support
139138
| LogSetInitialDynFlagsException !SomeException
140139
| LogService Service.Log
141140
| LogShake Shake.Log
@@ -159,8 +158,6 @@ instance Pretty Log where
159158
"Started LSP server in" <+> pretty (showDuration duration)
160159
LogShouldRunSubset shouldRunSubset ->
161160
"shouldRunSubset:" <+> pretty shouldRunSubset
162-
LogOnlyPartialGhc94Support ->
163-
"Currently, HLS supports GHC 9.4 only partially. See [issue #3190](https://github.com/haskell/haskell-language-server/issues/3190) for more detail."
164161
LogSetInitialDynFlagsException e ->
165162
"setInitialDynFlags:" <+> pretty (displayException e)
166163
LogService log -> pretty log
@@ -341,9 +338,6 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
341338
, optRunSubset = runSubset
342339
}
343340
caps = LSP.resClientCapabilities env
344-
-- FIXME: Remove this after GHC 9.4 gets fully supported
345-
when (ghcVersion == GHC94) $
346-
log Warning LogOnlyPartialGhc94Support
347341
monitoring <- argsMonitoring
348342
initialise
349343
(cmapWithPrio LogService recorder)

‎haskell-language-server.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ common retrie
263263

264264
common tactic
265265
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
266-
build-depends: hls-tactics-plugin ^>= 1.8
266+
build-depends: hls-tactics-plugin ^>= 1.8.1
267267
cpp-options: -Dhls_tactic
268268

269269
common hlint
@@ -549,7 +549,7 @@ test-suite func-test
549549
, lens-aeson
550550
, ghcide
551551
, ghcide-test-utils
552-
, hls-test-utils ^>=1.5
552+
, hls-test-utils ^>=1.6
553553
, lsp-types
554554
, aeson
555555
, hls-plugin-api

‎hie-compat/hie-compat.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.22
22
name: hie-compat
3-
version: 0.3.1.0
3+
version: 0.3.1.1
44
synopsis: HIE files for GHC 8.8 and other HIE file backports
55
license: Apache-2.0
66
description:

‎hls-test-utils/hls-test-utils.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-test-utils
3-
version: 1.5.0.0
3+
version: 1.6.0.0
44
synopsis: Utilities used in the tests of Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -41,7 +41,7 @@ library
4141
, directory
4242
, extra
4343
, filepath
44-
, ghcide ^>=1.9 || ^>= 1.10
44+
, ghcide ^>= 1.10
4545
, hls-graph
4646
, hls-plugin-api ^>=1.6
4747
, lens

‎plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test-suite tests
6464
, base >=4.12 && < 5
6565
, filepath
6666
, hls-alternate-number-format-plugin
67-
, hls-test-utils ^>=1.5
67+
, hls-test-utils ^>=1.6
6868
, lsp
6969
, QuickCheck
7070
, regex-tdfa

‎plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test-suite tests
5555
, directory
5656
, filepath
5757
, hls-cabal-fmt-plugin
58-
, hls-test-utils ^>=1.5
58+
, hls-test-utils ^>=1.6
5959

6060
if flag(isolateTests)
6161
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6

‎plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test-suite tests
7474
, filepath
7575
, ghcide
7676
, hls-cabal-plugin
77-
, hls-test-utils ^>=1.5
77+
, hls-test-utils ^>=1.6
7878
, lens
7979
, lsp-types
8080
, tasty-hunit

‎plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ test-suite tests
5959
, extra
6060
, filepath
6161
, hls-call-hierarchy-plugin
62-
, hls-test-utils ^>=1.5
62+
, hls-test-utils ^>=1.6
6363
, ghcide-test-utils
6464
, lens
6565
, lsp

0 commit comments

Comments
 (0)