Remove head.hackage (haskell#3867)

* Remove head.hackage Bump to - lsp-2.3 - lsp-types-2.1 - hiedb-0.4.4 - hie-bios-12.1 (TODO remove source-repository package in favour of hackage release) - hie-comat-0.3.1.2 * Bump cabal version for CI * Add comments for allow-newer * Fix build on 9.6 * Hopefully fix stack extra-deps --------- Co-authored-by: Michael Peyton Jones <me@michaelpj.com>

Author: wz1000

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

@@ -7,7 +7,7 @@ inputs:
  cabal:
  description: "Cabal version"
  required: false
- default: "3.8.1.0"
+ default: "3.10.2.0"
  os:
  description: "Operating system: Linux, Windows or macOS"
  required: true

cabal.project

@@ -34,7 +34,7 @@ packages:
  ./plugins/hls-refactor-plugin
  ./plugins/hls-overloaded-record-dot-plugin
 
-index-state: 2023-10-06T06:12:29Z
+index-state: 2023-11-13T12:07:58Z
 
 tests: True
 test-show-details: direct
@@ -84,27 +84,19 @@ if impl(ghc >= 9.1)
 
 if impl(ghc >= 9.7)
  allow-newer:
- base,
- template-haskell,
- ghc,
- ghc-prim,
- integer-gmp,
- ghc-bignum,
- template-haskell,
- text,
- binary,
- bytestring,
- Cabal,
- unix,
- deepseq,
-
- repository head.hackage.ghc.haskell.org
- url: https://ghc.gitlab.haskell.org/head.hackage/
- secure: True
- key-threshold: 3
- root-keys:
- f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
- 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
- 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-
- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org
+ ekg-core:text,
+ -- https://github.com/maoe/ghc-trace-events/issues/12
+ ghc-trace-events:base,
+ ghc-trace-events:bytestring,
+ ghc-trace-events:text,
+ -- https://github.com/haskell-primitive/primitive-unlifted/issues/39
+ primitive-unlifted:bytestring,
+ -- https://github.com/obsidiansystems/constraints-extras/issues/54
+ constraints-extras:base,
+ constraints-extras:template-haskell,
+ -- https://github.com/obsidiansystems/commutative-semigroups/issues/13
+ commutative-semigroups:base,
+ commutative-semigroups:template-haskell,
+ -- https://github.com/kcsongor/generic-lens/issues/158
+ generic-lens:text,
+ generic-lens-core:text,

ghcide/ghcide.cabal

@@ -72,9 +72,9 @@ library
  hls-plugin-api == 2.4.0.0,
  lens,
  list-t,
- hiedb == 0.4.3.*,
- lsp-types ^>= 2.0.2.0,
- lsp ^>= 2.2.0.0 ,
+ hiedb == 0.4.4.*,
+ lsp-types ^>= 2.1.0.0,
+ lsp ^>= 2.3.0.0 ,
  mtl,
  optparse-applicative,
  parallel,
@@ -107,7 +107,7 @@ library
  ghc-check >=0.5.0.8,
  ghc-paths,
  cryptohash-sha1 >=0.11.100 && <0.12,
- hie-bios == 0.12.0,
+ hie-bios == 0.12.1,
  -- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
  -- https://github.com/Avi-D-coder/implicit-hie/issues/50
  -- to make sure ghcide behaves in a desirable way, we put implicit-hie

ghcide/src/Development/IDE/Core/Shake.hs

@@ -366,7 +366,7 @@ getVirtualFile nf = do
 
 -- Take a snapshot of the current LSP VFS
 vfsSnapshot :: Maybe (LSP.LanguageContextEnv a) -> IO VFS
-vfsSnapshot Nothing = pure $ VFS mempty ""
+vfsSnapshot Nothing = pure $ VFS mempty
 vfsSnapshot (Just lspEnv) = LSP.runLspT lspEnv LSP.getVirtualFiles
 
 

haskell-language-server.cabal

@@ -374,7 +374,7 @@ library
  , ghc
  , ghcide == 2.4.0.0
  , githash >=0.1.6.1
- , lsp >= 2.2.0.0
+ , lsp >= 2.3.0.0
  , hie-bios
  , hiedb
  , hls-plugin-api == 2.4.0.0

hie-compat/hie-compat.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.22
 name: hie-compat
-version: 0.3.1.1
+version: 0.3.1.2
 synopsis: HIE files for GHC 8.8 and other HIE file backports
 license: Apache-2.0
 description:
@@ -24,7 +24,7 @@ source-repository head
 library
  default-language: Haskell2010
  build-depends:
- base < 4.19, array, bytestring, containers, directory, filepath, transformers
+ base < 4.20, array, bytestring, containers, directory, filepath, transformers
  build-depends: ghc >= 8.10, ghc-boot
  ghc-options: -Wall -Wno-name-shadowing
 

hls-plugin-api/hls-plugin-api.cabal

@@ -62,7 +62,7 @@ library
  , hls-graph == 2.4.0.0
  , lens
  , lens-aeson
- , lsp ^>=2.2
+ , lsp ^>=2.3
  , mtl
  , opentelemetry >=0.4
  , optparse-applicative

hls-plugin-api/src/Ide/Plugin/RangeMap.hs

@@ -23,7 +23,8 @@ import Data.Bifunctor (first)
 import Data.Foldable (foldl')
 import Development.IDE.Graph.Classes (NFData)
 import Language.LSP.Protocol.Types (Position,
- Range (Range))
+ Range (Range),
+ isSubrangeOf)
 #ifdef USE_FINGERTREE
 import qualified HaskellWorks.Data.IntervalMap.FingerTree as IM
 #endif

hls-test-utils/hls-test-utils.cabal

@@ -46,9 +46,9 @@ library
  , hls-graph
  , hls-plugin-api == 2.4.0.0
  , lens
- , lsp ^>=2.2
+ , lsp ^>=2.3
  , lsp-test ^>=0.16
- , lsp-types ^>=2.0.2
+ , lsp-types ^>=2.1
  , tasty
  , tasty-expected-failure
  , tasty-golden

plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

@@ -37,7 +37,7 @@ library
  , hls-plugin-api == 2.4.0.0
  , hie-compat
  , lens
- , lsp ^>=2.2.0.0
+ , lsp ^>=2.3.0.0
  , mtl
  , regex-tdfa
  , syb