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