Merge remote-tracking branch 'origin' into stale-class-lens

Author: July541

.cirrus.yml

@@ -33,7 +33,7 @@ build_task:
     - name: build-ghc-9.2.7
       env:
         GHC_VERSION: 9.2.7
-  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree
+  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv
   script:
     - tzsetup Etc/GMT
     - adjkerntz -a
@@ -59,7 +59,7 @@ bindist_task:
     DISTRO: "na"
     RUNNER_OS: "FreeBSD"
     GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
-  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
+  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv unzip
   script:
     - tzsetup Etc/GMT
     - adjkerntz -a
@@ -97,7 +97,7 @@ test_task:
     DISTRO: "na"
     RUNNER_OS: "FreeBSD"
     GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
-  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
+  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree gmp libiconv unzip
   script:
     - tzsetup Etc/GMT
     - adjkerntz -a

.github/scripts/build.sh

@@ -12,18 +12,18 @@ pwd
 env
 
 # ensure ghcup
-if ! command -v ghcup ; then
-	install_ghcup
-fi
+install_ghcup
 
 # ensure cabal-cache
 download_cabal_cache "$HOME/.local/bin/cabal-cache"
 
 
 # build
-ecabal update
 ghcup install ghc "${GHC_VERSION}"
 ghcup set ghc "${GHC_VERSION}"
+(cd .. && ecabal update) # run cabal update outside project dir
+ecabal user-config diff
+ecabal user-config init -f
 "ghc-${GHC_VERSION}" --info
 "ghc" --info
 
@@ -32,6 +32,10 @@ mkdir -p "$CI_PROJECT_DIR/out/plan.json"
 
 case "$(uname)" in
     MSYS_*|MINGW*)
+    # cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
+    # sed -ic "/extra-include-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
+    # sed -ic "/extra-lib-dirs/d" "C:\Users\runneradmin\AppData\Roaming\cabal\config"
+    cat "C:\Users\runneradmin\AppData\Roaming\cabal\config"
 		args=( -O2 -w "ghc-$GHC_VERSION" --project-file cabal.project --disable-profiling --disable-tests --enable-executable-stripping ${ADD_CABAL_ARGS})
 
 		# Shorten binary names

.github/scripts/common.sh

@@ -126,7 +126,7 @@ build_with_cache() {
 }
 
 install_ghcup() {
-	find "$GHCUP_INSTALL_BASE_PREFIX"
+	# find "$GHCUP_INSTALL_BASE_PREFIX"
 	mkdir -p "$GHCUP_BIN"
 	mkdir -p "$GHCUP_BIN"/../cache
 

.github/scripts/env.sh

@@ -11,8 +11,8 @@ fi
 export PATH="$HOME/.local/bin:$PATH"
 
 export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
-export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-recommended}"
-export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
+export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.8.1.0}"
+export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
 
 if [ "${RUNNER_OS}" = "Windows" ] ; then

.github/scripts/test.sh

@@ -53,11 +53,10 @@ uname
 env
 
 # ensure ghcup
-if ! command -v ghcup ; then
-    install_ghcup
-fi
+install_ghcup
+ghcup install ghc --set 9.4.4
 
-ecabal update
+(cd .. && ecabal update) # run cabal update outside project dir
 
 # unpack
 TARBALL_PREFIX="haskell-language-server"

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
         platform: [ { image: "debian:9"
                     , installCmd: "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"
@@ -111,12 +111,12 @@ jobs:
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", 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.0.2
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", 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.2.5
-            platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", 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.2.7
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", 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.4.4
             platform: { image: "fedora:33", 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 tree", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
+          - ghc: 9.6.1
+            platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", 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" }
     container:
       image: ${{ matrix.platform.image }}
     steps:
@@ -171,7 +171,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1","9.4.4", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - uses: docker://arm64v8/ubuntu:focal
         name: Cleanup (aarch64 linux)
@@ -226,7 +226,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -266,20 +266,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.4.4", "9.2.7", "9.2.5", "8.10.7"]
+        ghc: ["9.6.1", "9.4.4", "9.2.7", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Run build
         run: |
-          bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake tree
-          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
-          export CC="$HOME/.brew/opt/llvm@11/bin/clang"
-          export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
+          if test "${GHC_VERSION}" = "8.10.7"; then
+            bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake tree
+            export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
+            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 RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
+          else
+            bash .github/scripts/brew.sh git coreutils autoconf automake tree
+            export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
+          fi
           export LD=ld
-          export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
-          export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
           bash .github/scripts/build.sh
           tar cf out-${ARTIFACT}-${GHC_VERSION}.tar out/ store/
         env:
@@ -310,7 +315,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.4.4", "9.2.7", "9.2.5", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - name: install windows deps
         shell: pwsh

ChangeLog.md

@@ -1,5 +1,54 @@
 # Changelog for haskell-language-server
 
+## 1.10.0.0
+
+- Support for GHC 9.6
+- Binaries for GHC 9.2.7 and GHC 9.6.1
+- Eval plugin support for GHC 9.4+ (#3391)
+- Don't show lenses for TH generated instances when using hls-class-plugin (#3531)
+
+### Pull requests merged for 1.10.0.0
+- Support fourmolu 0.11
+([#3533](https://github.com/haskell/haskell-language-server/pull/3533)) by @brandonchinn178
+- Don't show lenses for TH generated instances
+([#3531](https://github.com/haskell/haskell-language-server/pull/3531)) by @July541
+- Bump haskell/actions from 2.3.3 to 2.3.6
+([#3529](https://github.com/haskell/haskell-language-server/pull/3529)) by @dependabot[bot]
+- Use GHC 9.2.7 in flake
+([#3527](https://github.com/haskell/haskell-language-server/pull/3527)) by @cydparser
+- Remove HsLogger
+([#3526](https://github.com/haskell/haskell-language-server/pull/3526)) by @fendor
+- Use hie-bios 0.12
+([#3524](https://github.com/haskell/haskell-language-server/pull/3524)) by @wz1000
+- Bump haskell/actions
+([#3520](https://github.com/haskell/haskell-language-server/pull/3520)) by @michaelpj
+- Bump cachix/install-nix-action from 19 to 20
+([#3514](https://github.com/haskell/haskell-language-server/pull/3514)) by @dependabot[bot]
+- Docs: update Emacs section: add eglot with config example
+([#3509](https://github.com/haskell/haskell-language-server/pull/3509)) by @m4lvin
+- Eval plugin is now supported in 9.4
+([#3508](https://github.com/haskell/haskell-language-server/pull/3508)) by @michaelpj
+-  Update flake to GHC 9.2.6 and 9.4.4
+([#3503](https://github.com/haskell/haskell-language-server/pull/3503)) by @cydparser
+- Fix lower ghcide bounds of rename and fourmolu plugins
+([#3501](https://github.com/haskell/haskell-language-server/pull/3501)) by @pepeiborra
+- Add 9.2.6 to ghc-version-support.md
+([#3494](https://github.com/haskell/haskell-language-server/pull/3494)) by @wz1000
+- Bump versions and add changelogs for 1.9.1.0
+([#3493](https://github.com/haskell/haskell-language-server/pull/3493)) by @hasufell
+- Bump cachix/install-nix-action from 18 to 19
+([#3490](https://github.com/haskell/haskell-language-server/pull/3490)) by @dependabot[bot]
+- Experiment with loading matrix values from a file
+([#3481](https://github.com/haskell/haskell-language-server/pull/3481)) by @michaelpj
+- 9.6 support for HLS
+([#3480](https://github.com/haskell/haskell-language-server/pull/3480)) by @wz1000
+- Make the Ormolu plugin respect `.ormolu` fixity files when Ormolu ≥0.5.3.0
+([#3449](https://github.com/haskell/haskell-language-server/pull/3449)) by @amesgen
+- Migrate release CI to github
+([#3406](https://github.com/haskell/haskell-language-server/pull/3406)) by @hasufell
+- Eval plugin for GHC 9.4
+([#3391](https://github.com/haskell/haskell-language-server/pull/3391)) by @wz1000
+
 ## 1.9.1.0
 
 - Binaries for GHC 9.2.6.

cabal.project

@@ -49,19 +49,13 @@ tests: True
 package mfsolve
   tests: False
 
-if impl(ghc >= 9.5)
-  source-repository-package
-    type:git
-    location: https://github.com/wz1000/retrie
-    tag: 0a2dbfc00e745737f249f16325b2815d2e3a14eb
-
 package *
   ghc-options: -haddock
   test-show-details: direct
 
 write-ghc-environment-files: never
 
-index-state: 2023-03-23T00:00:00Z
+index-state: 2023-03-30T00:00:00Z
 
 constraints:
   -- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -81,6 +75,8 @@ constraints:
   setup.happy == 1.20.1.1,
   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
 
 -- 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
@@ -129,11 +125,6 @@ if impl(ghc >= 9.5)
     focus:transformers,
     ghc-trace-events:base,
     implicit-hie-cradle:transformers,
-    retrie:base,
-    retrie:ghc,
-    retrie:ghc-exactprint,
-    retrie:mtl,
-    retrie:transformers,
     semigroupoids:base,
     stm-hamt:transformers,
     entropy:Cabal,

ghcide/ghcide.cabal

@@ -2,7 +2,7 @@ cabal-version:      3.0
 build-type:         Simple
 category:           Development
 name:               ghcide
-version:            1.9.1.0
+version:            1.10.0.0
 license:            Apache-2.0
 license-file:       LICENSE
 author:             Digital Asset and Ghcide contributors

haskell-language-server.cabal

@@ -1,7 +1,7 @@
 cabal-version:      3.0
 category:           Development
 name:               haskell-language-server
-version:            1.9.1.0
+version:            1.10.0.0
 synopsis:           LSP server for GHC
 description:
   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -238,7 +238,7 @@ common haddockComments
 
 common eval
   if flag(eval)
-    build-depends: hls-eval-plugin ^>= 1.4
+    build-depends: hls-eval-plugin ^>= 1.5
     cpp-options: -Dhls_eval
 
 common importLens
@@ -288,7 +288,7 @@ common pragmas
 
 common splice
   if flag(splice)
-    build-depends: hls-splice-plugin ^>=1.0.0.1
+    build-depends: hls-splice-plugin ^>=1.1
     cpp-options: -Dhls_splice
 
 common alternateNumberFormat
@@ -350,7 +350,7 @@ common stylishHaskell
 
 common refactor
   if flag(refactor)
-    build-depends: hls-refactor-plugin ^>= 1.1
+    build-depends: hls-refactor-plugin ^>= 1.2
     cpp-options: -Dhls_refactor
 
 library
@@ -405,7 +405,7 @@ library
     , cryptohash-sha1
     , data-default
     , ghc
-    , ghcide                ==1.9.1.0
+    , ghcide                ==1.10.0.0
     , githash               >=0.1.6.1
     , lsp
     , hie-bios