hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: canonicalize filename before trying to unload

Browse Source
This commit is contained in:
Nikolay Yakimov 2015-07-03 19:12:04 +03:00
parent 31020c4112
commit a0cf585939
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Language/Haskell/GhcMod/FileMapping.hs
View File

@ -24,11 +24,8 @@ loadMappedFiles = do
mapM_ (uncurry loadMappedFile) fileMappings mapM_ (uncurry loadMappedFile) fileMappings
loadMappedFile :: IOish m => FilePath -> FileMapping -> GhcModT m () loadMappedFile :: IOish m => FilePath -> FileMapping -> GhcModT m ()
loadMappedFile from fm = do loadMappedFile from fm =
crdl <- cradle getCanonicalFileName from >>= (`addMMappedFile` fm)
let ccfn = cradleCurrentDir crdl </> from
cfn <- liftIO $ canonicalizePath ccfn
addMMappedFile cfn fm
mapFile :: (IOish m, GmState m, GhcMonad m) => mapFile :: (IOish m, GmState m, GhcMonad m) =>
HscEnv -> Target -> m Target HscEnv -> Target -> m Target
@ -51,5 +48,11 @@ mkMappedTarget tid taoc (Just (MemoryMapping (Just src))) = do
return $ mkTarget tid taoc $ Just (sb, ct) return $ mkTarget tid taoc $ Just (sb, ct)
mkMappedTarget tid taoc _ = return $ mkTarget tid taoc Nothing mkMappedTarget tid taoc _ = return $ mkTarget tid taoc Nothing
getCanonicalFileName :: IOish m => FilePath -> GhcModT m FilePath
getCanonicalFileName fn = do
crdl <- cradle
let ccfn = cradleCurrentDir crdl </> fn
liftIO $ canonicalizePath ccfn
unloadMappedFile :: IOish m => FilePath -> GhcModT m () unloadMappedFile :: IOish m => FilePath -> GhcModT m ()
unloadMappedFile = delMMappedFile unloadMappedFile = (delMMappedFile =<<) . getCanonicalFileName