Skip to content

4718 hls graph session restart kills threads belong to later sesion session #4719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −6
Draft

4718 hls graph session restart kills threads belong to later sesion session #4719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ghcide/src/Development/IDE/Core/Shake.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ import System.FilePath hiding (makeRelative)
import System.IO.Unsafe (unsafePerformIO)
import System.Time.Extra
import UnliftIO (MonadUnliftIO (withRunInIO))
import qualified UnliftIO.Exception as UE


data Log
Expand Down Expand Up @@ -1477,7 +1478,8 @@ kickSignal testing lspEnv files msg = when testing $ liftIO $ mRunLspT lspEnv $
-- | Add kick start/done signal to rule
runWithSignal :: (KnownSymbol s0, KnownSymbol s1, IdeRule k v) => Proxy s0 -> Proxy s1 -> [NormalizedFilePath] -> k -> Action ()
runWithSignal msgStart msgEnd files rule = do
ShakeExtras{ideTesting = Options.IdeTesting testing, lspEnv} <- getShakeExtras
kickSignal testing lspEnv files msgStart
void $ uses rule files
kickSignal testing lspEnv files msgEnd
ShakeExtras {ideTesting = Options.IdeTesting testing, lspEnv} <- getShakeExtras
UE.bracket_
(kickSignal testing lspEnv files msgStart)
(kickSignal testing lspEnv files msgEnd)
$ void $ uses rule files
8 changes: 6 additions & 2 deletions plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ import System.Environment (setEnv,
import Development.IDE.GHC.Compat (DynFlags,
extensionFlags,
ms_hspp_opts,
topDir)
topDir,
uninterruptibleMaskM_)
import qualified Development.IDE.GHC.Compat.Util as EnumSet

#if MIN_GHC_API_VERSION(9,4,0)
Expand Down Expand Up @@ -205,7 +206,10 @@ rules recorder plugin = do

defineNoFile (cmapWithPrio LogShake recorder) $ \GetHlintSettings -> do
(Config flags) <- getHlintConfig plugin
liftIO $ argsSettings flags
-- argsSettings might capture async exceptions and throw it everytime we call it.
-- So we must mask async exceptions here as an workaround.
-- See https://github.com/haskell/haskell-language-server/issues/4718
liftIO $ uninterruptibleMask_ $ argsSettings flags

action $ do
files <- Map.keys <$> getFilesOfInterestUntracked
Expand Down
Loading