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 =