14 files changed, 95 insertions, 21 deletions
diff --git a/testsuite/tests/annotations/should_fail/annfail11.stderr b/testsuite/tests/annotations/should_fail/annfail11.stderr
index 384f6179aa..40bcebb904 100644
--- a/testsuite/tests/annotations/should_fail/annfail11.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail11.stderr
@@ -1,10 +1,14 @@
 
-annfail11.hs:3:1:
+annfail11.hs:3:1: error:
     Not in scope: ‘length’
+    Perhaps you want to add ‘length’ to the import list
+    in the import of ‘Prelude’ (annfail11.hs:1:8-16).
     In the annotation:
       {-# ANN length "Cannot annotate other modules yet" #-}
 
-annfail11.hs:4:1:
+annfail11.hs:4:1: error:
     Not in scope: type constructor or class ‘Integer’
+    Perhaps you want to add ‘Integer’ to the import list
+    in the import of ‘Prelude’ (annfail11.hs:1:8-16).
     In the annotation:
       {-# ANN type Integer "Cannot annotate other modules yet" #-}
diff --git a/testsuite/tests/module/mod114.stderr b/testsuite/tests/module/mod114.stderr
index 673dc95b3a..739ac82452 100644
--- a/testsuite/tests/module/mod114.stderr
+++ b/testsuite/tests/module/mod114.stderr
@@ -1,2 +1,5 @@
 
-mod114.hs:3:16: Not in scope: type constructor or class ‘Stuff’
+mod114.hs:3:16: error:
+    Not in scope: type constructor or class ‘Stuff’
+    Perhaps you want to remove ‘Stuff’ from the explicit hiding list
+    in the import of ‘Mod114_Help’ (mod114.hs:4:1-36).
diff --git a/testsuite/tests/module/mod124.stderr b/testsuite/tests/module/mod124.stderr
index 83113e9c5f..a052a506ad 100644
--- a/testsuite/tests/module/mod124.stderr
+++ b/testsuite/tests/module/mod124.stderr
@@ -1,2 +1,5 @@
 
-mod124.hs:6:6: Not in scope: type constructor or class ‘T’
+mod124.hs:6:6: error:
+    Not in scope: type constructor or class ‘T’
+    Perhaps you want to remove ‘T’ from the explicit hiding list
+    in the import of ‘Mod124_A’ (mod124.hs:4:1-26).
diff --git a/testsuite/tests/module/mod125.stderr b/testsuite/tests/module/mod125.stderr
index 18482dd81a..e2b29849c4 100644
--- a/testsuite/tests/module/mod125.stderr
+++ b/testsuite/tests/module/mod125.stderr
@@ -1,2 +1,5 @@
-
-mod125.hs:7:5: error: Data constructor not in scope: T
+
+mod125.hs:7:5: error:
+    Data constructor not in scope: T
+    Perhaps you want to remove ‘T’ from the explicit hiding list
+    in the import of ‘Mod125_A’ (mod125.hs:4:1-26).
diff --git a/testsuite/tests/module/mod126.stderr b/testsuite/tests/module/mod126.stderr
index dd417b5eb5..385ce4b341 100644
--- a/testsuite/tests/module/mod126.stderr
+++ b/testsuite/tests/module/mod126.stderr
@@ -1,2 +1,5 @@
-
-mod126.hs:7:5: error: Data constructor not in scope: T
+
+mod126.hs:7:5: error:
+    Data constructor not in scope: T
+    Perhaps you want to remove ‘T’ from the explicit hiding list
+    in the import of ‘Mod126_A’ (mod126.hs:4:1-26).
diff --git a/testsuite/tests/module/mod127.stderr b/testsuite/tests/module/mod127.stderr
index 83909e8236..861d492d1a 100644
--- a/testsuite/tests/module/mod127.stderr
+++ b/testsuite/tests/module/mod127.stderr
@@ -1,2 +1,5 @@
 
-mod127.hs:6:6: Not in scope: type constructor or class ‘T’
+mod127.hs:6:6: error:
+    Not in scope: type constructor or class ‘T’
+    Perhaps you want to remove ‘T’ from the explicit hiding list
+    in the import of ‘Mod127_A’ (mod127.hs:4:1-26).
diff --git a/testsuite/tests/module/mod130.stderr b/testsuite/tests/module/mod130.stderr
index 33690756f1..26528b148a 100644
--- a/testsuite/tests/module/mod130.stderr
+++ b/testsuite/tests/module/mod130.stderr
@@ -1,3 +1,5 @@
-
-mod130.hs:7:5: error:
-    Variable not in scope: (<) :: Integer -> Int -> Int
+
+mod130.hs:7:5: error:
+    Variable not in scope: (<) :: Integer -> Int -> Int
+    Perhaps you want to remove ‘<’ from the explicit hiding list
+    in the import of ‘Prelude’ (mod130.hs:4:1-33).
diff --git a/testsuite/tests/module/mod29.stderr b/testsuite/tests/module/mod29.stderr
index 7e25c7f095..e70c5df83d 100644
--- a/testsuite/tests/module/mod29.stderr
+++ b/testsuite/tests/module/mod29.stderr
@@ -1,2 +1,5 @@
 
-mod29.hs:6:12: Not in scope: type constructor or class ‘Char’
+mod29.hs:6:12: error:
+    Not in scope: type constructor or class ‘Char’
+    Perhaps you want to add ‘Char’ to the import list in the import of
+    ‘Prelude’ (mod29.hs:5:1-19).
diff --git a/testsuite/tests/module/mod36.stderr b/testsuite/tests/module/mod36.stderr
index ded22d6eb4..f70285acea 100644
--- a/testsuite/tests/module/mod36.stderr
+++ b/testsuite/tests/module/mod36.stderr
@@ -1,2 +1,5 @@
-
-mod36.hs:5:5: error: Variable not in scope: const
+
+mod36.hs:5:5: error:
+    Variable not in scope: const
+    Perhaps you want to remove ‘const’ from the explicit hiding list
+    in the import of ‘Prelude’ (mod36.hs:3:1-32).
diff --git a/testsuite/tests/module/mod87.stderr b/testsuite/tests/module/mod87.stderr
index dc6c5151ec..60adc95676 100644
--- a/testsuite/tests/module/mod87.stderr
+++ b/testsuite/tests/module/mod87.stderr
@@ -1,3 +1,5 @@
-
-mod87.hs:4:5: error:
-    Data constructor not in scope: Left :: Char -> t
+
+mod87.hs:4:5: error:
+    Data constructor not in scope: Left :: Char -> t
+    Perhaps you want to add ‘Left’ to the import list in the import of
+    ‘Prelude’ (mod87.hs:3:1-22).
diff --git a/testsuite/tests/module/mod97.stderr b/testsuite/tests/module/mod97.stderr
index 261df0eff2..83a4527427 100644
--- a/testsuite/tests/module/mod97.stderr
+++ b/testsuite/tests/module/mod97.stderr
@@ -1,3 +1,5 @@
-
-mod97.hs:4:9: error:
-    Variable not in scope: (==) :: Char -> Char -> t
+
+mod97.hs:4:9: error:
+    Variable not in scope: (==) :: Char -> Char -> t
+    Perhaps you want to add ‘==’ to the import list in the import of
+    ‘Prelude’ (mod97.hs:3:1-18).
diff --git a/testsuite/tests/rename/should_fail/T11071a.hs b/testsuite/tests/rename/should_fail/T11071a.hs
new file mode 100644
index 0000000000..788f57e85f
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/T11071a.hs
@@ -0,0 +1,16 @@
+module T11071 where
+
+import Data.List (lines)
+import Data.IntMap ()
+import Data.Ord hiding (Down)
+import Prelude hiding (True)
+
+ignore :: a -> IO ()
+ignore = const (return ())
+
+main = do
+    ignore intersperse       -- missing in import list (one import)
+    ignore foldl'            -- missing in import list (two imports)
+    ignore Down              -- explicitly hidden
+    ignore True              -- explicitly hidden from prelude (not really special)
+    ignore foobar            -- genuinely out of scope
diff --git a/testsuite/tests/rename/should_fail/T11071a.stderr b/testsuite/tests/rename/should_fail/T11071a.stderr
new file mode 100644
index 0000000000..9db69ae578
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/T11071a.stderr
@@ -0,0 +1,26 @@
+
+T11071a.hs:12:12: error:
+    Variable not in scope: intersperse
+    Perhaps you want to add ‘intersperse’ to the import list
+    in the import of ‘Data.List’ (T11071a.hs:3:1-24).
+
+T11071a.hs:13:12: error:
+    Variable not in scope: foldl'
+    Perhaps you meant one of these:
+      ‘foldl’ (imported from Prelude), ‘foldl1’ (imported from Prelude),
+      ‘foldr’ (imported from Prelude)
+    Perhaps you want to add ‘foldl'’ to one of these import lists:
+      ‘Data.IntMap’ (T11071a.hs:4:1-21)
+      ‘Data.List’ (T11071a.hs:3:1-24)
+
+T11071a.hs:14:12: error:
+    Data constructor not in scope: Down
+    Perhaps you want to remove ‘Down’ from the explicit hiding list
+    in the import of ‘Data.Ord’ (T11071a.hs:5:1-29).
+
+T11071a.hs:15:12: error:
+    Data constructor not in scope: True
+    Perhaps you want to remove ‘True’ from the explicit hiding list
+    in the import of ‘Prelude’ (T11071a.hs:6:1-28).
+
+T11071a.hs:16:12: error: Variable not in scope: foobar
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 66dfeaa916..82d341b6ae 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -139,3 +139,4 @@ test('T10668', normal, compile_fail, [''])
 test('T5001b', normal, compile_fail, [''])
 test('T10781', normal, compile_fail, [''])
 test('T11071', normal, compile_fail, [''])
+test('T11071a', normal, compile_fail, [''])