Skip to content

Commit a6e6707

Browse files
authored
Patch HLS 2.6 to work around performance bug (#941)
haskell/haskell-language-server#4046 (comment)
2 parents ef8186d + 74da066 commit a6e6707

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

nix/ghcide-workaround.diff

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/session-loader/Development/IDE/Session.hs b/session-loader/Development/IDE/Session.hs
2+
index bdd27f3d..2639631d 100644
3+
--- a/session-loader/Development/IDE/Session.hs
4+
+++ b/session-loader/Development/IDE/Session.hs
5+
@@ -880,7 +880,7 @@ newComponentCache recorder exts cradlePath _cfp hsc_env old_cis new_cis = do
6+
getSession
7+
#endif
8+
henv <- createHscEnvEq thisEnv (zip uids dfs)
9+
- let targetEnv = (if isBad ci then multi_errs else [], Just henv)
10+
+ let targetEnv = ([], Just henv)
11+
targetDepends = componentDependencyInfo ci
12+
res = ( targetEnv, targetDepends)
13+
logWith recorder Debug $ LogNewComponentCache res

nix/shell.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ hsPkgs.shellFor {
2525
haskell-language-server = {
2626
src = inputs.haskellNix.inputs."hls-2.6";
2727
configureArgs = "--disable-benchmarks --disable-tests";
28+
modules = [{
29+
packages.ghcide.patches = [
30+
# https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
31+
./ghcide-workaround.diff
32+
];
33+
}];
2834
};
2935
};
3036

0 commit comments

Comments
 (0)