Skip to content

Commit 861172c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into wip/usage-leak
2 parents a5444d9 + 5aa14b3 commit 861172c

File tree

76 files changed

+1029
-722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1029
-722
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ defaults: &defaults
7575

7676
version: 2
7777
jobs:
78-
stackage-lts19:
78+
stackage-lts21:
7979
environment:
80-
- STACK_FILE: "stack-lts19.yaml"
80+
- STACK_FILE: "stack-lts21.yaml"
8181
<<: *defaults
8282

8383
stackage-nightly:
@@ -90,5 +90,5 @@ workflows:
9090
version: 2
9191
multiple-ghcs:
9292
jobs:
93-
- stackage-lts19
93+
- stackage-lts21
9494
- stackage-nightly

‎.github/workflows/nix.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ jobs:
103103
# We only build nix dev shell for current GHC version because some are
104104
# failing with different GHC version on darwin.
105105
- name: Build development shell with nix dependencies for current GHC version
106+
if: matrix.os == 'macOS-latest'
107+
run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
108+
- name: Build development shells with nix dependencies
109+
if: matrix.os == 'ubuntu-latest'
106110
run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
107111
- name: Push development shell
108112
if: ${{ env.HAS_TOKEN == 'true' }}

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
, "**/stack*.yaml"
4242
, ".gitlab-ci.yaml"
4343
, ".gitlab/**"
44+
, "CODEOWNERS"
4445
]'
4546
# If we only change ghcide downstream packages we have not test ghcide itself
4647
- id: skip_ghcide_check

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/plugins/hls-code-range-plugin @kokobd
3131
/plugins/hls-splice-plugin @konn
3232
/plugins/hls-stylish-haskell-plugin @Ailrun
33-
/plugins/hls-tactics-plugin @isovector
33+
/plugins/hls-tactics-plugin
3434
/plugins/hls-stan-plugin @uhbif19
3535
/plugins/hls-explicit-record-fields-plugin @ozkutuk
3636
/plugins/hls-overloaded-record-dot-plugin @joyfulmantis

‎configuration-ghc-90.nix‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ let
1414
doCheck = false;
1515
});
1616
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
17-
# ptr-poker breaks on MacOS without SSE2 optimizations
18-
# https://github.com/nikita-volkov/ptr-poker/issues/11
19-
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
20-
2117
Cabal = hself.Cabal_3_6_3_0;
2218

2319
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
2420

25-
ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
21+
ghc-lib-parser = hsuper.ghc-lib-parser_9_4_5_20230430;
2622

2723
lsp = hself.callCabal2nix "lsp" inputs.lsp {};
2824
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
@@ -42,7 +38,7 @@ let
4238

4339
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
4440

45-
fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
41+
fourmolu = hsuper.fourmolu_0_10_1_0;
4642

4743
# Re-generate HLS drv excluding some plugins
4844
haskell-language-server =

‎configuration-ghc-92.nix‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,25 @@ let
2121
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
2222
apply-refact = hsuper.apply-refact_0_13_0_0;
2323

24-
# ptr-poker breaks on MacOS without SSE2 optimizations
25-
# https://github.com/nikita-volkov/ptr-poker/issues/11
26-
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
27-
2824
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
2925

30-
ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
26+
ghc-lib-parser = hsuper.ghc-lib-parser_9_4_5_20230430;
3127

3228
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
3329

3430
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
3531

36-
fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
32+
fourmolu = hsuper.fourmolu_0_10_1_0;
3733

38-
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
34+
stylish-haskell = hsuper.stylish-haskell_0_14_4_0;
3935

4036
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
4137

4238
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
4339

4440
lsp = hself.callCabal2nix "lsp" inputs.lsp {};
4541
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
46-
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
42+
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
4743

4844
# Re-generate HLS drv excluding some plugins
4945
haskell-language-server =

‎configuration-ghc-94.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ let
1515
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
1616
apply-refact = hsuper.apply-refact_0_13_0_0;
1717

18+
fourmolu = dontCheck (hself.callCabal2nix "fourmolu" inputs.fourmolu-011 {});
19+
1820
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
1921

2022
lsp = hself.callCabal2nix "lsp" inputs.lsp {};
2123
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
22-
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
24+
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
2325

2426
# Re-generate HLS drv excluding some plugins
2527
haskell-language-server =

‎configuration-ghc-96.nix‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,24 @@ let
2929
doCheck = false;
3030
});
3131
apply-refact = hsuper.apply-refact_0_13_0_0;
32-
tagged = hself.callHackage "tagged" "0.8.7" { };
33-
primitive = hself.callHackage "primitive" "0.8.0.0" { };
34-
unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { };
35-
MonadRandom = hself.callHackage "MonadRandom" "0.6" { };
36-
hiedb = hself.callCabal2nix "hiedb" inputs.haskell-hiedb { };
32+
tagged = hsuper.tagged_0_8_7;
33+
primitive = hsuper.primitive_0_8_0_0;
34+
MonadRandom = hsuper.MonadRandom_0_6;
3735
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
36+
hlint = hself.callCabal2nix "hlint" inputs.hlint-36 {};
3837
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
39-
ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.haskell-ghc-exactprint { };
4038

41-
# ptr-poker breaks on MacOS without SSE2 optimizations
42-
# https://github.com/nikita-volkov/ptr-poker/issues/11
43-
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
39+
fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-012 {};
4440

45-
ormolu = hself.ormolu_0_5_3_0;
41+
ghc-lib-parser-ex = hsuper.ghc-lib-parser-ex_9_6_0_0;
4642

47-
# TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors:
48-
# tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive
49-
# tar: */fourmolu/0.13.0.0/fourmolu.cabal: Not found in archive
50-
# tar: Exiting with failure status due to previous errors
51-
# As an alternative, we could build directly from github:fourmolu. How do people
52-
# feel about this?
53-
fourmolu = hself.callHackage "fourmolu" "0.12.0.0" {};
43+
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-07 {};
5444

55-
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
45+
stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell-0145 {};
5646

5747
lsp = hself.callCabal2nix "lsp" inputs.lsp {};
5848
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
59-
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
49+
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
6050

6151
# Re-generate HLS drv excluding some plugins
6252
haskell-language-server =

‎exe/Main.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import Data.Function ((&))
1313
import Data.Functor ((<&>))
1414
import Data.Maybe (catMaybes)
1515
import Data.Text (Text)
16-
import Development.IDE.Types.Logger (Doc, Priority (Error, Info),
16+
import Ide.Logger (Doc, Priority (Error, Info),
1717
Recorder,
1818
WithPriority (WithPriority, priority),
1919
cfilter, cmapWithPrio,
2020
defaultLayoutOptions,
2121
layoutPretty, logWith,
2222
makeDefaultStderrRecorder,
2323
renderStrict, withFileRecorder)
24-
import qualified Development.IDE.Types.Logger as Logger
24+
import qualified Ide.Logger as Logger
2525
import qualified HlsPlugins as Plugins
2626
import Ide.Arguments (Arguments (..),
2727
GhcideArguments (..),

‎exe/Wrapper.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ import qualified Data.Text as T
4545
import qualified Data.Text.IO as T
4646
import Development.IDE.LSP.LanguageServer (runLanguageServer)
4747
import qualified Development.IDE.Main as Main
48-
import Development.IDE.Types.Logger (Doc, Logger (Logger),
48+
import GHC.Stack.Types (emptyCallStack)
49+
import Ide.Logger (Doc, Logger (Logger),
4950
Pretty (pretty),
5051
Recorder (logger_),
5152
WithPriority (WithPriority),
5253
cmapWithPrio,
5354
makeDefaultStderrRecorder,
5455
toCologActionWithPrio)
55-
import GHC.Stack.Types (emptyCallStack)
5656
import Ide.Plugin.Config (Config)
5757
import Ide.Types (IdePlugins (IdePlugins))
5858
import Language.LSP.Protocol.Message (Method (Method_Initialize),

0 commit comments

Comments
 (0)