git.iko.soy/elk
on master help sign in
Improve hints and suggestions for unfound variables
501d241Evan Czaplicki
src/Canonicalize/Variable.hs+2−2
compare with master
unifiedsplit
@@ -211,7 +211,7 @@ qualifiedProblem moduleName name allQualified =
211 in
211 in
212 case Set.member moduleName availableModules of
212 case Set.member moduleName availableModules of
213 True ->
213 True ->
214− ( Error.QualifiedUnknown moduleNameString
214+ ( Error.QualifiedUnknown moduleNameString name
215 , allQualified
215 , allQualified
216 |> filter ((==) moduleName . fst)
216 |> filter ((==) moduleName . fst)
217 |> map snd
217 |> map snd
@@ -219,7 +219,7 @@ qualifiedProblem moduleName name allQualified =
219 )
219 )
220
220
221 False ->
221 False ->
222− ( Error.UnknownQualifier moduleNameString
222+ ( Error.UnknownQualifier moduleNameString name
223 , Set.toList availableModules
223 , Set.toList availableModules
224 |> map Module.nameToString
224 |> map Module.nameToString
225 |> Error.nearbyNames id moduleNameString
225 |> Error.nearbyNames id moduleNameString
src/Reporting/Error/Canonicalize.hs+13−9
@@ -36,8 +36,8 @@ data VarError = VarError
36
36
37data VarProblem
37data VarProblem
38 = Ambiguous
38 = Ambiguous
39− | UnknownQualifier String
39+ | UnknownQualifier String String
40− | QualifiedUnknown String
40+ | QualifiedUnknown String String
41 | ExposedUnknown
41 | ExposedUnknown
42
42
43
43
@@ -147,15 +147,19 @@ toReport dealiaser err =
147 ("This usage of " ++ var ++ " is ambiguous.")
147 ("This usage of " ++ var ++ " is ambiguous.")
148 (maybeYouWant suggestions)
148 (maybeYouWant suggestions)
149
149
150− UnknownQualifier qualifier ->
150+ UnknownQualifier qualifier localName ->
151 namingError
151 namingError
152+ ("Cannot find " ++ var ++ ".")
152− ("Cannot find " ++ var ++ ", qualifier `" ++ qualifier ++ "` is not in scope.")
153+ ( "The qualifier `" ++ qualifier ++ "` is not in scope. "
153− (maybeYouWant suggestions)
154+ ++ maybeYouWant (map (\modul -> modul ++ "." ++ localName) suggestions)
155+ )
154
156
155− QualifiedUnknown qualifier ->
157+ QualifiedUnknown qualifier localName ->
156 namingError
158 namingError
159+ ("Cannot find " ++ var ++ ".")
157− ("Cannot find " ++ var ++ ", module `" ++ qualifier ++ "` does not expose that value.")
160+ ( "`" ++ qualifier ++ "` does not expose `" ++ localName ++ "`. "
158− (maybeYouWant suggestions)
161+ ++ maybeYouWant (map (\v -> qualifier ++ "." ++ v) suggestions)
162+ )
159
163
160 ExposedUnknown ->
164 ExposedUnknown ->
161 namingError
165 namingError
@@ -254,7 +258,7 @@ maybeYouWant suggestions =
254
258
255 _:_ ->
259 _:_ ->
256 "Maybe you want one of the following?\n"
260 "Maybe you want one of the following?\n"
257− ++ concatMap ("\n "++) suggestions
261+ ++ concatMap ("\n "++) (take 4 suggestions)
258
262
259
263
260extractSuggestions :: Error -> Maybe [String]
264extractSuggestions :: Error -> Maybe [String]