X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FFiles.hs;h=6557b8872f948b598ad654532d012129ef77b8fd;hp=0d79ebd658c2a3f03d80d073a41f8f6552f2385f;hb=6930c3cb143fb7aca3f14ea865052ab79c386684;hpb=93bbb70d531238c46a28eb356a68c3648b88082f

diff --git a/src/Language/Haskell/LSP/Test/Files.hs b/src/Language/Haskell/LSP/Test/Files.hs
index 0d79ebd..6557b88 100644
--- a/src/Language/Haskell/LSP/Test/Files.hs
+++ b/src/Language/Haskell/LSP/Test/Files.hs
@@ -5,11 +5,12 @@ module Language.Haskell.LSP.Test.Files
   ( swapFiles
   , FileMap
   , emptyFileMap
+  , rootDir
   )
 where
 
 import           Language.Haskell.LSP.Types        hiding ( error )
-import           Language.Haskell.LSP.Test.Parsing
+import           Control.Lens
 import           Control.Monad
 import           Data.Aeson
 import qualified Data.ByteString.Lazy.Char8    as B
@@ -28,39 +29,48 @@ type FileMap = Map.Map Uri Uri
 emptyFileMap :: FileMap
 emptyFileMap = Map.empty
 
-buildFileMap :: [Uri] -> FileMap -> IO FileMap
-buildFileMap uris oldMap = foldM createFile oldMap uris
+buildFileMap :: [Uri] -> FilePath -> FilePath -> FileMap -> IO FileMap
+buildFileMap uris recBaseDir curBaseDir oldMap =
+  foldM (createFile recBaseDir curBaseDir) oldMap uris
   where
-  createFile map uri =
+  createFile baseDir curDir  map uri =
     if Map.member uri map
       then return map
       else do
         let fp = fromMaybe (error "Couldn't convert file path")
                  (uriToFilePath uri)
+            relativeFp = makeRelative baseDir fp
+            actualFp = curDir </> relativeFp
 
         -- Need to store in a directory inside tmp directory
         -- otherwise ghc-mod ends up creating one for us
-        tmpDir <- (</> "lsp-test") <$> getTemporaryDirectory
-        createDirectoryIfMissing False tmpDir
+        tmpDir <- (</> "lsp-test" </> takeDirectory relativeFp) <$> getTemporaryDirectory
+        createDirectoryIfMissing True tmpDir
 
-        (tmpFp, tmpH) <- openTempFile tmpDir (takeFileName fp)
+        (tmpFp, tmpH) <- openTempFile tmpDir (takeFileName actualFp)
 
-        readFile fp >>= hPutStr tmpH
+        readFile actualFp >>= hPutStr tmpH
         tmpUri <- filePathToUri <$> canonicalizePath tmpFp
         return $ Map.insert uri tmpUri map
 
-swapFiles :: FileMap -> Handle -> IO ([B.ByteString], FileMap)
-swapFiles fileMap h = do
-  msgs <- getAllMessages h
+swapFiles :: FileMap -> FilePath -> FilePath -> [B.ByteString] -> IO ([B.ByteString], FileMap)
+swapFiles fileMap recBaseDir curBaseDir msgs = do
 
   let oldUris = Set.unions $ map extractUris msgs
 
-  newMap <- buildFileMap (Set.elems oldUris) fileMap
+  newMap <- buildFileMap (Set.elems oldUris) recBaseDir curBaseDir fileMap
 
   let newMsgs = map (swapUris newMap) msgs
 
   return (newMsgs, newMap)
 
+rootDir :: [B.ByteString] -> FilePath
+rootDir msgs = case decode (head msgs) :: Maybe InitializeRequest of
+                Just req -> fromMaybe (error "Couldn't convert root dir") $ do
+                  rootUri <- req ^. params . rootUri
+                  uriToFilePath rootUri
+                Nothing -> error "Couldn't find root dir"
+
 extractUris :: B.ByteString -> Set.Set Uri
 extractUris msgs =
   case decode msgs :: Maybe Object of