From 0d42b66fc3cc9b41c2eded2ec824ed71f86be105 Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Sat, 19 Sep 2015 09:34:53 +0300 Subject: [PATCH] Fix logging for file mapping when temp dir is proj. root subdir --- Language/Haskell/GhcMod/FileMapping.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Language/Haskell/GhcMod/FileMapping.hs b/Language/Haskell/GhcMod/FileMapping.hs index c9490e6..1e7e0c1 100644 --- a/Language/Haskell/GhcMod/FileMapping.hs +++ b/Language/Haskell/GhcMod/FileMapping.hs @@ -37,7 +37,9 @@ loadMappedFile' :: IOish m => FilePath -> FilePath -> Bool -> GhcModT m () loadMappedFile' from to isTemp = do cfn <- getCanonicalFileNameSafe from unloadMappedFile' cfn - addMMappedFile cfn (FileMapping to isTemp) + crdl <- cradle + let to' = makeRelative (cradleRootDir crdl) to + addMMappedFile cfn (FileMapping to' isTemp) mapFile :: (IOish m, GmState m, GhcMonad m, GmEnv m) => HscEnv -> Target -> m Target