@@ -36,8 +36,8 @@ data VarError = VarError
3636
3737data VarProblem
3838 = Ambiguous
39− | UnknownQualifier String
40− | QualifiedUnknown String
39+ | UnknownQualifier String String
40+ | QualifiedUnknown String String
4141 | ExposedUnknown
4242
4343
@@ -147,15 +147,19 @@ toReport dealiaser err =
147147 ("This usage of " ++ var ++ " is ambiguous.")
148148 (maybeYouWant suggestions)
149149
150− UnknownQualifier qualifier ->
150+ UnknownQualifier qualifier localName ->
151151 namingError
152− ("Cannot find " ++ var ++ ", qualifier `" ++ qualifier ++ "` is not in scope.")
153− (maybeYouWant suggestions)
152+ ("Cannot find " ++ var ++ ".")
153+ ( "The qualifier `" ++ qualifier ++ "` is not in scope. "
154+ ++ maybeYouWant (map (\modul -> modul ++ "." ++ localName) suggestions)
155+ )
154156
155− QualifiedUnknown qualifier ->
157+ QualifiedUnknown qualifier localName ->
156158 namingError
157− ("Cannot find " ++ var ++ ", module `" ++ qualifier ++ "` does not expose that value.")
158− (maybeYouWant suggestions)
159+ ("Cannot find " ++ var ++ ".")
160+ ( "`" ++ qualifier ++ "` does not expose `" ++ localName ++ "`. "
161+ ++ maybeYouWant (map (\v -> qualifier ++ "." ++ v) suggestions)
162+ )
159163
160164 ExposedUnknown ->
161165 namingError
@@ -254,7 +258,7 @@ maybeYouWant suggestions =
254258
255259 _:_ ->
256260 "Maybe you want one of the following?\n"
257− ++ concatMap ("\n "++) suggestions
261+ ++ concatMap ("\n "++) (take 4 suggestions)
258262
259263
260264extractSuggestions :: Error -> Maybe [String]