Handle hash at the end of addDependentFile

Fixes yesodweb/yesod#1551

ChangeLog.md

@@ -13,6 +13,10 @@ Other enhancements:
 
 Bug fixes:
 
+* Handle a change in GHC's hi-dump format around `addDependentFile`,
+  which now includes a hash. See
+  [yesodweb/yesod#1551](https://github.com/yesodweb/yesod/issues/1551)
+
 
 ## v1.9.0 (release candidate)
 

src/Stack/Package.hs

@@ -1286,8 +1286,11 @@ parseDumpHI dumpHIPath = do
             -- It can be an absolute or relative path.
             mapMaybe
                 (fmap TL.unpack .
-                  (TL.stripSuffix "\"" <=< TL.stripPrefix "\"") .
-                  TL.dropWhileEnd (== '\r') . TLE.decodeUtf8 . CL8.dropWhile (/= '"')) $
+                  TL.stripPrefix "\"" .
+                  -- Starting with GHC 8.4.3, there's a hash following
+                  -- the path. See
+                  -- https://github.com/yesodweb/yesod/issues/1551
+                  TL.takeWhile (/= '\"') . TLE.decodeUtf8 . CL8.dropWhile (/= '"')) $
             filter ("addDependentFile \"" `CL8.isPrefixOf`) dumpHI
     thDepsResolved <- liftM catMaybes $ forM thDeps $ \x -> do
         mresolved <- liftIO (forgivingAbsence (resolveFile dir x)) >>= rejectMissingFile

test/integration/lib/StackTest.hs

@@ -125,6 +125,24 @@ stackErrStderr args check = do
         then error "Stack process succeeded, but it shouldn't"
         else check err
 
+stackStdout :: [String] -> IO (ExitCode, String)
+stackStdout args = do
+    stackExe' <- stackExe
+    logInfo $ "Running: " ++ stackExe' ++ " " ++ unwords (map showProcessArgDebug args)
+    (ec, out, err) <- readProcessWithExitCode stackExe' args ""
+    hPutStr stdout out
+    hPutStr stderr err
+    return (ec, out)
+
+-- | Run stack with arguments and apply a check to the resulting
+-- stdout output if the process succeeded.
+stackCheckStdout :: [String] -> (String -> IO ()) -> IO ()
+stackCheckStdout args check = do
+    (ec, out) <- stackStdout args
+    if ec /= ExitSuccess
+        then error $ "Exited with exit code: " ++ show ec
+        else check out
+
 doesNotExist :: FilePath -> IO ()
 doesNotExist fp = do
     logInfo $ "doesNotExist " ++ fp

test/integration/tests/watched-files/Main.hs

@@ -0,0 +1,14 @@
+import StackTest
+import Data.Foldable (for_)
+import Control.Monad (unless)
+
+main :: IO ()
+main = for_ (words "foo bar baz bin") $ \x -> do
+  writeFile "some-text-file.txt" x
+  stackCheckStdout ["run"] $ \y ->
+    unless (x == y) $ error $ concat
+      [ "Expected: "
+      , show x
+      , "\nActual:  "
+      , show y
+      ]

test/integration/tests/watched-files/files/.gitignore

@@ -0,0 +1,2 @@
+some-text-file.txt
+files.cabal

test/integration/tests/watched-files/files/Main.hs

@@ -0,0 +1,9 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Main where
+
+import Data.FileEmbed
+import qualified Data.ByteString as B
+import System.IO (stdout)
+
+main :: IO ()
+main = B.hPut stdout $(embedFile "some-text-file.txt")

test/integration/tests/watched-files/files/package.yaml

@@ -0,0 +1,8 @@
+dependencies:
+- base
+- bytestring
+- file-embed
+
+executables:
+  watched:
+    main: Main.hs

test/integration/tests/watched-files/files/stack.yaml

@@ -0,0 +1 @@
+resolver: lts-11.19