Merge branch 'master' into package-name-2

.circleci/config.yml

@@ -75,9 +75,9 @@ defaults: &defaults
 
 version: 2
 jobs:
-  stackage-lts19:
+  stackage-lts21:
     environment:
-      - STACK_FILE: "stack-lts19.yaml"
+      - STACK_FILE: "stack-lts21.yaml"
     <<: *defaults
 
   stackage-nightly:
@@ -90,5 +90,5 @@ workflows:
   version: 2
   multiple-ghcs:
     jobs:
-      - stackage-lts19
+      - stackage-lts21
       - stackage-nightly

.github/actions/setup-build/action.yml

@@ -31,7 +31,7 @@ runs:
         sudo chown -R $USER /usr/local/.ghcup
       shell: bash
 
-    - uses: haskell/actions/[email protected].3
+    - uses: haskell/actions/[email protected].4
       id: HaskEnvSetup
       with:
         ghc-version  : ${{ inputs.ghc   }}

.github/workflows/bench.yml

@@ -121,7 +121,7 @@ jobs:
         example: ['cabal', 'lsp-types']
 
     steps:
-    - uses: haskell/actions/[email protected].3
+    - uses: haskell/actions/[email protected].4
       with:
         ghc-version  : ${{ matrix.ghc   }}
         cabal-version: ${{ matrix.cabal }}

.github/workflows/nix.yml

@@ -103,6 +103,10 @@ jobs:
     # We only build nix dev shell for current GHC version because some are
     # failing with different GHC version on darwin.
     - name: Build development shell with nix dependencies for current GHC version
+      if: matrix.os == 'macOS-latest'
+      run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
+    - name: Build development shells with nix dependencies
+      if: matrix.os == 'ubuntu-latest'
       run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
     - name: Push development shell
       if: ${{ env.HAS_TOKEN == 'true' }}

.github/workflows/test.yml

@@ -41,6 +41,7 @@ jobs:
                          , "**/stack*.yaml"
                          , ".gitlab-ci.yaml"
                          , ".gitlab/**"
+                         , "CODEOWNERS"
                          ]'
       # If we only change ghcide downstream packages we have not test ghcide itself
       - id: skip_ghcide_check

CODEOWNERS

@@ -30,7 +30,7 @@
 /plugins/hls-code-range-plugin @kokobd
 /plugins/hls-splice-plugin @konn
 /plugins/hls-stylish-haskell-plugin @Ailrun
-/plugins/hls-tactics-plugin @isovector
+/plugins/hls-tactics-plugin
 /plugins/hls-stan-plugin @uhbif19
 /plugins/hls-explicit-record-fields-plugin @ozkutuk
 /plugins/hls-overloaded-record-dot-plugin @joyfulmantis

configuration-ghc-90.nix

@@ -14,15 +14,11 @@ let
           doCheck = false;
         });
     } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
-      # ptr-poker breaks on MacOS without SSE2 optimizations
-      # https://github.com/nikita-volkov/ptr-poker/issues/11
-      ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
-
       Cabal = hself.Cabal_3_6_3_0;
 
       Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
 
-      ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
+      ghc-lib-parser = hsuper.ghc-lib-parser_9_4_5_20230430;
 
       lsp = hself.callCabal2nix "lsp" inputs.lsp {};
       lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
@@ -42,7 +38,7 @@ let
 
       ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
 
-      fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
+      fourmolu = hsuper.fourmolu_0_10_1_0;
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

configuration-ghc-92.nix

@@ -21,29 +21,25 @@ let
     } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
       apply-refact = hsuper.apply-refact_0_13_0_0;
 
-      # ptr-poker breaks on MacOS without SSE2 optimizations
-      # https://github.com/nikita-volkov/ptr-poker/issues/11
-      ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
-
       Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
 
-      ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
+      ghc-lib-parser = hsuper.ghc-lib-parser_9_4_5_20230430;
 
       hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
 
       ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
 
-      fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
+      fourmolu = hsuper.fourmolu_0_10_1_0;
 
-      stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
+      stylish-haskell = hsuper.stylish-haskell_0_14_4_0;
 
       hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
 
       implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
 
       lsp = hself.callCabal2nix "lsp" inputs.lsp {};
       lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
-      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+      lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

configuration-ghc-94.nix

@@ -15,11 +15,13 @@ let
     } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
       apply-refact = hsuper.apply-refact_0_13_0_0;
 
+      fourmolu = dontCheck (hself.callCabal2nix "fourmolu" inputs.fourmolu-011 {});
+
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
       lsp = hself.callCabal2nix "lsp" inputs.lsp {};
       lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
-      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+      lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

configuration-ghc-96.nix

@@ -29,34 +29,24 @@ let
             doCheck = false;
           });
       apply-refact = hsuper.apply-refact_0_13_0_0;
-      tagged = hself.callHackage "tagged" "0.8.7" { };
-      primitive = hself.callHackage "primitive" "0.8.0.0" { };
-      unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { };
-      MonadRandom = hself.callHackage "MonadRandom" "0.6" { };
-      hiedb = hself.callCabal2nix "hiedb" inputs.haskell-hiedb { };
+      tagged = hsuper.tagged_0_8_7;
+      primitive = hsuper.primitive_0_8_0_0;
+      MonadRandom = hsuper.MonadRandom_0_6;
       hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
+      hlint = hself.callCabal2nix "hlint" inputs.hlint-36 {};
       implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
-      ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.haskell-ghc-exactprint { };
 
-      # ptr-poker breaks on MacOS without SSE2 optimizations
-      # https://github.com/nikita-volkov/ptr-poker/issues/11
-      ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
+      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-012 {};
 
-      ormolu = hself.ormolu_0_5_3_0;
+      ghc-lib-parser-ex = hsuper.ghc-lib-parser-ex_9_6_0_0;
 
-      # TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors:
-      #   tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive
-      #   tar: */fourmolu/0.13.0.0/fourmolu.cabal: Not found in archive
-      #   tar: Exiting with failure status due to previous errors
-      # As an alternative, we could build directly from github:fourmolu. How do people
-      # feel about this?
-      fourmolu = hself.callHackage "fourmolu" "0.12.0.0" {};
+      ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-07 {};
 
-      stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
+      stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell-0145 {};
 
       lsp = hself.callCabal2nix "lsp" inputs.lsp {};
       lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
-      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+      lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

docs/support/plugin-support.md

@@ -52,7 +52,6 @@ For example, a plugin to provide a formatter which has itself been abandoned has
 | `hls-eval-plugin`                   | 2    |                          |
 | `hls-explicit-fixity-plugin`        | 2    |                          |
 | `hls-explicit-record-fields-plugin` | 2    |                          |
-| `hls-floskell-plugin`               | 2    | 9.6                      |
 | `hls-fourmolu-plugin`               | 2    |                          |
 | `hls-gadt-plugin`                   | 2    |                          |
 | `hls-hlint-plugin`                  | 2    |                          |
@@ -64,6 +63,7 @@ For example, a plugin to provide a formatter which has itself been abandoned has
 | `hls-stylish-haskell-plugin`        | 2    |                          |
 | `hls-tactics-plugin`                | 2    | 9.2, 9.4, 9.6            |
 | `hls-overloaded-record-dot-plugin`  | 2    | 8.10, 9.0                |
+| `hls-floskell-plugin`               | 3    | 9.6                      |
 | `hls-haddock-comments-plugin`       | 3    | 9.2, 9.4, 9.6            |
 | `hls-stan-plugin`                   | 3    | 8.6, 9.0, 9.2, 9.4, 9.6  |
 | `hls-retrie-plugin`                 | 3    |                          |

exe/Main.hs

@@ -13,15 +13,15 @@ import           Data.Function                 ((&))
 import           Data.Functor                  ((<&>))
 import           Data.Maybe                    (catMaybes)
 import           Data.Text                     (Text)
-import           Development.IDE.Types.Logger  (Doc, Priority (Error, Info),
+import           Ide.Logger  (Doc, Priority (Error, Info),
                                                 Recorder,
                                                 WithPriority (WithPriority, priority),
                                                 cfilter, cmapWithPrio,
                                                 defaultLayoutOptions,
                                                 layoutPretty, logWith,
                                                 makeDefaultStderrRecorder,
                                                 renderStrict, withFileRecorder)
-import qualified Development.IDE.Types.Logger  as Logger
+import qualified Ide.Logger  as Logger
 import qualified HlsPlugins                    as Plugins
 import           Ide.Arguments                 (Arguments (..),
                                                 GhcideArguments (..),

exe/Wrapper.hs

@@ -45,14 +45,14 @@ import qualified Data.Text                          as T
 import qualified Data.Text.IO                       as T
 import           Development.IDE.LSP.LanguageServer (runLanguageServer)
 import qualified Development.IDE.Main               as Main
-import           Development.IDE.Types.Logger       (Doc, Logger (Logger),
+import           GHC.Stack.Types                    (emptyCallStack)
+import           Ide.Logger                         (Doc, Logger (Logger),
                                                      Pretty (pretty),
                                                      Recorder (logger_),
                                                      WithPriority (WithPriority),
                                                      cmapWithPrio,
                                                      makeDefaultStderrRecorder,
                                                      toCologActionWithPrio)
-import           GHC.Stack.Types                    (emptyCallStack)
 import           Ide.Plugin.Config                  (Config)
 import           Ide.Types                          (IdePlugins (IdePlugins))
 import           Language.LSP.Protocol.Message      (Method (Method_Initialize),