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

Move getCanonicalFileName(Safe) to Utils module

Browse Source
This commit is contained in:
Nikolay Yakimov 2015-07-03 20:25:54 +03:00
parent 267edfebe3
commit 438b15463e
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,7 @@ import Language.Haskell.GhcMod.Types
import Language.Haskell.GhcMod.Monad.Types import Language.Haskell.GhcMod.Monad.Types
import Language.Haskell.GhcMod.Gap import Language.Haskell.GhcMod.Gap
import Language.Haskell.GhcMod.HomeModuleGraph import Language.Haskell.GhcMod.HomeModuleGraph
import Language.Haskell.GhcMod.Utils
import System.Directory
import System.FilePath
import Data.Time import Data.Time
@ -25,7 +23,7 @@ loadMappedFiles = do
loadMappedFile :: IOish m => FilePath -> FileMapping -> GhcModT m () loadMappedFile :: IOish m => FilePath -> FileMapping -> GhcModT m ()
loadMappedFile from fm = loadMappedFile from fm =
getCanonicalFileName from >>= (`addMMappedFile` fm) getCanonicalFileNameSafe from >>= (`addMMappedFile` fm)
mapFile :: (IOish m, GmState m, GhcMonad m) => mapFile :: (IOish m, GmState m, GhcMonad m) =>
HscEnv -> Target -> m Target HscEnv -> Target -> m Target
@ -48,14 +46,5 @@ 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
fex <- liftIO $ doesFileExist ccfn
if fex
then liftIO $ canonicalizePath ccfn
else return ccfn
unloadMappedFile :: IOish m => FilePath -> GhcModT m () unloadMappedFile :: IOish m => FilePath -> GhcModT m ()
unloadMappedFile = (delMMappedFile =<<) . getCanonicalFileName unloadMappedFile = (delMMappedFile =<<) . getCanonicalFileNameSafe

9
Language/Haskell/GhcMod/Utils.hs
View File

@ -174,3 +174,12 @@ withMappedFile file action = lookupMMappedFile file >>= runWithFile
liftIO $ removeFile fp liftIO $ removeFile fp
return result return result
runWithFile _ = action file runWithFile _ = action file
getCanonicalFileNameSafe :: IOish m => FilePath -> GhcModT m FilePath
getCanonicalFileNameSafe fn = do
crdl <- cradle
let ccfn = cradleCurrentDir crdl </> fn
fex <- liftIO $ doesFileExist ccfn
if fex
then liftIO $ canonicalizePath ccfn
else return ccfn