Skip to content

Commit e491f60

Browse files
authored
Merge branch 'master' into batch-load-multi-read
2 parents bb0a541 + 111ad4c commit e491f60

File tree

143 files changed

+27
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+27
-29
lines changed

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
extra_nix_config: |
5555
experimental-features = nix-command flakes
5656
nix_path: nixpkgs=channel:nixos-unstable
57-
- uses: cachix/cachix-action@v15
57+
- uses: cachix/cachix-action@v16
5858
with:
5959
name: haskell-language-server
6060
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}

ghcide-bench/src/Experiments.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,9 @@ getBuildEdgesCount = tryCallTestPlugin GetBuildEdgesCount
857857
getRebuildsCount :: Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) Int)
858858
getRebuildsCount = tryCallTestPlugin GetRebuildsCount
859859

860-
-- Copy&paste from ghcide/test/Development.IDE.Test
861860
getStoredKeys :: Session [Text]
862861
getStoredKeys = callTestPlugin GetStoredKeys
863862

864-
-- Copy&paste from ghcide/test/Development.IDE.Test
865863
tryCallTestPlugin :: (A.FromJSON b) => TestRequest -> Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) b)
866864
tryCallTestPlugin cmd = do
867865
let cm = SMethod_CustomMethod (Proxy @"test")
@@ -873,7 +871,6 @@ tryCallTestPlugin cmd = do
873871
A.Success a -> Right a
874872
A.Error e -> error e
875873

876-
-- Copy&paste from ghcide/test/Development.IDE.Test
877874
callTestPlugin :: (A.FromJSON b) => TestRequest -> Session b
878875
callTestPlugin cmd = do
879876
res <- tryCallTestPlugin cmd
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)