Skip to content

Commit

Permalink
Patch "HLS stuck (init then no progress) since multi home support"
Browse files Browse the repository at this point in the history
  • Loading branch information
yvan-sraka committed Apr 20, 2024
1 parent ff46fd1 commit a320d2d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
13 changes: 13 additions & 0 deletions extra/ghcide-workaround.diff
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions tool-map.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ 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 = [
# https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
./extra/ghcide-workaround.diff
];
}];
};
happy = { version = "1.20.1.1"; inherit cabalProjectLocal; };
alex = { version = "3.2.7.3"; inherit cabalProjectLocal; };
Expand Down

0 comments on commit a320d2d

Please sign in to comment.