Normalise file targets after loading

haskell · Nov 17, 2020 · 7ce49a9 · 7ce49a9
1 parent 923a7f2
commit 7ce49a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/session-loader/Development/IDE/Session.hs b/session-loader/Development/IDE/Session.hs
@@ -615,9 +615,10 @@ memoIO op = do
             Just res -> return (mp, res)
 
 -- | Throws if package flags are unsatisfiable
-setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [GHC.Target])
+setOptions :: (MonadIO m, GhcMonad m) => ComponentOptions -> DynFlags -> m (DynFlags, [GHC.Target])
 setOptions (ComponentOptions theOpts compRoot _) dflags = do
-    (dflags', targets) <- addCmdOpts theOpts dflags
+    (dflags', targets') <- addCmdOpts theOpts dflags
+    let targets = makeTargetsAbsolute compRoot targets'
     let dflags'' =
           disableWarningsAsErrors $
           -- disabled, generated directly by ghcide instead

diff --git a/test/exe/Main.hs b/test/exe/Main.hs
@@ -3282,7 +3282,7 @@ ignoreFatalWarning = testCase "ignore-fatal-warning" $ runWithExtraFiles "ignore
     expectNoMoreDiagnostics 5
 
 simpleSubDirectoryTest :: TestTree
-simpleSubDirectoryTest = expectFailBecause "File Targets are not normalised" $
+simpleSubDirectoryTest =
   testCase "simple-subdirectory" $ runWithExtraFiles "cabal-exe" $ \dir -> do
     let mainPath = dir </> "a/src/Main.hs"
     mainSource <- liftIO $ readFileUtf8 mainPath