Skip to content

Commit d6f4737

Browse files
July541July541
authored
Merge branch 'master' into stale-type-lens
2 parents 1a8a260 + 8fc40fb commit d6f4737

File tree

36 files changed

+68
-84
lines changed

36 files changed

+68
-84
lines changed

‎configuration-ghc-90.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ let
3838

3939
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
4040

41+
fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
42+
4143
# Re-generate HLS drv excluding some plugins
4244
haskell-language-server =
4345
hself.callCabal2nixWithOptions "haskell-language-server" ./.

‎configuration-ghc-92.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ let
3333

3434
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
3535

36+
fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
37+
3638
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3739

40+
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
41+
3842
# Re-generate HLS drv excluding some plugins
3943
haskell-language-server =
4044
hself.callCabal2nixWithOptions "haskell-language-server" ./.

‎configuration-ghc-94.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ let
1515
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
1616
apply-refact = hsuper.apply-refact_0_12_0_0;
1717

18-
# ptr-poker breaks on MacOS without SSE2 optimizations
19-
# https://github.com/nikita-volkov/ptr-poker/issues/11
20-
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
21-
22-
ormolu = hself.ormolu_0_5_3_0;
23-
2418
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
2519

2620
# Re-generate HLS drv excluding some plugins

‎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 | |

‎flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@
121121
then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; })
122122
else hsuper.ormolu;
123123

124-
# Due to the following issue, fixity-th should be disabled, especially for darwin.
125-
# https://github.com/fourmolu/fourmolu/issues/238
126-
# nixpkgs now disables fixity-th for ghc944.
127-
fourmolu =
128-
addBuildDepend
129-
(appendConfigureFlag hself.fourmolu_0_10_1_0 "-f-fixity-th")
130-
hself.file-embed;
131-
132124
stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell {};
133125
};
134126

@@ -191,7 +183,7 @@
191183
};
192184

193185
ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
194-
ghc926Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
186+
ghc927Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
195187
ghc944Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; };
196188
ghc961Config = (import ./configuration-ghc-96.nix) { inherit pkgs inputs; };
197189

@@ -202,14 +194,14 @@
202194
ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
203195
cases = {
204196
ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
205-
ghc926 = ghc926Config.tweakHpkgs (pkgs.hlsHpkgs "ghc926");
197+
ghc927 = ghc927Config.tweakHpkgs (pkgs.hlsHpkgs "ghc927");
206198
ghc944 = ghc944Config.tweakHpkgs (pkgs.hlsHpkgs "ghc944");
207199
ghc961 = ghc961Config.tweakHpkgs (pkgs.hlsHpkgs "ghc961");
208200
};
209201
in { default = cases."${ghcVersion}"; } // cases;
210202

211203
ghc902 = supportedGHCs.ghc902;
212-
ghc926 = supportedGHCs.ghc926;
204+
ghc927 = supportedGHCs.ghc927;
213205
ghc944 = supportedGHCs.ghc944;
214206
ghc961 = supportedGHCs.ghc961;
215207
ghcDefault = supportedGHCs.default;
@@ -240,9 +232,8 @@
240232
buildInputs = [
241233
# our compiling toolchain
242234
hpkgs.ghc
243-
pkgs.cabal-install
244235
# @guibou: I'm not sure hie-bios is needed
245-
pkgs.haskellPackages.hie-bios
236+
# pkgs.haskellPackages.hie-bios
246237
# Dependencies needed to build some parts of hackage
247238
gmp zlib ncurses
248239
# Changelog tooling
@@ -332,7 +323,7 @@
332323
simpleDevShells = {
333324
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
334325
haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
335-
haskell-language-server-926-dev = mkDevShell ghc926 "cabal.project";
326+
haskell-language-server-927-dev = mkDevShell ghc927 "cabal.project";
336327
haskell-language-server-944-dev = mkDevShell ghc944 "cabal.project";
337328
haskell-language-server-961-dev = mkDevShell ghc961 "cabal.project";
338329
};
@@ -341,7 +332,7 @@
341332
nixDevShells = {
342333
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
343334
haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
344-
haskell-language-server-926-dev-nix = mkDevShellWithNixDeps ghc926 "cabal.project";
335+
haskell-language-server-927-dev-nix = mkDevShellWithNixDeps ghc927 "cabal.project";
345336
haskell-language-server-944-dev-nix = mkDevShellWithNixDeps ghc944 "cabal.project";
346337
haskell-language-server-961-dev-nix = mkDevShellWithNixDeps ghc961 "cabal.project";
347338
};
@@ -351,15 +342,15 @@
351342
envShells = {
352343
haskell-language-server-dev-env = mkEnvShell ghcDefault;
353344
haskell-language-server-902-dev-env = mkEnvShell ghc902;
354-
haskell-language-server-926-dev-env = mkEnvShell ghc926;
345+
haskell-language-server-927-dev-env = mkEnvShell ghc927;
355346
haskell-language-server-944-dev-env = mkEnvShell ghc944;
356347
haskell-language-server-961-dev-env = mkEnvShell ghc961;
357348
};
358349

359350
allPackages = {
360351
haskell-language-server = mkExe ghcDefault;
361352
haskell-language-server-902 = mkExe ghc902;
362-
haskell-language-server-926 = mkExe ghc926;
353+
haskell-language-server-927 = mkExe ghc927;
363354
haskell-language-server-944 = mkExe ghc944;
364355
haskell-language-server-961 = mkExe ghc961;
365356
};

‎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

‎plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ test-suite tests
6161
, base >=4.12 && < 5
6262
, filepath
6363
, hls-change-type-signature-plugin
64-
, hls-test-utils ^>=1.5
64+
, hls-test-utils ^>=1.6
6565
, lsp
6666
, QuickCheck
6767
, regex-tdfa

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test-suite tests
6464
, filepath
6565
, ghcide ^>=1.8 || ^>= 1.9 || ^>= 1.10
6666
, hls-code-range-plugin
67-
, hls-test-utils ^>=1.5
67+
, hls-test-utils ^>=1.6
6868
, lens
6969
, lsp
7070
, lsp-test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ test-suite tests
111111
, filepath
112112
, hls-eval-plugin
113113
, hls-plugin-api
114-
, hls-test-utils ^>=1.5
114+
, hls-test-utils ^>=1.6
115115
, lens
116116
, lsp-types
117117
, text

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ test-suite tests
5555
, base
5656
, filepath
5757
, hls-explicit-fixity-plugin
58-
, hls-test-utils ^>=1.5
58+
, hls-test-utils ^>=1.6
5959
, text

‎plugins/hls-floskell-plugin/hls-floskell-plugin.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-floskell-plugin
3-
version: 1.0.2.0
3+
version: 1.0.2.1
44
synopsis: Integration with the Floskell code formatter
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -48,4 +48,4 @@ test-suite tests
4848
, base
4949
, filepath
5050
, hls-floskell-plugin
51-
, hls-test-utils ^>=1.5
51+
, hls-test-utils ^>=1.6

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ test-suite tests
6565
, filepath
6666
, hls-fourmolu-plugin
6767
, hls-plugin-api
68-
, hls-test-utils ^>=1.5
68+
, hls-test-utils ^>=1.6
6969
, lsp-test

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ test-suite tests
6868
, base
6969
, filepath
7070
, hls-haddock-comments-plugin
71-
, hls-test-utils ^>=1.5
71+
, hls-test-utils ^>=1.6
7272
, text

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ test-suite tests
9292
, filepath
9393
, hls-hlint-plugin
9494
, hls-plugin-api
95-
, hls-test-utils ^>=1.5
95+
, hls-test-utils ^>=1.6
9696
, lens
9797
, lsp-types
9898
, text

0 commit comments

Comments
 (0)