@@ -387,7 +387,7 @@ prettyPrintSingleError full e = prettyPrintErrorMessage <$> onTypesInErrorMessag
387 goSimple (UnknownValue name) = line $ "Unknown value " ++ show name
387 goSimple (UnknownValue name) = line $ "Unknown value " ++ show name
388 goSimple (UnknownTypeConstructor name) = line $ "Unknown type constructor " ++ show name
388 goSimple (UnknownTypeConstructor name) = line $ "Unknown type constructor " ++ show name
389 goSimple (UnknownDataConstructor dc tc) = line $ "Unknown data constructor " ++ show dc ++ foldMap ((" for type constructor " ++) . show) tc
389 goSimple (UnknownDataConstructor dc tc) = line $ "Unknown data constructor " ++ show dc ++ foldMap ((" for type constructor " ++) . show) tc
390− goSimple (ConflictingImport nm mn) = line $ "Declaration " ++ nm ++ " conflicts with import " ++ show mn
390+ goSimple (ConflictingImport nm mn) = line $ "Cannot declare `" ++ nm ++ "` since another declaration of that name was imported from `" ++ show mn ++ "`"
391 goSimple (ConflictingImports nm m1 m2) = line $ "Conflicting imports for " ++ nm ++ " from modules " ++ show m1 ++ " and " ++ show m2
391 goSimple (ConflictingImports nm m1 m2) = line $ "Conflicting imports for " ++ nm ++ " from modules " ++ show m1 ++ " and " ++ show m2
392 goSimple (ConflictingTypeDecls nm) = line $ "Conflicting type declarations for " ++ show nm
392 goSimple (ConflictingTypeDecls nm) = line $ "Conflicting type declarations for " ++ show nm
393 goSimple (ConflictingCtorDecls nm) = line $ "Conflicting data constructor declarations for " ++ show nm
393 goSimple (ConflictingCtorDecls nm) = line $ "Conflicting data constructor declarations for " ++ show nm
@@ -540,6 +540,9 @@ prettyPrintSingleError full e = prettyPrintErrorMessage <$> onTypesInErrorMessag
540 suggestions :: ErrorMessage -> [Box.Box]
540 suggestions :: ErrorMessage -> [Box.Box]
541 suggestions = suggestions' . unwrapErrorMessage
541 suggestions = suggestions' . unwrapErrorMessage
543+ suggestions' (ConflictingImport nm im) = [ line $ "Possible fix: hide `" ++ nm ++ "` when importing `" ++ show im ++ "`:"
544+ , indent . line $ "import " ++ show im ++ " hiding (" ++ nm ++ ")"
543 suggestions' (TypesDoNotUnify t1 t2)
546 suggestions' (TypesDoNotUnify t1 t2)
544 | any isObject [t1, t2] = [line "Note that function composition in PureScript is defined using `(<<<)`"]
547 | any isObject [t1, t2] = [line "Note that function composition in PureScript is defined using `(<<<)`"]
545 | otherwise = []
548 | otherwise = []