Skip to content

Commit 2ec645d

Browse files
fendormichaelpj
andauthored
Exit with non-zero exitcode if wrapper fails to launch (#4110)
* Exit with non-zero exitcode if wrapper fails to launch Only when in LSP mode, we want to launch the LSP server that offers the restart capability. * Install recommended GHC version for release wrapper tests --------- Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
1 parent 7ccdeb9 commit 2ec645d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/scripts/test.sh

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ test_all_hls() {
4848
fi
4949
fi
5050
done
51+
# install the recommended GHC version so the wrapper can launch HLS
52+
ghcup install ghc --set recommended
5153
"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
5254
}
5355

exe/Wrapper.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ main = do
9999
Left err -> do
100100
T.hPutStrLn stderr (prettyError err NoShorten)
101101
case args of
102-
Ghcide _ -> launchErrorLSP recorder (prettyError err Shorten)
103-
_ -> pure ()
102+
Ghcide (GhcideArguments { argsCommand = Main.LSP }) ->
103+
launchErrorLSP recorder (prettyError err Shorten)
104+
105+
_ -> exitFailure
104106

105107
launchHaskellLanguageServer :: Recorder (WithPriority (Doc ())) -> Arguments -> IO (Either WrapperSetupError ())
106108
launchHaskellLanguageServer recorder parsedArgs = do

0 commit comments

Comments
 (0)