git.iko.soy/elk
on master help sign in
Improve the error message for "UNKNOWN MODULE"
33efdcfEvan Czaplicki
builder/src/File/Find.hs+17−14
compare with master
unifiedsplit
@@ -9,6 +9,7 @@ module File.Find
9import Control.Monad.Except (liftIO)
9import Control.Monad.Except (liftIO)
10import qualified Data.Map as Map
10import qualified Data.Map as Map
11import qualified Data.Maybe as Maybe
11import qualified Data.Maybe as Maybe
12+import qualified System.FilePath as FP
12import qualified System.Directory as Dir
13import qualified System.Directory as Dir
13import System.FilePath ((</>), (<.>))
14import System.FilePath ((</>), (<.>))
14
15
@@ -38,20 +39,22 @@ data Asset
38
39
39find :: Summary.Summary -> E.Origin -> Module.Raw -> Task.Task_ E.Problem Asset
40find :: Summary.Summary -> E.Origin -> Module.Raw -> Task.Task_ E.Problem Asset
40find (Summary.Summary root project exposed _ _) origin name =
41find (Summary.Summary root project exposed _ _) origin name =
42+ do here <- liftIO Dir.getCurrentDirectory
43+ let toRoot dir = FP.makeRelative here (root </> dir)
41− case project of
44+ case project of
42− Project.App info ->
45+ Project.App info ->
43− do let srcDirs = map (root </>) (Project._app_source_dirs info)
46+ do let srcDirs = map toRoot (Project._app_source_dirs info)
44− findElm srcDirs exposed origin name
47+ findElm srcDirs exposed origin name
45−
48+
46− Project.Pkg _ ->
49+ Project.Pkg _ ->
47− if N.startsWith "Elm.Kernel." name then
50+ if N.startsWith "Elm.Kernel." name then
48− if Project.isPlatformPackage project then
51+ if Project.isPlatformPackage project then
49− findKernel (root </> "src") origin name
52+ findKernel (toRoot "src") origin name
50− else
53+ else
51− Task.throw $ E.ModuleNameReservedForKernel origin name
54+ Task.throw $ E.ModuleNameReservedForKernel origin name
52−
55+
53− else
56+ else
54− findElm [ root </> "src" ] exposed origin name
57+ findElm [ toRoot "src" ] exposed origin name
55
58
56
59
57
60
builder/src/Reporting/Exit/Crawl.hs+13−21
@@ -239,27 +239,19 @@ notFoundDetails child dirs =
239 Nothing ->
239 Nothing ->
240 [ simulatedCode
240 [ simulatedCode
241 , "I cannot find that module! Is there a typo in the module name?"
241 , "I cannot find that module! Is there a typo in the module name?"
242− , P.vcat
243− [ P.fillSep
244− ["Is","it","defined","in","a","package?","Did","you"
245− ,P.green "elm install"
246− ,"that","package","yet?"
247− ]
248− , Help.reflow $
242+ , Help.reflow $
249− case dirs of
243+ case dirs of
250− [] ->
244+ [] ->
251− "Is it a local file? I look in directories listed in the \"source-directories\"\
245+ "The \"source-directories\" field of your elm.json is empty, so I only\
252− \ field of your elm.json, so maybe you need to add a \"src\" directory there?"
246+ \ searched in packages. Maybe you need to add a \"src\" directory there?"
253−
247+
254− [dir] ->
248+ [dir] ->
255− "Is it a local file? I look in directories listed in the \"source-directories\"\
256− \ field of your elm.json, but it is not in the " ++ dir ++ " directory."
249+ "The \"source-directories\" field of your elm.json tells me to only look in the "
257−
250+ ++ dir ++ " directory, but it is not there. Maybe it is in a package that is not installed yet?"
258− dir:_:_ ->
251+
259− "Is it a local file? I look in directories listed in the \"source-directories\"\
252+ dir:_:_ ->
260− \ field of your elm.json (like the " ++ dir ++ " directory) but I do not see it\
253+ "The \"source-directories\" field of your elm.json tells me to look in directories like "
261− \ in any of them."
254+ ++ dir ++ ", but it is not in any of them. Maybe it is in a package that is not installed yet?"
262− ]
263 ]
255 ]
264
256
265
257