on master help sign in
Merge pull request #2918 from LeifW/canonicalize_watched_files
01484e6Niklas Larsson
idris.cabal+1−1
@@ -984,7 +984,7 @@ Library
984 , zip-archive > 0.2.3.5 && < 0.2.4
984 , zip-archive > 0.2.3.5 && < 0.2.4
985 , safe
985 , safe
986 , fsnotify < 2.2
986 , fsnotify < 2.2
987− , async < 2.1
987+ , async < 2.2
988
988
989 -- zlib >= 0.6.1 is broken with GHC < 7.10.3
989 -- zlib >= 0.6.1 is broken with GHC < 7.10.3
990 if impl(ghc < 7.10.3)
990 if impl(ghc < 7.10.3)
src/Idris/REPL.hs+2−2
@@ -691,9 +691,9 @@ reload orig inputs = do
691
691
692watch :: IState -> [FilePath] -> Idris (Maybe [FilePath])
692watch :: IState -> [FilePath] -> Idris (Maybe [FilePath])
693watch orig inputs = do
693watch orig inputs = do
694− let inputSet = S.fromList inputs
695− let dirs = nub $ map takeDirectory inputs
696 resp <- runIO $ do
694 resp <- runIO $ do
695+ let dirs = nub $ map takeDirectory inputs
696+ inputSet <- fmap S.fromList $ mapM canonicalizePath inputs
697 signal <- newEmptyMVar
697 signal <- newEmptyMVar
698 withManager $ \mgr -> do
698 withManager $ \mgr -> do
699 forM_ dirs $ \dir ->
699 forM_ dirs $ \dir ->