input-output-hk/devx
1
1
Fork 0
mirror of https://github.com/input-output-hk/devx.git synced 2024-10-05 16:07:12 +03:00
Code Issues Projects Releases Wiki Activity

Patch "HLS stuck (init then no progress) since multi home support" (#156)

Browse Source 
https://github.com/haskell/haskell-language-server/issues/4046
This commit is contained in:
Yvan Sraka 2024-04-23 23:10:44 +02:00 committed by GitHub
parent ff46fd1c50
commit 559157f331
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extra/ghcide-workaround.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git a/session-loader/Development/IDE/Session.hs b/session-loader/Development/IDE/Session.hs
index bdd27f3d..2639631d 100644
--- a/session-loader/Development/IDE/Session.hs
+++ b/session-loader/Development/IDE/Session.hs
@@ -880,7 +880,7 @@ newComponentCache recorder exts cradlePath _cfp hsc_env old_cis new_cis = do
getSession
#endif
henv <- createHscEnvEq thisEnv (zip uids dfs)
- let targetEnv = (if isBad ci then multi_errs else [], Just henv)
+ let targetEnv = ([], Just henv)
targetDepends = componentDependencyInfo ci
res = ( targetEnv, targetDepends)
logWith recorder Debug $ LogNewComponentCache res

9
tool-map.nix
View File

@ -41,6 +41,15 @@ compiler-nix-name: tool: {
# `tool` normally ignores the `cabal.project` (if there is one in the hackage source).
# We need to use the github one (since it has settings to make hls build).
cabalProject = __readFile (src + "/cabal.project");
configureArgs = "--disable-benchmarks --disable-tests";
modules = [{
packages.ghcide.patches =
(if compiler-nix-name != "ghc8107" && compiler-nix-name != "ghc902" then [
# The following patch only works with hls-2.6 ...
# https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
./extra/ghcide-workaround.diff
] else []);
}];
};
happy = { version = "1.20.1.1"; inherit cabalProjectLocal; };
alex = { version = "3.2.7.3"; inherit cabalProjectLocal; };