Merge branch 'master' into hls-class-plugin-9.4

Author: July541

.github/workflows/caching.yml

@@ -85,7 +85,6 @@ jobs:
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
-             , "8.6.5"
              ]
         os: [ "ubuntu-latest"
             , "macOS-latest"

.github/workflows/flags.yml

@@ -48,7 +48,6 @@ jobs:
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
-             , "8.6.5"
              ]
         os: [ "ubuntu-latest"
             ]

.github/workflows/hackage.yml

@@ -41,7 +41,6 @@ jobs:
         ghc: [ "9.0.2"
              , "8.10.7"
              , "8.8.4"
-             , "8.6.5"
              ]
         exclude:
         - ghc: "9.0.2"

.github/workflows/hlint.yml

@@ -18,7 +18,7 @@ jobs:
         version: '3.4'
 
     - name: 'Checking code'
-      uses: rwe/actions-hlint-run@v1
+      uses: rwe/actions-hlint-run@v2
       with:
         hlint-bin: "hlint --with-group=extra"
         fail-on: error

.github/workflows/test.yml

@@ -64,7 +64,6 @@ jobs:
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
-             , "8.6.5"
              ]
         os: [ "ubuntu-latest"
             , "macOS-latest"
@@ -86,9 +85,6 @@ jobs:
            - os: ubuntu-latest
              ghc: '8.8.4'
              test: true
-           - os: ubuntu-latest
-             ghc: '8.6.5'
-             test: true
            - os: windows-latest
              ghc: '9.4.2'
              test: true
@@ -101,9 +97,6 @@ jobs:
            - os: windows-latest
              ghc: '8.10.7'
              test: true
-           - os: windows-latest
-             ghc: '8.6.5'
-             test: true
            # only build rest of supported ghc versions for windows
            - os: windows-latest
              ghc: '8.8.4'

.gitpod.Dockerfile

@@ -7,7 +7,6 @@ RUN sudo install-packages build-essential curl libffi-dev libffi7 libgmp-dev lib
     echo 'export PATH=$HOME/.cabal/bin:$HOME/.local/bin:$PATH' >> $HOME/.bashrc && \
     . /home/gitpod/.ghcup/env && \
     # Install all verions of GHC that HLS supports. Putting GHC into Docker image makes workspace start much faster.
-    ghcup install ghc 8.6.5 && \
     ghcup install ghc 8.8.4 && \
     ghcup install ghc 8.10.7 && \
     ghcup install ghc 9.0.2 && \

.hlint.yaml

@@ -23,6 +23,7 @@
 - ignore: {name: "Use camelCase"}
 - ignore: {name: "Use uncurry"}
 - ignore: {name: "Avoid lambda using `infix`"}
+- ignore: {name: "Replace case with fromMaybe"}
 
 # Gives at least one suggestion we don't like.
 - ignore: {name: "Use <=<"}
@@ -65,11 +66,11 @@
     - Wingman.Types
     - AutoTupleSpec
   - name: unsafeInterleaveIO
-    within: 
+    within:
     - Development.IDE.LSP.LanguageServer
   - {name: unsafeDupablePerformIO, within: []}
   - name: unsafeCoerce
-    within: 
+    within:
     - Ide.Plugin.Eval.Code
     - Development.IDE.Core.Compile
     - Development.IDE.Types.Shake
@@ -85,12 +86,12 @@
     - Compat.HieBin
 
   # Partial functions
-  
+
   # We need to check fucntions which
   # are typically exported multiple ways under both names,
   # see https://github.com/ndmitchell/hlint/issues/1389
   - name: [Prelude.head, Data.List.head]
-    within: 
+    within:
     - Main
     - Experiments
     - Development.Benchmark.Rules
@@ -116,7 +117,7 @@
     - Wingman.Tactics
 
   - name: [Prelude.tail, Data.List.tail]
-    within: 
+    within:
     - Main
     - Development.Benchmark.Rules
     - Development.IDE.Plugin.CodeAction
@@ -125,7 +126,7 @@
     - UnificationSpec
 
   - name: [Prelude.last, Data.List.last]
-    within: 
+    within:
     - Main
     - Development.IDE.Plugin.CodeAction
     - Development.IDE.Plugin.CodeAction.ExactPrint
@@ -136,7 +137,7 @@
     - Ide.Plugin.Eval.CodeLens
 
   - name: [Prelude.init, Data.List.init]
-    within: 
+    within:
     - Main
     - Development.IDE.Spans.Common
     - Ide.PluginUtils
@@ -151,7 +152,7 @@
     within: []
 
   - name: ["Prelude.!!", "Data.List.!!"]
-    within: 
+    within:
     - Main
     - Experiments
     - FunctionalCodeAction
@@ -171,11 +172,11 @@
     within: []
 
   - name: Data.Foldable.foldr1
-    within: 
+    within:
     - Wingman.Tactics
 
-  - name: Data.Maybe.fromJust 
-    within: 
+  - name: Data.Maybe.fromJust
+    within:
     - Experiments
     - Main
     - MultipleImports
@@ -193,7 +194,7 @@
     - Ide.Plugin.Class
 
   - name: "Data.Map.!"
-    within: 
+    within:
     - Wingman.LanguageServer
 
   - name: "Data.IntMap.!"
@@ -210,7 +211,7 @@
   # Debug.Trace, because that module also
   # includes the eventlog tracing functions,
   # which are legitimate to use.
-  - name: 
+  - name:
     - Debug.Trace.trace
     - Debug.Trace.traceId
     - Debug.Trace.traceShow
@@ -220,7 +221,7 @@
     - Debug.Trace.traceM
     - Debug.Trace.traceShowM
     - Debug.Trace.putTraceMsg
-    within: 
+    within:
     - Development.IDE.Core.Compile
     - Development.IDE.Graph.Internal.Database
     - Development.IDE.GHC.Util

bench/Main.hs

@@ -44,7 +44,6 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE TypeFamilies       #-}
 {-# OPTIONS -Wno-orphans #-}
-{-# LANGUAGE PackageImports     #-}
 
 import           Control.Lens                (preview, (^.))
 import           Control.Monad.Extra

bindist/ghcs

@@ -1,4 +1,3 @@
-8.6.5,cabal.project
 8.8.4,cabal.project
 8.10.7,cabal.project
 9.0.2,cabal.project

configuration-ghc-94.nix

@@ -41,8 +41,8 @@ let
       integer-logarithms = hsuper.callHackage "integer-logarithms" "1.0.3.1" {};
       hiedb = hsuper.callHackage "hiedb" "0.4.2.0" {};
       hie-bios = hsuper.callHackage "hie-bios" "0.11.0" {};
-      lsp = hsuper.callCabal2nix "lsp" "${inputs.lsp}/lsp" {};
-      lsp-types = hsuper.callCabal2nix "lsp-types" "${inputs.lsp}/lsp-types" {};
+      lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
+      lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

docs/contributing/contributing.md

@@ -64,8 +64,6 @@ To create binaries:
 * `nix build .#haskell-language-server-884` - GHC 8.8.4
 * `nix build .#haskell-language-server-901` - GHC 9.0.1
 
-GHC 8.6.5 is not supported here because `nixpkgs-unstable` no longer maintains the corresponding packages set.
-
 ## Testing
 
 The tests make use of the [Tasty](https://github.com/feuerbach/tasty) test framework.
@@ -196,7 +194,7 @@ See the [tutorial](./plugin-tutorial.md) on writing a plugin in HLS.
 
 When ghcide is built with the `ekg` flag, HLS opens a metrics server on port 8999 exposing GC and ghcide metrics. The ghcide metrics currently exposed are:
 
-- `ghcide.values_count`- count of build results in the store
+- `ghcide.values_count` - count of build results in the store
 - `ghcide.database_count` - count of build keys in the store (these two would be the same in the absence of GC)
 - `ghcide.build_count` - build count. A key is GC'ed if it is dirty and older than 100 builds
 - `ghcide.dirty_keys_count` - non transitive count of dirty build keys

docs/contributing/plugin-tutorial.md

@@ -34,7 +34,7 @@ And here is the gist of the algorithm:
 
 ## Setup
 
-To get started, let’s fetch the HLS repo and build it. You need at least GHC 8.6 for this:
+To get started, let’s fetch the HLS repo and build it. You need at least GHC 8.8 for this:
 
 ```
 git clone --recursive http://github.com/haskell/haskell-language-server hls
@@ -44,7 +44,7 @@ cabal build
 ```
 
 If you run into any issues trying to build the binaries, the #haskell-language-server IRC chat room in
-Freenode is always a good place to ask for help.
+[Libera Chat](https://libera.chat/) is always a good place to ask for help.
 
 Once cabal is done take a note of the location of the `haskell-language-server` binary and point your LSP client to it. In VSCode this is done by editing the "Haskell Server Executable Path" setting. This way you can simply test your changes by reloading your editor after rebuilding the binary.
 
@@ -83,20 +83,20 @@ The HLS codebase includes several plugins under the namespace `Ide.Plugin.*`, th
 
 I would recommend looking at the existing plugins for inspiration and reference.
 
-Plugins are "linked" in the `Main` module, so we will need to add our plugin there once we have defined it:
+Plugins are "linked" in the `HlsPlugins` module, so we will need to add our plugin there once we have defined it:
 
 ```haskell
 idePlugins = pluginDescToIdePlugins allPlugins
   where
     allPlugins =
-      [ GhcIde.descriptor  "ghcide"
-      , Pragmas.descriptor  "pragmas"
+      [ GhcIde.descriptor "ghcide"
+      , Pragmas.descriptor "pragmas"
       , Floskell.descriptor "floskell"
       , Fourmolu.descriptor "fourmolu"
-      , Ormolu.descriptor   "ormolu"
+      , Ormolu.descriptor "ormolu"
       , StylishHaskell.descriptor "stylish-haskell"
       , Retrie.descriptor "retrie"
-      , Brittany.descriptor    "brittany"
+      , Brittany.descriptor "brittany"
       , Eval.descriptor "eval"
       ]
 ```
@@ -271,7 +271,7 @@ runImportCommand _lspFuncs _state (ImportCommandParams edit) = do
 
 The code lens provider implements all the steps of the algorithm described earlier:
 
-> 1. Request the type checking artefacts from the ghcide subsystem
+>  1. Request the type checking artefacts from the ghcide subsystem
 >  2. Extract the actual import lists from the type checked AST,
 >  3. Ask GHC to produce the minimal import lists for this AST,
 >  4. For every import statement without a explicit import list, find out what's the minimal import list, and produce a code lens to display it together with a diff to graft the import list in.
@@ -381,7 +381,7 @@ generateLens pId uri minImports (L src imp)
 
 ## Wrapping up
 
-There's only one haskell code change left to do at this point: "link" the plugin in the `Main` HLS module.
+There's only one haskell code change left to do at this point: "link" the plugin in the `HlsPlugins` HLS module.
 However integrating the plugin in haskell-language-server itself will need some changes in config files. The best way is looking for the id (f.e. `hls-tactics-plugin`) of an existing plugin:
 - `./cabal*.project` and `./stack*.yaml`: add the plugin package in the `packages` field
 - `./haskell-language-server.cabal`: add a conditional block with the plugin package dependency
@@ -392,5 +392,4 @@ However integrating the plugin in haskell-language-server itself will need some
 The full code as used in this tutorial, including imports, can be found in [this Gist](https://gist.github.com/pepeiborra/49b872b2e9ad112f61a3220cdb7db967) as well as in this [branch](https://github.com/pepeiborra/ide/blob/imports-lens/src/Ide/Plugin/ImportLens.hs)
 
 I hope this has given you a taste of how easy and joyful it is to write plugins for HLS.
-If you are looking for ideas for contributing, here are some cool ones found in the HLS issue tracker:
-- https://github.com/haskell/haskell-language-server/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+possible+new+plugin%22
+If you are looking for ideas for contributing, here are some cool ones found in the HLS [issue tracker](https://github.com/haskell/haskell-language-server/issues?q=is%3Aopen+is%3Aissue+label%3A%22type%3A+possible+new+plugin%22).

docs/installation.md

@@ -157,7 +157,7 @@ Homebrew users can install `haskell-language-server` using the following command
 brew install haskell-language-server
 ```
 
-This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.6.5, 8.8.4, 8.10.7.
+This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.8.4, 8.10.7.
 
 You need to provide your own GHC/Cabal/Stack as required by your project, possibly via Homebrew.
 

docs/support/ghc-version-support.md

@@ -32,7 +32,7 @@ Support status (see the support policy below for more details):
 | 8.8.4        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support, will be deprecated after LTS and HLS full support for ghc-9.2 |
 | 8.8.3        | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1)         | deprecated                                                                  |
 | 8.8.2        | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0)     | deprecated                                                                  |
-| 8.6.5        | [latest](https://github.com/haskell/haskell-language-server/releases/latest)       | full support, will be deprecated after LTS and HLS full suppot for ghc-9.2  |
+| 8.6.5        | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated                                                                  |
 | 8.6.4        | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0)     | deprecated                                                                  |
 
 GHC versions not in the list have never been supported by HLS.

exe/Wrapper.hs

@@ -12,11 +12,11 @@
 module Main where
 
 import           Control.Monad.Extra
-import           Data.Char                          (isSpace)
 import           Data.Default
 import           Data.Either.Extra                  (eitherToMaybe)
 import           Data.Foldable
 import           Data.List
+import           Data.List.Extra                    (trimEnd)
 import           Data.Void
 import qualified Development.IDE.Session            as Session
 import qualified HIE.Bios.Environment               as HieBios
@@ -232,7 +232,7 @@ findProjectCradle' log = do
 trim :: String -> String
 trim s = case lines s of
   [] -> s
-  ls -> dropWhileEnd isSpace $ last ls
+  ls -> trimEnd $ last ls
 
 data WrapperSetupError
     = FailedToObtainGhcVersion (ActionName Void) CradleError