Merge branch 'master' into soulomoon/make-workerqueue-cancellable-if-…

…not-started
haskell · soulomoon · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024 · Jun 9, 2024
commit 5aea44e7d68d4463320cff0956d14ad55e51bf00
@@ -68,15 +68,16 @@
 import           Data.Time                         (UTCTime (..))
 import           Data.Tuple.Extra                  (dupe)
 import           Debug.Trace
 import           Development.IDE.Core.FileStore    (resetInterfaceStore)
 import           Development.IDE.Core.Preprocessor
 import           Development.IDE.Core.RuleTypes
 import           Development.IDE.Core.Shake
 import           Development.IDE.Core.Tracing      (withTrace)
 import           Development.IDE.Core.WorkerThread (writeWorkerQueue)
-import           Development.IDE.GHC.Compat        hiding (loadInterface,
-                                                    parseHeader, parseModule,
-                                                    tcRnModule, writeHieFile, assert)
+import           Development.IDE.GHC.Compat        hiding (assert,
+                                                    loadInterface, parseHeader,
+                                                    parseModule, tcRnModule,
+                                                    writeHieFile)
 import qualified Development.IDE.GHC.Compat        as Compat
 import qualified Development.IDE.GHC.Compat        as GHC
 import qualified Development.IDE.GHC.Compat.Util   as Util
@@ -292,7 +293,7 @@

             {- load it -}
           ; (fv_hvs, lbss, pkgs) <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
           ; let hval = ((expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs), lbss, pkgs)

           ; modifyIORef' var (flip extendModuleEnvList [(mi_module $ hm_iface hm, linkableHash lb) | lb <- lbs, let hm = linkableHomeMod lb])
           ; return hval }
@@ -953,7 +954,7 @@


        convImport (L _ i) = (
                               (ideclPkgQual i)
                             , reLoc $ ideclName i)

        msrImports = implicit_imports ++ imps

diff --git a/exe/Wrapper.hs b/exe/Wrapper.hs
 {-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedStrings #-}
diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
                 [] -> error $ "GHC version could not be parsed: " <> version
                 ((runTime, _):_)
                   | compileTime == runTime -> do
                     atomicModifyIORef' cradle_files (\xs -> (cfp:xs,()))
                     session (hieYaml, toNormalizedFilePath' cfp, opts, libDir)
                   | otherwise -> return (([renderPackageSetupException cfp GhcVersionMismatch{..}], Nothing),[])
             -- Failure case, either a cradle error or the none cradle
      where
        go rest this this_uis =
           plusUniqMap_C OS.union
             (addToUniqMap_C OS.union external_depends this (OS.fromList $ this_deps))
             rest
           where
             external_depends = mapUniqMap (OS.fromList . unitDepends)
            x <- bagToList $ mapBag errMsgDiagnostic $ unionManyBags $ map Compat.getMessages closure_errs
            DriverHomePackagesNotClosed us <- pure x
            pure us
        isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
    -- Whenever we spin up a session on Linux, dynamically load libm.so.6
    -- in. We need this in case the binary is statically linked, in which
    -- case the interactive session will fail when trying to load
                     -- This works because there won't be any dependencies on the
                     -- executable unit.
                     "main" ->
                       let hash = B.unpack $ B16.encode $ H.finalize $ H.updates H.init (map B.pack $ this_opts)
                           hashed_uid = Compat.toUnitId (Compat.stringToUnit ("main-"++hash))
                       in setHomeUnitId_ hashed_uid dflags'
                     _ -> dflags'
diff --git a/ghcide/session-loader/Development/IDE/Session/Diagnostics.hs b/ghcide/session-loader/Development/IDE/Session/Diagnostics.hs
 {-# LANGUAGE DeriveAnyClass #-}

 module Development.IDE.Session.Diagnostics where
 import           Control.Applicative
    surround start s end = do
      guard (listToMaybe s == Just start)
      guard (listToMaybe (reverse s) == Just end)
      pure $ drop 1 $ take (length s - 1) s

 multiCradleErrMessage :: MultiCradleErr -> [String]
 multiCradleErrMessage e =
diff --git a/ghcide-bench/src/Experiments.hs b/ghcide-bench/src/Experiments.hs
 examplesPath = "bench/example"

 defConfig :: Config
 Success defConfig = execParserPure defaultPrefs (info configP fullDesc) []

 quiet, verbose :: Config -> Bool
 verbose = (== All) . verbosity
  results <- forM benchmarks $ \b@Bench{name} ->  do
    let p = (proc (ghcide ?config) (allArgs name dir))
                { std_in = CreatePipe, std_out = CreatePipe, std_err = CreatePipe }
        run sess = withCreateProcess p $ \(Just inH) (Just outH) (Just errH) pH -> do
                    -- Need to continuously consume to stderr else it gets blocked
                    -- Can't pass NoStream either to std_err
                    hSetBuffering errH NoBuffering
diff --git a/ghcide/test/exe/Progress.hs b/ghcide/test/exe/Progress.hs
    return InProgressState{..}

 toModel :: InProgressState -> IO InProgressModel
 toModel InProgressState{..} = atomically $ do
    done <- readTVar doneVar
    todo <- readTVar todoVar
    current <- Map.fromList <$> ListT.toList (STM.listT currentVar)
	{-# LANGUAGE CPP #-}
Check warning on line 1 in exe/Wrapper.hs GitHub Actions / Hlint check run `Warning in module Main: Use module export list ▫︎ Found: "module Main where" ▫︎ Perhaps: "module Main (\n module Main\n ) where" ▫︎ Note: an explicit list is usually better`
	{-# LANGUAGE DataKinds #-}
	{-# LANGUAGE LambdaCase #-}
	{-# LANGUAGE OverloadedStrings #-}
	[] -> error $ "GHC version could not be parsed: " <> version
	((runTime, _):_)
	\| compileTime == runTime -> do
	atomicModifyIORef' cradle_files (\xs -> (cfp:xs,()))
Check warning on line 645 in ghcide/session-loader/Development/IDE/Session.hs GitHub Actions / Hlint check run `Warning in loadSessionWithOptions in module Development.IDE.Session: Use atomicModifyIORef'_ ▫︎ Found: "atomicModifyIORef' cradle_files (\\ xs -> (cfp : xs, ()))" ▫︎ Perhaps: "atomicModifyIORef'_ cradle_files ((:) cfp)"`
	session (hieYaml, toNormalizedFilePath' cfp, opts, libDir)
	\| otherwise -> return (([renderPackageSetupException cfp GhcVersionMismatch{..}], Nothing),[])
	-- Failure case, either a cradle error or the none cradle
	where
	go rest this this_uis =
	plusUniqMap_C OS.union
	(addToUniqMap_C OS.union external_depends this (OS.fromList $ this_deps))
Check warning on line 835 in ghcide/session-loader/Development/IDE/Session.hs GitHub Actions / Hlint check run `Suggestion in checkHomeUnitsClosed' in module Development.IDE.Session: Redundant $ ▫︎ Found: "OS.fromList $ this_deps" ▫︎ Perhaps: "OS.fromList this_deps"`
	rest
	where
	external_depends = mapUniqMap (OS.fromList . unitDepends)
	x <- bagToList $ mapBag errMsgDiagnostic $ unionManyBags $ map Compat.getMessages closure_errs
	DriverHomePackagesNotClosed us <- pure x
	pure us
	isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
Check warning on line 893 in ghcide/session-loader/Development/IDE/Session.hs GitHub Actions / Hlint check run Suggestion in newComponentCache in module Development.IDE.Session: Redundant bracket ▫︎ Found: "(homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units" ▫︎ Perhaps: "homeUnitId_ (componentDynFlags ci) `OS.member` bad_units"
	-- Whenever we spin up a session on Linux, dynamically load libm.so.6
	-- in. We need this in case the binary is statically linked, in which
	-- case the interactive session will fail when trying to load
	-- This works because there won't be any dependencies on the
	-- executable unit.
	"main" ->
	let hash = B.unpack $ B16.encode $ H.finalize $ H.updates H.init (map B.pack $ this_opts)
Check warning on line 1157 in ghcide/session-loader/Development/IDE/Session.hs GitHub Actions / Hlint check run `Suggestion in setOptions in module Development.IDE.Session: Redundant $ ▫︎ Found: "map B.pack $ this_opts" ▫︎ Perhaps: "map B.pack this_opts"`
	hashed_uid = Compat.toUnitId (Compat.stringToUnit ("main-"++hash))
	in setHomeUnitId_ hashed_uid dflags'
	_ -> dflags'
	{-# LANGUAGE DeriveAnyClass #-}
Check warning on line 1 in ghcide/session-loader/Development/IDE/Session/Diagnostics.hs GitHub Actions / Hlint check run `Warning in module Development.IDE.Session.Diagnostics: Use module export list ▫︎ Found: "module Development.IDE.Session.Diagnostics where" ▫︎ Perhaps: "module Development.IDE.Session.Diagnostics (\n module Development.IDE.Session.Diagnostics\n ) where" ▫︎ Note: an explicit list is usually better`

	module Development.IDE.Session.Diagnostics where
	import Control.Applicative
	surround start s end = do
	guard (listToMaybe s == Just start)
	guard (listToMaybe (reverse s) == Just end)
	pure $ drop 1 $ take (length s - 1) s
Check warning on line 87 in ghcide/session-loader/Development/IDE/Session/Diagnostics.hs GitHub Actions / Hlint check run `Warning in parseMultiCradleErr in module Development.IDE.Session.Diagnostics: Use drop1 ▫︎ Found: "drop 1" ▫︎ Perhaps: "drop1"`

	multiCradleErrMessage :: MultiCradleErr -> [String]
	multiCradleErrMessage e =
	examplesPath = "bench/example"

	defConfig :: Config
	Success defConfig = execParserPure defaultPrefs (info configP fullDesc) []
Check warning on line 345 in ghcide-bench/src/Experiments.hs GitHub Actions / flags (9.6, ubuntu-latest) `Pattern match(es) are non-exhaustive` Check warning on line 345 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, macOS-latest, false) `Pattern match(es) are non-exhaustive` Check warning on line 345 in ghcide-bench/src/Experiments.hs GitHub Actions / bench_init (9.6, ubuntu-latest) `Pattern match(es) are non-exhaustive` Check warning on line 345 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, ubuntu-latest, true) `Pattern match(es) are non-exhaustive` Check warning on line 345 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, windows-latest, true) `Pattern match(es) are non-exhaustive`

	quiet, verbose :: Config -> Bool
	verbose = (== All) . verbosity
	results <- forM benchmarks $ \b@Bench{name} -> do
	let p = (proc (ghcide ?config) (allArgs name dir))
	{ std_in = CreatePipe, std_out = CreatePipe, std_err = CreatePipe }
	run sess = withCreateProcess p $ \(Just inH) (Just outH) (Just errH) pH -> do
Check warning on line 453 in ghcide-bench/src/Experiments.hs GitHub Actions / flags (9.6, ubuntu-latest) `Pattern match(es) are non-exhaustive` Check warning on line 453 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, macOS-latest, false) `Pattern match(es) are non-exhaustive` Check warning on line 453 in ghcide-bench/src/Experiments.hs GitHub Actions / bench_init (9.6, ubuntu-latest) `Pattern match(es) are non-exhaustive` Check warning on line 453 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, ubuntu-latest, true) `Pattern match(es) are non-exhaustive` Check warning on line 453 in ghcide-bench/src/Experiments.hs GitHub Actions / test (9.6, windows-latest, true) `Pattern match(es) are non-exhaustive`
	-- Need to continuously consume to stderr else it gets blocked
	-- Can't pass NoStream either to std_err
	hSetBuffering errH NoBuffering
	return InProgressState{..}

	toModel :: InProgressState -> IO InProgressModel
	toModel InProgressState{..} = atomically $ do
Check warning on line 56 in ghcide/test/exe/Progress.hs GitHub Actions / flags (9.6, ubuntu-latest) `Pattern match(es) are non-exhaustive` Check warning on line 56 in ghcide/test/exe/Progress.hs GitHub Actions / test (9.6, macOS-latest, false) `Pattern match(es) are non-exhaustive` Check warning on line 56 in ghcide/test/exe/Progress.hs GitHub Actions / test (9.6, ubuntu-latest, true) `Pattern match(es) are non-exhaustive` Check warning on line 56 in ghcide/test/exe/Progress.hs GitHub Actions / test (9.6, windows-latest, true) `Pattern match(es) are non-exhaustive`
	done <- readTVar doneVar
	todo <- readTVar todoVar
	current <- Map.fromList <$> ListT.toList (STM.listT currentVar)