Sync with upstream

.github/workflows/caching.yml

@@ -80,11 +80,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -118,7 +117,7 @@ jobs:
           cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild
         env:
           # needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
-          CPATH:"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi":$CPATH
+          CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
 
       # We build ghcide with benchs and test enabled to include its dependencies in the cache
       # (including shake-bench)

.github/workflows/flags.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
              , "9.0.2"
              , "8.10.7"
              , "8.8.4"
@@ -68,7 +68,7 @@ jobs:
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
       # we have to clean up warnings for 9.0 and 9.2 before enable -WAll
-      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.3'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 

.github/workflows/hlint.yml

@@ -6,7 +6,7 @@ on:
       - '**'
 
 jobs:
-  build10:
+  hlint:
     name: "Hlint check run"
     runs-on: ubuntu-latest
     steps:
@@ -15,11 +15,12 @@ jobs:
     - name: 'Installing'
       uses: rwe/actions-hlint-setup@v1
       with:
-        version: '3.3.4'
+        version: '3.4'
 
     - name: 'Checking code'
       uses: rwe/actions-hlint-run@v1
       with:
-        hlint-bin: "hlint --with-group=extra --hint=ghcide/.hlint.yaml"
-        path: '[ "ghcide/src", "ghcide/exe", "ghcide/bench/lib", "ghcide/bench/exe", "ghcide/bench/hist", "shake-bench/src", "ghcide/test/exe"]'
+        hlint-bin: "hlint --with-group=extra"
+        fail-on: error
+        path: .
 

.github/workflows/test.yml

@@ -57,11 +57,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.2"
+        ghc: [ "9.2.3"
+             , "9.2.2"
              , "9.0.2"
-             , "9.0.1"
              , "8.10.7"
-             , "8.10.6"
              , "8.8.4"
              , "8.6.5"
              ]
@@ -71,7 +70,7 @@ jobs:
         include:
            # only test supported ghc major versions
            - os: ubuntu-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: ubuntu-latest
              ghc: '9.0.2'
@@ -86,7 +85,7 @@ jobs:
              ghc: '8.6.5'
              test: true
            - os: windows-latest
-             ghc: '9.2.2'
+             ghc: '9.2.3'
              test: true
            - os: windows-latest
              ghc: '9.0.2'
@@ -98,12 +97,10 @@ jobs:
              ghc: '8.6.5'
              test: true
            # only build rest of supported ghc versions for windows
-           - os: windows-latest
-             ghc: '9.0.1'
-           - os: windows-latest
-             ghc: '8.10.6'
            - os: windows-latest
              ghc: '8.8.4'
+           - os: windows-latest
+             ghc: '9.2.2'
 
     steps:
       - uses: actions/checkout@v3
@@ -162,7 +159,7 @@ jobs:
           HLS_WRAPPER_TEST_EXE: hls-wrapper
         run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS  --rerun-log-file .tasty-rerun-log-wrapper"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-brittany-plugin
         run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
 
@@ -182,11 +179,11 @@ jobs:
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-haddock-comments-plugin
         run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-splice-plugin
         run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
 
@@ -202,7 +199,7 @@ jobs:
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.2'
+      - if: matrix.test && matrix.ghc != '9.2.3'
         name: Test hls-tactics-plugin test suite
         run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
 

.gitlab-ci.yml

@@ -19,7 +19,7 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal.project
-    - GHC_VERSION: 9.2.1
+    - GHC_VERSION: 9.2.3
       CABAL_PROJECT: cabal.project
 
 workflow:

.hlint.yaml

@@ -0,0 +1,185 @@
+# HLint configuration file
+# https://github.com/ndmitchell/hlint
+##########################
+
+# To run HLint do:
+# $ hlint --git -j4
+
+# Warnings currently triggered by our code
+- ignore: {name: "Use <$>"}
+- ignore: {name: "Use :"}
+- ignore: {name: "Redundant do"}
+- ignore: {name: "Avoid lambda"}
+- ignore: {name: "Use newtype instead of data"}
+- ignore: {name: "Use unless"}
+- ignore: {name: "Move brackets to avoid $"}
+- ignore: {name: "Eta reduce"}
+- ignore: {name: "Parse error"}
+- ignore: {name: "Reduce duplication"}
+- ignore: {name: "Use ++"}
+- ignore: {name: "Use $>"}
+- ignore: {name: "Use section"}
+- ignore: {name: "Use record patterns"}
+- ignore: {name: "Use camelCase"}
+- ignore: {name: "Use uncurry"}
+- ignore: {name: "Avoid lambda using `infix`"}
+
+# Gives at least one suggestion we don't like.
+- ignore: {name: "Use <=<"}
+- ignore: {name: "Use zipFrom"}
+- ignore: {name: "Use zipWithFrom"}
+
+# We are using the "redundant" return/pure to assign a name. We do not want to
+# delete it. In particular, this is not an improvement:
+# Found:
+#   do options <- somethingComplicated
+#      pure options
+# Perhaps:
+#   do somethingComplicated
+- ignore: {name: "Redundant return"}
+- ignore: {name: "Redundant pure"}
+
+# Off by default hints we like
+- warn: {name: Use module export list}
+
+# Condemn nub and friends
+- warn: {lhs: nub (sort x), rhs: Data.List.Extra.nubSort x}
+- warn: {lhs: nub, rhs: Data.List.Extra.nubOrd}
+- warn: {lhs: nubBy, rhs: Data.List.Extra.nubOrdBy}
+- warn: {lhs: Data.List.Extra.nubOn, rhs: Data.List.Extra.nubOrdOn}
+
+- functions:
+  # Things that are unsafe in Haskell base library
+  - name: unsafePerformIO
+    within:
+    - Development.IDE.Core.Shake
+    - Development.IDE.GHC.Util
+    - Development.IDE.Graph.Internal.Database
+    - Development.IDE.Graph.Internal.Paths
+    - Development.IDE.Graph.Internal.Profile
+    - Ide.Types
+    - Test.Hls
+    - Test.Hls.Command
+    - Wingman.Debug
+    - Wingman.Types
+    - AutoTupleSpec
+  - name: unsafeInterleaveIO
+    within: 
+    - Development.IDE.LSP.LanguageServer
+  - {name: unsafeDupablePerformIO, within: []}
+  - name: unsafeCoerce
+    within: 
+    - Ide.Plugin.Eval.Code
+    - Development.IDE.Core.Compile
+    - Development.IDE.Types.Shake
+    - Wingman.Judgements.SYB
+    - Ide.Plugin.Properties
+
+  # Things that are a bit dangerous in the GHC API
+  - name: nameModule
+    within:
+    - Development.IDE.GHC.CoreFile
+    - Ide.Plugin.CallHierarchy.Internal
+    - Ide.Plugin.Rename
+    - Compat.HieBin
+
+  # Partial functions
+  - name: Data.List.head
+    within:
+    - Main
+    - Experiments
+    - Development.IDE.Core.Shake
+    - Development.IDE.Plugin.CodeAction
+    - Development.IDE.Plugin.Completions
+    - Development.IDE.Plugin.CodeAction.ExactPrint
+    - Development.IDE.Session
+    - Development.IDE.Spans.Documentation
+    - Ide.Plugin.CallHierarchy.Internal
+    - TExpectedActual
+    - TRigidType
+    - TRigidType
+    - Ide.Plugin.Class
+    - Wingman.Tactics
+
+  - name: Data.List.tail
+    within:
+    - Main
+    - Development.Benchmark.Rules
+    - Development.IDE.Plugin.CodeAction
+    - Development.IDE.Plugin.CodeAction.ExactPrint
+    - Development.IDE.Session
+    - IDE.Plugin.Eval.Code
+    - IDE.Plugin.Eval.Util
+    - UnificationSpec
+
+  - name: Data.List.last
+    within: 
+    - GenChangelogs
+    - Main
+
+  - name: Data.List.init
+    within: []
+
+  - name: Data.List.foldl1'
+    within: []
+
+  - name: Data.List.foldr1'
+    within: []
+
+  - name: "Data.List.!!"
+    within:
+    - Main
+    - Experiments
+    - FunctionalCodeAction
+    - Development.IDE.Plugin.CodeAction
+    - Development.IDE.Plugin.Completions.Logic
+    - Development.IDE.Spans.Documentation
+    - Wingman.CaseSplit
+    - Wingman.Simplify
+
+
+  - name: Data.Text.head
+    within:
+    - Development.IDE.Plugin.CodeAction
+    - Development.IDE.Plugin.Completions.Logic
+
+  - name: Data.Foldable.foldl1
+    within: []
+
+  - name: Data.Foldable.foldr1
+    within: 
+    - Wingman.Tactics
+
+  - name: Data.Maybe.fromJust 
+    within: 
+    - Experiments
+    - Main
+    - MultipleImports
+    - Progress
+    - Utils
+    - Development.IDE.Core.Compile
+    - Development.IDE.Core.Rules
+    - Development.IDE.Core.Shake
+    - Development.IDE.Plugin.Completions
+    - Development.IDE.Plugin.CodeAction.ExactPrint
+    - Development.IDE.Test
+    - Development.IDE.Graph.Internal.Profile
+    - Development.IDE.Graph.Internal.Rules
+    - Ide.Plugin.Class
+
+  - name: "Data.Map.!"
+    within: 
+    - Wingman.LanguageServer
+
+  - name: "Data.IntMap.!"
+    within: []
+
+  - name: "Data.Vector.!"
+    within: []
+
+  - name: "GHC.Arr.!"
+    within: []
+
+# We really do not want novel usages of restricted functions, and mere
+# Warning is not enough to prevent those consistently; you need a build failure.
+- error: {name: Avoid restricted function}

bindist/ghcs

@@ -2,5 +2,5 @@
 8.8.4,cabal.project
 8.10.7,cabal.project
 9.0.2,cabal.project
-9.2.1,cabal.project
 9.2.2,cabal.project
+9.2.3,cabal.project

bindist/ghcs-Msys

@@ -1,4 +1,4 @@
 8.10.7,cabal.project
 9.0.2,cabal.project
 9.2.2,cabal.project
-9.2.1,cabal.project
+9.2.3,cabal.project

cabal.project

@@ -44,7 +44,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-30T21:02:45Z
+index-state: 2022-06-12T00:00:00Z
 
 constraints:
   hyphenation +embed,
@@ -67,26 +67,5 @@ allow-newer:
   -- ghc-9.2
   ----------
   hiedb:base,
-  retrie:ghc-exactprint,
 
-  -- for brittany
-  -- https://github.com/lspitzner/multistate/pull/8
-  multistate:base,
-  -- https://github.com/lspitzner/data-tree-print/pull/3
-  data-tree-print:base,
-  -- https://github.com/lspitzner/butcher/pull/8
-  butcher:base,
-
-  -- for shake-bench
-  Chart:lens,
-  Chart-diagrams:lens,
-
-  -- for ekg
-  ekg-core:base,
-  ekg-core:ghc-prim,
-  ekg-wai:base,
-  ekg-wai:time,
-
-  -- for shake-bench
-  Chart-diagrams:diagrams-core,
-  SVGFonts:diagrams-core
+  ekg-wai:time