Tue Nov 28 11:37:16 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/11d74d7f84b7683501cbd0e88b62c98016c3a66d

>---------------------------------------------------------------

commit 11d74d7f84b7683501cbd0e88b62c98016c3a66d
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 4 17:00:52 2015 +0200

    Fix bug with modules not being found in global search mode.


>---------------------------------------------------------------

11d74d7f84b7683501cbd0e88b62c98016c3a66d
 html-test/run.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/html-test/run.hs b/html-test/run.hs
index b3ca478..da41417 100755
--- a/html-test/run.hs
+++ b/html-test/run.hs
@@ -181,19 +181,25 @@ baseDependencies ghcPath = do
 
 
 processFileArgs :: [String] -> IO [FilePath]
-processFileArgs [] = filter isSourceFile <$> getDirectoryContents srcDir
+processFileArgs [] =
+    map toModulePath . filter isSourceFile <$> getDirectoryContents srcDir
+  where
+    toModulePath = modulePath . takeBaseName
 processFileArgs args = pure $ map processFileArg args
 
 
 processFileArg :: String -> FilePath
 processFileArg arg
     | isSourceFile arg = arg
-    | otherwise = srcDir </> arg <.> "hs"
+    | otherwise = modulePath arg
 
 
 isSourceFile :: FilePath -> Bool
 isSourceFile path = takeExtension path `elem` [".hs", ".lhs"]
 
+modulePath :: String -> FilePath
+modulePath mdl = srcDir </> mdl <.> "hs"
+
 
 data Flag
     = FlagHaddockPath FilePath

