Merge pull request #3775 from haskell/wip/2.2.0.0

Prepare release 2.2.0.0

Author: fendor

.github/workflows/release.yaml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.2", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
+        ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
         platform: [ { image: "debian:9"
                     , installCmd: "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
                     , toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
@@ -163,6 +163,15 @@ jobs:
               , ARTIFACT: "x86_64-linux-unknown"
               , ADD_CABAL_ARGS: "--enable-split-sections"
               }
+          - ghc: 9.4.7
+            platform:
+              { image: "fedora:27"
+              , installCmd: "dnf install -y"
+              , toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
+              , DISTRO: "Unknown"
+              , ARTIFACT: "x86_64-linux-unknown"
+              , ADD_CABAL_ARGS: "--enable-split-sections"
+              }
           - ghc: 9.6.2
             platform:
               { image: "rockylinux:8"
@@ -231,7 +240,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["9.6.2", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
+        ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
     steps:
       - uses: docker://arm64v8/ubuntu:focal
         name: Cleanup (aarch64 linux)
@@ -291,7 +300,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.2", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
+        ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -336,7 +345,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.2", "9.4.6", "9.4.5", "9.2.8", "8.10.7"]
+        ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -349,6 +358,8 @@ jobs:
             export CC="$HOME/.brew/opt/llvm@11/bin/clang"
             export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
             export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
+            export LLC="$HOME/.brew/opt/llvm@11/bin/llc"
+            export OPT="$HOME/.brew/opt/llvm@11/bin/opt"
             export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
           else
             bash .github/scripts/brew.sh git coreutils autoconf automake tree
@@ -390,7 +401,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.2", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
+        ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
     steps:
       - name: install windows deps
         shell: pwsh

.gitignore

@@ -46,3 +46,5 @@ result-doc
 out/
 store/
 gh-release-artifacts/
+
+.hls/

ChangeLog.md

@@ -1,5 +1,27 @@
 # Changelog for haskell-language-server
 
+## 2.2.0.0
+
+* Binaries for GHC 9.4.7
+* Forward compatibility with latest VSCode client changes
+
+### Pull Requests
+
+-  hls-cabal-fmt-plugin: Use the file contents of the LSP request
+  ([#3776](https://github.com/haskell/haskell-language-server/pull/3776)) by @fendor
+- Adapt to lsp changes for workspace/configuration
+  ([#3773](https://github.com/haskell/haskell-language-server/pull/3773)) by @michaelpj
+- Rework "Configuration" and "Manually testing HLS" documentations
+  ([#3772](https://github.com/haskell/haskell-language-server/pull/3772)) by @sir4ur0n
+- Fix `main-is` completion suggestions not being relative to `hs-source-dirs`
+  ([#3766](https://github.com/haskell/haskell-language-server/pull/3766)) by @VeryMilkyJoe
+- Remove suggestion of stanzas inside of stanza context
+  ([#3761](https://github.com/haskell/haskell-language-server/pull/3761)) by @VeryMilkyJoe
+- Pedantic ghcide
+  ([#3751](https://github.com/haskell/haskell-language-server/pull/3751)) by @joyfulmantis
+- Fix #3574 and support resolve in explicit records
+  ([#3750](https://github.com/haskell/haskell-language-server/pull/3750)) by @joyfulmantis
+
 ## 2.1.0.0
 
 * Binaries for GHC 9.4.6

RELEASING.md

@@ -8,18 +8,18 @@
   - Look for `TODO:` to find locations that require extra care for GHC versions.
 - [ ] check all plugins still work if release includes code changes
 - [ ] bump package versions in all `*.cabal` files (same version as hls)
-  - HLS uses a lockstep versioning. The core packages and all plugins use the same version number, and only support exactly the this version.
+  - HLS uses lockstep versioning. The core packages and all plugins use the same version number, and only support exactly this version.
     - Exceptions:
       - `hie-compat` requires no automatic version bump.
       - `shake-bench` is an internal testing tool, not exposed to the outside world. Thus, no version bump required for releases.
   - For updating cabal files, the following script can be used:
     - ```sh
       # Update all `version:` fields
-      sed -ri "s/^version:( +)2.1.0.0/version:\12.2.0.0/" **/*.cabal
+      sed -ri "s/^version:( +)2.2.0.0/version:\12.3.0.0/" **/*.cabal
       # Update all constraints expected to be in the form `== <version>`.
       # We usually don't force an exact version, so this is relatively unambiguous.
       # We could introduce some more ad-hoc parsing, if there is still ambiguity.
-      sed -ri "s/== 2.1.0.0/== 2.2.0.0/" **/*.cabal
+      sed -ri "s/== 2.2.0.0/== 2.3.0.0/" **/*.cabal
       ```
     - It still requires manual verification and review
 - [ ] generate and update changelog

cabal.project

@@ -76,7 +76,12 @@ constraints:
   happy == 1.20.1.1,
   filepath installed,
   -- for ghc 8.10, stm-hamt 1.2.0.10 doesn't build
-  stm-hamt < 1.2.0.10
+  stm-hamt < 1.2.0.10,
+  -- Centos 7 comes with an old gcc version that doesn't know about
+  -- the flag '-fopen-simd', which blocked the release 2.2.0.0.
+  -- We want to be able to benefit from the performance optimisations
+  -- in the future, thus: TODO: remove this flag.
+  bitvec -simd
 
 -- This is benign and won't affect our ability to release to Hackage,
 -- because we only depend on `ekg-json` when a non-default flag

ghcide-bench/ghcide-bench.cabal

@@ -2,7 +2,7 @@ cabal-version:      3.0
 build-type:         Simple
 category:           Development
 name:               ghcide-bench
-version:            2.1.0.0
+version:            2.2.0.0
 license:            Apache-2.0
 license-file:       LICENSE
 author:             The Haskell IDE team

ghcide/ghcide.cabal

@@ -2,7 +2,7 @@ cabal-version:      3.0
 build-type:         Simple
 category:           Development
 name:               ghcide
-version:            2.1.0.0
+version:            2.2.0.0
 license:            Apache-2.0
 license-file:       LICENSE
 author:             Digital Asset and Ghcide contributors
@@ -70,7 +70,7 @@ library
         haddock-library >= 1.8 && < 1.12,
         hashable,
         hie-compat ^>= 0.3.0.0,
-        hls-plugin-api == 2.1.0.0,
+        hls-plugin-api == 2.2.0.0,
         lens,
         list-t,
         hiedb == 0.4.3.*,
@@ -86,7 +86,7 @@ library
         row-types,
         text-rope,
         safe-exceptions,
-        hls-graph == 2.1.0.0,
+        hls-graph == 2.2.0.0,
         sorted-list,
         sqlite-simple,
         stm,

haskell-language-server.cabal

@@ -1,7 +1,7 @@
 cabal-version:      3.0
 category:           Development
 name:               haskell-language-server
-version:            2.1.0.0
+version:            2.2.0.0
 synopsis:           LSP server for GHC
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -213,144 +213,144 @@ flag cabalfmt
 
 common cabalfmt
   if flag(cabalfmt)
-    build-depends: hls-cabal-fmt-plugin == 2.1.0.0
+    build-depends: hls-cabal-fmt-plugin == 2.2.0.0
     cpp-options: -Dhls_cabalfmt
 
 common cabal
   if flag(cabal)
-    build-depends: hls-cabal-plugin == 2.1.0.0
+    build-depends: hls-cabal-plugin == 2.2.0.0
     cpp-options: -Dhls_cabal
 
 common class
   if flag(class)
-    build-depends: hls-class-plugin == 2.1.0.0
+    build-depends: hls-class-plugin == 2.2.0.0
     cpp-options: -Dhls_class
 
 common callHierarchy
   if flag(callHierarchy)
-    build-depends: hls-call-hierarchy-plugin == 2.1.0.0
+    build-depends: hls-call-hierarchy-plugin == 2.2.0.0
     cpp-options: -Dhls_callHierarchy
 
 common haddockComments
   if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
-    build-depends: hls-haddock-comments-plugin == 2.1.0.0
+    build-depends: hls-haddock-comments-plugin == 2.2.0.0
     cpp-options: -Dhls_haddockComments
 
 common eval
   if flag(eval)
-    build-depends: hls-eval-plugin == 2.1.0.0
+    build-depends: hls-eval-plugin == 2.2.0.0
     cpp-options: -Dhls_eval
 
 common importLens
   if flag(importLens)
-    build-depends: hls-explicit-imports-plugin == 2.1.0.0
+    build-depends: hls-explicit-imports-plugin == 2.2.0.0
     cpp-options: -Dhls_importLens
 
 common rename
   if flag(rename)
-    build-depends: hls-rename-plugin == 2.1.0.0
+    build-depends: hls-rename-plugin == 2.2.0.0
     cpp-options: -Dhls_rename
 
 common retrie
   if flag(retrie)
-    build-depends: hls-retrie-plugin == 2.1.0.0
+    build-depends: hls-retrie-plugin == 2.2.0.0
     cpp-options: -Dhls_retrie
 
 common tactic
   if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
-    build-depends: hls-tactics-plugin == 2.1.0.0
+    build-depends: hls-tactics-plugin == 2.2.0.0
     cpp-options: -Dhls_tactic
 
 common hlint
   if flag(hlint)
-    build-depends: hls-hlint-plugin == 2.1.0.0
+    build-depends: hls-hlint-plugin == 2.2.0.0
     cpp-options: -Dhls_hlint
 
 common stan
   if flag(stan) && (impl(ghc >= 8.10) && impl(ghc < 9.0))
-    build-depends: hls-stan-plugin == 2.1.0.0
+    build-depends: hls-stan-plugin == 2.2.0.0
     cpp-options: -Dhls_stan
 
 common moduleName
   if flag(moduleName)
-    build-depends: hls-module-name-plugin == 2.1.0.0
+    build-depends: hls-module-name-plugin == 2.2.0.0
     cpp-options: -Dhls_moduleName
 
 common pragmas
   if flag(pragmas)
-    build-depends: hls-pragmas-plugin == 2.1.0.0
+    build-depends: hls-pragmas-plugin == 2.2.0.0
     cpp-options: -Dhls_pragmas
 
 common splice
   if flag(splice)
-    build-depends: hls-splice-plugin == 2.1.0.0
+    build-depends: hls-splice-plugin == 2.2.0.0
     cpp-options: -Dhls_splice
 
 common alternateNumberFormat
   if flag(alternateNumberFormat)
-    build-depends: hls-alternate-number-format-plugin == 2.1.0.0
+    build-depends: hls-alternate-number-format-plugin == 2.2.0.0
     cpp-options: -Dhls_alternateNumberFormat
 
 common qualifyImportedNames
   if flag(qualifyImportedNames)
-    build-depends: hls-qualify-imported-names-plugin == 2.1.0.0
+    build-depends: hls-qualify-imported-names-plugin == 2.2.0.0
     cpp-options: -Dhls_qualifyImportedNames
 
 common codeRange
   if flag(codeRange)
-    build-depends: hls-code-range-plugin == 2.1.0.0
+    build-depends: hls-code-range-plugin == 2.2.0.0
     cpp-options: -Dhls_codeRange
 
 common changeTypeSignature
   if flag(changeTypeSignature)
-    build-depends: hls-change-type-signature-plugin == 2.1.0.0
+    build-depends: hls-change-type-signature-plugin == 2.2.0.0
     cpp-options: -Dhls_changeTypeSignature
 
 common gadt
   if flag(gadt)
-    build-depends: hls-gadt-plugin == 2.1.0.0
+    build-depends: hls-gadt-plugin == 2.2.0.0
     cpp-options: -Dhls_gadt
 
 common explicitFixity
   if flag(explicitFixity)
-    build-depends: hls-explicit-fixity-plugin == 2.1.0.0
+    build-depends: hls-explicit-fixity-plugin == 2.2.0.0
     cpp-options: -DexplicitFixity
 
 common explicitFields
   if flag(explicitFields)
-    build-depends: hls-explicit-record-fields-plugin == 2.1.0.0
+    build-depends: hls-explicit-record-fields-plugin == 2.2.0.0
     cpp-options: -DexplicitFields
 
 common overloadedRecordDot
   if flag(overloadedRecordDot) && (impl(ghc >= 9.2.0) || flag(ignore-plugins-ghc-bounds))
-    build-depends: hls-overloaded-record-dot-plugin == 2.1.0.0
+    build-depends: hls-overloaded-record-dot-plugin == 2.2.0.0
     cpp-options: -Dhls_overloaded_record_dot
 
 -- formatters
 
 common floskell
   if flag(floskell) && impl(ghc < 9.5)
-    build-depends: hls-floskell-plugin == 2.1.0.0
+    build-depends: hls-floskell-plugin == 2.2.0.0
     cpp-options: -Dhls_floskell
 
 common fourmolu
   if flag(fourmolu)
-    build-depends: hls-fourmolu-plugin == 2.1.0.0
+    build-depends: hls-fourmolu-plugin == 2.2.0.0
     cpp-options: -Dhls_fourmolu
 
 common ormolu
   if flag(ormolu) && impl(ghc < 9.7)
-    build-depends: hls-ormolu-plugin == 2.1.0.0
+    build-depends: hls-ormolu-plugin == 2.2.0.0
     cpp-options: -Dhls_ormolu
 
 common stylishHaskell
   if flag(stylishHaskell)
-    build-depends: hls-stylish-haskell-plugin == 2.1.0.0
+    build-depends: hls-stylish-haskell-plugin == 2.2.0.0
     cpp-options: -Dhls_stylishHaskell
 
 common refactor
   if flag(refactor)
-    build-depends: hls-refactor-plugin == 2.1.0.0
+    build-depends: hls-refactor-plugin == 2.2.0.0
     cpp-options: -Dhls_refactor
 
 library
@@ -405,12 +405,12 @@ library
     , cryptohash-sha1
     , data-default
     , ghc
-    , ghcide                == 2.1.0.0
+    , ghcide                == 2.2.0.0
     , githash               >=0.1.6.1
     , lsp                   >= 2.2.0.0
     , hie-bios
     , hiedb
-    , hls-plugin-api        == 2.1.0.0
+    , hls-plugin-api        == 2.2.0.0
     , optparse-applicative
     , optparse-simple
     , process
@@ -549,7 +549,7 @@ test-suite func-test
     , lens-aeson
     , ghcide
     , ghcide-test-utils
-    , hls-test-utils == 2.1.0.0
+    , hls-test-utils == 2.2.0.0
     , lsp-types
     , aeson
     , hls-plugin-api

hls-graph/hls-graph.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.4
 name:          hls-graph
-version:       2.1.0.0
+version:       2.2.0.0
 synopsis:      Haskell Language Server internal graph API
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server/tree/master/hls-graph#readme>