Merge branch 'master' into batch-load-multi-read

Author: soulomoon

.github/workflows/bench.yml

@@ -17,7 +17,6 @@ on:
 jobs:
   pre_job:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'performance')
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
@@ -53,8 +52,8 @@ jobs:
         # see discussion https://github.com/haskell/haskell-language-server/pull/4118
         # also possible to add more GHCs if we performs better in the future.
         ghc:
-          - '9.6'
           - '9.8'
+          - '9.10'
         os:
           - ubuntu-latest
 
@@ -115,13 +114,14 @@ jobs:
         path: ~/.cabal/cabal.tar.gz
 
   bench_example:
+    if: contains(github.event.pull_request.labels.*.name, 'performance')
     needs: [bench_init, pre_job]
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.6', '9.8']
+        ghc: ['9.8', '9.10']
         os: [ubuntu-latest]
         cabal: ['3.10']
         example: ['cabal', 'lsp-types']

.pre-commit-config.yaml

@@ -1,32 +1,23 @@
-{
-  "repos": [
-    {
-      "hooks": [
-        {
-          "entry": "stylish-haskell --inplace",
-          "exclude": "(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/src/Development/IDE/Core/Rules.hs$|^ghcide/src/Development/IDE/Core/Compile.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$)",
-          "files": "\\.l?hs$",
-          "id": "stylish-haskell",
-          "language": "system",
-          "name": "stylish-haskell",
-          "pass_filenames": true,
-          "types": [
-            "file"
-          ]
-        }
-      ],
-      "repo": "local"
-    },
-    {
-       "repo": "https://github.com/pre-commit/pre-commit-hooks",
-       "rev": "v4.1.0",
-       "hooks": [
-          {
-            "id": "mixed-line-ending",
-            "args": ["--fix", "lf"],
-            "exclude": "test/testdata/.*CRLF.*?\\.hs$"
-          }
-       ]
-    }
-  ]
-}
+# https://pre-commit.com/
+# https://github.com/pre-commit/pre-commit
+repos:
+  - hooks:
+      - entry: stylish-haskell --inplace
+        exclude: >-
+          (^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/src/Development/IDE/Core/Rules.hs$|^ghcide/src/Development/IDE/Core/Compile.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$)
+        files: \.l?hs$
+        id: stylish-haskell
+        language: system
+        name: stylish-haskell
+        pass_filenames: true
+        types:
+          - file
+    repo: local
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: mixed-line-ending
+        args:
+          - '--fix'
+          - lf
+        exclude: test/testdata/.*CRLF.*?\.hs$

cabal.project

@@ -49,9 +49,6 @@ constraints:
   -- in the future, thus: TODO: remove this flag.
   bitvec -simd,
 
-if impl(ghc >= 9.9)
-  -- https://github.com/haskell/haskell-language-server/issues/4324
-  benchmarks: False
 
 if impl(ghc >= 9.8.4) && impl(ghc < 9.8.5)
   -- By depending on ghc-lib-parser and ghc, we are encountering

haskell-language-server.cabal

@@ -2100,7 +2100,7 @@ benchmark benchmark
     hs-source-dirs: bench
     build-tool-depends:
         haskell-language-server:ghcide-bench,
-        hp2pretty:hp2pretty,
+        eventlog2html:eventlog2html,
     default-extensions:
         LambdaCase
         RecordWildCards

shake-bench/shake-bench.cabal

@@ -16,8 +16,6 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  if impl(ghc >= 9.10)
-    buildable: False
   exposed-modules:  Development.Benchmark.Rules
   hs-source-dirs:   src
   build-depends:

shake-bench/src/Development/Benchmark/Rules.hs

@@ -535,7 +535,7 @@ heapProfileRules build = do
     build -/- "*/*/*/*/*.heap.svg" %> \out -> do
       let hpFile = dropExtension2 out <.> "hp"
       need [hpFile]
-      cmd_ ("hp2pretty" :: String) [hpFile]
+      cmd_ ("eventlog2html" :: String) ["--heap-profile", hpFile]
       liftIO $ renameFile (dropExtension hpFile <.> "svg") out
 
 dropExtension2 :: FilePath -> FilePath