Merge remote-tracking branch 'origin/master' into kokobd/lsp-1.5

Author: kokobd

.github/workflows/bench.yml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7']
+        ghc: ['8.10.7', '9.2.3']
         os: [ubuntu-latest]
 
     # This code is fitted to the strategy: assumes Linux is used ... etc,
@@ -103,7 +103,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7']
+        ghc: ['8.10.7', '9.2.3']
         os: [ubuntu-latest]
         cabal: ['3.6']
         example: ['cabal', 'lsp-types']

.github/workflows/pre-commit.yml

@@ -28,7 +28,7 @@ jobs:
 
     - name: Compiled deps cache
       id: stylish-haskell-compiled-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: stylish-haskell-compiled-cache
       with:
@@ -39,5 +39,5 @@ jobs:
               ${{ inputs.cache-prefix }}${{ env.cache-name }}-${{ inputs.os }}-${{ inputs.ghc }}-
               ${{ inputs.cache-prefix }}${{ env.cache-name }}-${{ inputs.os }}-
 
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v4
     - uses: pre-commit/action@v3.0.0

ghcide/bench/config.yaml

@@ -14,34 +14,34 @@ examples:
   # Medium-sized project without TH
   - name: cabal
     package: Cabal
-    version: 3.0.0.0
+    version: 3.6.3.0
     modules:
-        - Distribution/Simple.hs
-        - Distribution/Types/Module.hs
+        - src/Distribution/Simple.hs
+        - src/Distribution/Types/Module.hs
     extra-args: [] # extra ghcide command line args
   - name: cabal-1module
     package: Cabal
-    version: 3.0.0.0
+    version: 3.6.3.0
     modules:
-        - Distribution/Simple.hs
+        - src/Distribution/Simple.hs
   - name: cabal-conservative
     package: Cabal
-    version: 3.0.0.0
+    version: 3.6.3.0
     modules:
-        - Distribution/Simple.hs
-        - Distribution/Types/Module.hs
+        - src/Distribution/Simple.hs
+        - src/Distribution/Types/Module.hs
     extra-args:  # extra ghcide command line args
       - --conservative-change-tracking
   # Small-sized project with TH
   - name: lsp-types
     package: lsp-types
-    version: 1.0.0.1
+    version: 1.5.0.0
     modules:
         - src/Language/LSP/VFS.hs
         - src/Language/LSP/Types/Lens.hs
   - name: lsp-types-conservative
     package: lsp-types
-    version: 1.0.0.1
+    version: 1.5.0.0
     modules:
         - src/Language/LSP/VFS.hs
         - src/Language/LSP/Types/Lens.hs