Merge branch 'master' into stale-type-lens

July541 · web-flow · commit d6f473723d84 · 2023-04-07T22:54:09.000+08:00
diff --git a/configuration-ghc-90.nix b/configuration-ghc-90.nix
@@ -38,6 +38,8 @@ let
 
       ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
 
+      fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
+
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.
diff --git a/configuration-ghc-92.nix b/configuration-ghc-92.nix
@@ -33,8 +33,12 @@ let
 
       ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
 
+      fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
+
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
+      hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
+
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.
diff --git a/configuration-ghc-94.nix b/configuration-ghc-94.nix
@@ -15,12 +15,6 @@ let
     } // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
       apply-refact = hsuper.apply-refact_0_12_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 { };
-
-      ormolu = hself.ormolu_0_5_3_0;
-
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
       # Re-generate HLS drv excluding some plugins
diff --git a/docs/support/ghc-version-support.md b/docs/support/ghc-version-support.md
@@ -17,14 +17,13 @@ Support status (see the support policy below for more details):
 
 | GHC version  | Last supporting HLS version                                                        | Support status                                                              |
 |--------------|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| 9.6.1        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | basic support                                                               |
 | 9.4.4        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
-| 9.4.3        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
-| 9.4.2        | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support                                                                |
-| 9.4.1        | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support                                                                |
-| 9.2.6        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
-| 9.2.5        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
-| 9.2.4        | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support                                                                |
-| 9.2.3        | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support                                                                |
+| 9.4.3        | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated                                                                  |
+| 9.4.(1,2)    | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated                                                                  |
+| 9.2.7        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
+| 9.2.(5,6)    | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated                                                                  |
+| 9.2.(3,4)    | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated                                                                  |
 | 9.2.(1,2)    | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated                                                                  |
 | 9.0.2        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support                                                                |
 | 9.0.1        | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated                                                                  |
diff --git a/docs/support/plugin-support.md b/docs/support/plugin-support.md
@@ -52,18 +52,18 @@ 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    |                          |
-| `hls-fourmolu-plugin`               | 2    |                          |
+| `hls-floskell-plugin`               | 2    | 9.6                      |
+| `hls-fourmolu-plugin`               | 2    | 9.6                      |
 | `hls-gadt-plugin`                   | 2    |                          |
-| `hls-hlint-plugin`                  | 2    |                          |
+| `hls-hlint-plugin`                  | 2    | 9.6                      |
 | `hls-module-name-plugin`            | 2    |                          |
 | `hls-qualify-imported-names-plugin` | 2    |                          |
-| `hls-ormolu-plugin`                 | 2    |                          |
+| `hls-ormolu-plugin`                 | 2    | 9.6                      |
 | `hls-rename-plugin`                 | 2    |                          |
 | `hls-refine-imports-plugin`         | 2    |                          |
-| `hls-stylish-haskell-plugin`        | 2    |                          |
-| `hls-tactics-plugin`                | 2    | 9.2, 9.4                 |
-| `hls-haddock-comments-plugin`       | 3    | 9.2, 9.4                 |
-| `hls-stan-plugin`                   | 3    | 8.6, 9.0, 9.2, 9.4       |
+| `hls-stylish-haskell-plugin`        | 2    | 9.6                      |
+| `hls-tactics-plugin`                | 2    | 9.2, 9.4, 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    |                          |
 | `hls-splice-plugin`                 | 3    |                          |
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -121,14 +121,6 @@
                 then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; })
                 else hsuper.ormolu;
 
-              # Due to the following issue, fixity-th should be disabled, especially for darwin.
-              # https://github.com/fourmolu/fourmolu/issues/238
-              # nixpkgs now disables fixity-th for ghc944.
-              fourmolu =
-                addBuildDepend
-                  (appendConfigureFlag hself.fourmolu_0_10_1_0 "-f-fixity-th")
-                  hself.file-embed;
-
               stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell {};
             };
 
@@ -191,7 +183,7 @@
         };
 
         ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
-        ghc926Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
+        ghc927Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
         ghc944Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; };
         ghc961Config = (import ./configuration-ghc-96.nix) { inherit pkgs inputs; };
 
@@ -202,14 +194,14 @@
           ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
           cases = {
             ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
-            ghc926 = ghc926Config.tweakHpkgs (pkgs.hlsHpkgs "ghc926");
+            ghc927 = ghc927Config.tweakHpkgs (pkgs.hlsHpkgs "ghc927");
             ghc944 = ghc944Config.tweakHpkgs (pkgs.hlsHpkgs "ghc944");
             ghc961 = ghc961Config.tweakHpkgs (pkgs.hlsHpkgs "ghc961");
           };
           in { default = cases."${ghcVersion}"; } // cases;
 
         ghc902 = supportedGHCs.ghc902;
-        ghc926 = supportedGHCs.ghc926;
+        ghc927 = supportedGHCs.ghc927;
         ghc944 = supportedGHCs.ghc944;
         ghc961 = supportedGHCs.ghc961;
         ghcDefault = supportedGHCs.default;
@@ -240,9 +232,8 @@
           buildInputs = [
             # our compiling toolchain
             hpkgs.ghc
-            pkgs.cabal-install
             # @guibou: I'm not sure hie-bios is needed
-            pkgs.haskellPackages.hie-bios
+            # pkgs.haskellPackages.hie-bios
             # Dependencies needed to build some parts of hackage
             gmp zlib ncurses
             # Changelog tooling
@@ -332,7 +323,7 @@
         simpleDevShells = {
           haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
           haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
-          haskell-language-server-926-dev = mkDevShell ghc926 "cabal.project";
+          haskell-language-server-927-dev = mkDevShell ghc927 "cabal.project";
           haskell-language-server-944-dev = mkDevShell ghc944 "cabal.project";
           haskell-language-server-961-dev = mkDevShell ghc961 "cabal.project";
         };
@@ -341,7 +332,7 @@
         nixDevShells = {
           haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
           haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
-          haskell-language-server-926-dev-nix = mkDevShellWithNixDeps ghc926 "cabal.project";
+          haskell-language-server-927-dev-nix = mkDevShellWithNixDeps ghc927 "cabal.project";
           haskell-language-server-944-dev-nix = mkDevShellWithNixDeps ghc944 "cabal.project";
           haskell-language-server-961-dev-nix = mkDevShellWithNixDeps ghc961 "cabal.project";
         };
@@ -351,15 +342,15 @@
         envShells = {
           haskell-language-server-dev-env = mkEnvShell ghcDefault;
           haskell-language-server-902-dev-env = mkEnvShell ghc902;
-          haskell-language-server-926-dev-env = mkEnvShell ghc926;
+          haskell-language-server-927-dev-env = mkEnvShell ghc927;
           haskell-language-server-944-dev-env = mkEnvShell ghc944;
           haskell-language-server-961-dev-env = mkEnvShell ghc961;
         };
 
         allPackages = {
           haskell-language-server = mkExe ghcDefault;
           haskell-language-server-902 = mkExe ghc902;
-          haskell-language-server-926 = mkExe ghc926;
+          haskell-language-server-927 = mkExe ghc927;
           haskell-language-server-944 = mkExe ghc944;
           haskell-language-server-961 = mkExe ghc961;
         };
diff --git a/ghcide/src/Development/IDE/Main.hs b/ghcide/src/Development/IDE/Main.hs
@@ -135,7 +135,6 @@ data Log
   | LogLspStart [PluginId]
   | LogLspStartDuration !Seconds
   | LogShouldRunSubset !Bool
-  | LogOnlyPartialGhc94Support
   | LogSetInitialDynFlagsException !SomeException
   | LogService Service.Log
   | LogShake Shake.Log
@@ -159,8 +158,6 @@ instance Pretty Log where
       "Started LSP server in" <+> pretty (showDuration duration)
     LogShouldRunSubset shouldRunSubset ->
       "shouldRunSubset:" <+> pretty shouldRunSubset
-    LogOnlyPartialGhc94Support ->
-      "Currently, HLS supports GHC 9.4 only partially. See [issue #3190](https://github.com/haskell/haskell-language-server/issues/3190) for more detail."
     LogSetInitialDynFlagsException e ->
       "setInitialDynFlags:" <+> pretty (displayException e)
     LogService log -> pretty log
@@ -341,9 +338,6 @@ defaultMain recorder Arguments{..} = withHeapStats (cmapWithPrio LogHeapStats re
                               , optRunSubset = runSubset
                               }
                       caps = LSP.resClientCapabilities env
-                  -- FIXME: Remove this after GHC 9.4 gets fully supported
-                  when (ghcVersion == GHC94) $
-                      log Warning LogOnlyPartialGhc94Support
                   monitoring <- argsMonitoring
                   initialise
                       (cmapWithPrio LogService recorder)
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -263,7 +263,7 @@ common retrie
 
 common tactic
   if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
-    build-depends: hls-tactics-plugin ^>= 1.8
+    build-depends: hls-tactics-plugin ^>= 1.8.1
     cpp-options: -Dhls_tactic
 
 common hlint
@@ -549,7 +549,7 @@ test-suite func-test
     , lens-aeson
     , ghcide
     , ghcide-test-utils
-    , hls-test-utils ^>=1.5
+    , hls-test-utils ^>=1.6
     , lsp-types
     , aeson
     , hls-plugin-api
diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal
@@ -1,6 +1,6 @@
 cabal-version:       1.22
 name:                hie-compat
-version:             0.3.1.0
+version:             0.3.1.1
 synopsis:            HIE files for GHC 8.8 and other HIE file backports
 license:             Apache-2.0
 description:
diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.4
 name:          hls-test-utils
-version:       1.5.0.0
+version:       1.6.0.0
 synopsis:      Utilities used in the tests of Haskell Language Server
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -41,7 +41,7 @@ library
     , directory
     , extra
     , filepath
-    , ghcide                  ^>=1.9 || ^>= 1.10
+    , ghcide                  ^>= 1.10
     , hls-graph
     , hls-plugin-api          ^>=1.6
     , lens
diff --git a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal
@@ -64,7 +64,7 @@ test-suite tests
     , base                 >=4.12 && < 5
     , filepath
     , hls-alternate-number-format-plugin
-    , hls-test-utils       ^>=1.5
+    , hls-test-utils       ^>=1.6
     , lsp
     , QuickCheck
     , regex-tdfa
diff --git a/plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal b/plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal
@@ -55,7 +55,7 @@ test-suite tests
     , directory
     , filepath
     , hls-cabal-fmt-plugin
-    , hls-test-utils        ^>=1.5
+    , hls-test-utils        ^>=1.6
 
   if flag(isolateTests)
     build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
diff --git a/plugins/hls-cabal-plugin/hls-cabal-plugin.cabal b/plugins/hls-cabal-plugin/hls-cabal-plugin.cabal
@@ -74,7 +74,7 @@ test-suite tests
     , filepath
     , ghcide
     , hls-cabal-plugin
-    , hls-test-utils    ^>=1.5
+    , hls-test-utils    ^>=1.6
     , lens
     , lsp-types
     , tasty-hunit
diff --git a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
@@ -59,7 +59,7 @@ test-suite tests
     , extra
     , filepath
     , hls-call-hierarchy-plugin
-    , hls-test-utils              ^>=1.5
+    , hls-test-utils              ^>=1.6
     , ghcide-test-utils
     , lens
     , lsp
diff --git a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal
@@ -61,7 +61,7 @@ test-suite tests
     , base                 >=4.12 && < 5
     , filepath
     , hls-change-type-signature-plugin
-    , hls-test-utils       ^>=1.5
+    , hls-test-utils       ^>=1.6
     , lsp
     , QuickCheck
     , regex-tdfa
diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal
@@ -74,7 +74,7 @@ test-suite tests
     , ghcide
     , hls-class-plugin
     , hls-plugin-api
-    , hls-test-utils     ^>=1.5
+    , hls-test-utils     ^>=1.6
     , lens
     , lsp-types
     , text
diff --git a/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal b/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal
@@ -64,7 +64,7 @@ test-suite tests
     , filepath
     , ghcide                     ^>=1.8 || ^>= 1.9 || ^>= 1.10
     , hls-code-range-plugin
-    , hls-test-utils             ^>=1.5
+    , hls-test-utils             ^>=1.6
     , lens
     , lsp
     , lsp-test
diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal
@@ -111,7 +111,7 @@ test-suite tests
     , filepath
     , hls-eval-plugin
     , hls-plugin-api
-    , hls-test-utils   ^>=1.5
+    , hls-test-utils   ^>=1.6
     , lens
     , lsp-types
     , text
diff --git a/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal b/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal
@@ -55,5 +55,5 @@ test-suite tests
     , base
     , filepath
     , hls-explicit-fixity-plugin
-    , hls-test-utils              ^>=1.5
+    , hls-test-utils              ^>=1.6
     , text
diff --git a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               hls-floskell-plugin
-version:            1.0.2.0
+version:            1.0.2.1
 synopsis:           Integration with the Floskell code formatter
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -48,4 +48,4 @@ test-suite tests
     , base
     , filepath
     , hls-floskell-plugin
-    , hls-test-utils       ^>=1.5
+    , hls-test-utils       ^>=1.6
diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
@@ -65,5 +65,5 @@ test-suite tests
     , filepath
     , hls-fourmolu-plugin
     , hls-plugin-api
-    , hls-test-utils       ^>=1.5
+    , hls-test-utils       ^>=1.6
     , lsp-test
diff --git a/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal b/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
@@ -59,7 +59,7 @@ test-suite tests
     , base
     , filepath
     , hls-gadt-plugin
-    , hls-test-utils              ^>=1.5
+    , hls-test-utils              ^>=1.6
     , lens
     , lsp
     , lsp-test
diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
@@ -68,5 +68,5 @@ test-suite tests
     , base
     , filepath
     , hls-haddock-comments-plugin
-    , hls-test-utils               ^>=1.5
+    , hls-test-utils               ^>=1.6
     , text
diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
@@ -92,7 +92,7 @@ test-suite tests
     , filepath
     , hls-hlint-plugin
     , hls-plugin-api
-    , hls-test-utils      ^>=1.5
+    , hls-test-utils      ^>=1.6
     , lens
     , lsp-types
     , text
diff --git a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal
diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
diff --git a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal
diff --git a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal
diff --git a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
diff --git a/plugins/hls-rename-plugin/hls-rename-plugin.cabal b/plugins/hls-rename-plugin/hls-rename-plugin.cabal
diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal
diff --git a/plugins/hls-stan-plugin/hls-stan-plugin.cabal b/plugins/hls-stan-plugin/hls-stan-plugin.cabal
diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
