Skip to content

Fix #2693 #2780

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

Merged
merged 1 commit into from
Mar 14, 2022
Merged

Fix #2693 #2780

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
13 changes: 11 additions & 2 deletions ghcide/session-loader/Development/IDE/Session.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,8 +770,17 @@ newComponentCache
-> IO ( [TargetDetails], (IdeResult HscEnvEq, DependencyInfo))
newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
let df = componentDynFlags ci
let hscEnv' = hscSetFlags df hsc_env
{ hsc_IC = (hsc_IC hsc_env) { ic_dflags = df } }
hscEnv' <-
-- Add the options for the current component to the HscEnv
-- We want to call `setSessionDynFlags` instead of `hscSetFlags`
-- because `setSessionDynFlags` also initializes the package database,
-- which we need for any changes to the package flags in the dynflags
-- to be visible.
-- See #2693
evalGhcEnv hsc_env $ do
_ <- setSessionDynFlags $ df
Comment on lines +780 to +781
Copy link
Collaborator

@fendor fendor Mar 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uff, I hate these side effects. Hope this function is going to be removed soon :D

getSession


let newFunc = maybe newHscEnvEqPreserveImportPaths newHscEnvEq cradlePath
henv <- newFunc hscEnv' uids
Expand Down
5 changes: 2 additions & 3 deletions ghcide/test/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5583,8 +5583,7 @@ simpleSubDirectoryTest =
expectNoMoreDiagnostics 0.5

simpleMultiTest :: TestTree
simpleMultiTest = knownBrokenForGhcVersions [GHC92] "#2693" $
testCase "simple-multi-test" $ withLongTimeout $ runWithExtraFiles "multi" $ \dir -> do
simpleMultiTest = testCase "simple-multi-test" $ withLongTimeout $ runWithExtraFiles "multi" $ \dir -> do
let aPath = dir </> "a/A.hs"
bPath = dir </> "b/B.hs"
adoc <- openDoc aPath "haskell"
Expand Down Expand Up @@ -5614,7 +5613,7 @@ simpleMultiTest2 = testCase "simple-multi-test2" $ runWithExtraFiles "multi" $ \

-- Now with 3 components
simpleMultiTest3 :: TestTree
simpleMultiTest3 = knownBrokenForGhcVersions [GHC92] "#2693" $
simpleMultiTest3 =
testCase "simple-multi-test3" $ runWithExtraFiles "multi" $ \dir -> do
let aPath = dir </> "a/A.hs"
bPath = dir </> "b/B.hs"
Expand Down