use module ids in more places; side effect: better error messages

9 files changed, 43 insertions, 14 deletions

diff --git a/testdata/language-features/basic-values/case03.reject.out b/testdata/language-features/basic-values/case03.reject.out
index d9c29820..8277264e 100644
--- a/testdata/language-features/basic-values/case03.reject.out
+++ b/testdata/language-features/basic-values/case03.reject.out
@@ -6,7 +6,10 @@ value1 = case () of
 
 ------------ trace
 !type error: no instance of 'Num on ???
-in testdata/language-features/basic-values/case03.reject.lc:1:10
+in testdata/language-features/basic-values/case03.reject.lc:1:10:
+value1 = case () of
+  1 -> ()
+  _ -> ()
 
 ------------ tooltips
 testdata/language-features/basic-values/case03.reject.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/case04.reject.out b/testdata/language-features/basic-values/case04.reject.out
index 80f6a2cb..426c62f7 100644
--- a/testdata/language-features/basic-values/case04.reject.out
+++ b/testdata/language-features/basic-values/case04.reject.out
@@ -13,7 +13,9 @@ in testdata/language-features/basic-values/case04.reject.lc:2:8:
 with
 'Char
 
-in testdata/language-features/basic-values/case04.reject.lc:2:8
+in testdata/language-features/basic-values/case04.reject.lc:2:8:
+  1 -> '1'
+       ^^^
 
 ------------ tooltips
 testdata/language-features/basic-values/case04.reject.lc 2:8-2:11  Char
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index a8c509d2..20b424fc 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -8,8 +8,12 @@ fun 1 = '1'
 fun :: {a} -> {b : 'Eq a} -> {c : 'Num a} -> {d : 'Eq a} -> {e : 'Num a} -> a->'Char
 fun2 :: {a} -> {b} -> {c : 'Eq a} -> {d : 'Num a} -> a -> b->'Char
 fun :: {a} -> a->'Char
-!already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1
- and at testdata/language-features/basic-values/def07.reject.lc:1:1
+!already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
+fun _ = '_'
+^^^
+ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
+fun 1 = '1'
+^^^
 ------------ tooltips
 testdata/language-features/basic-values/def07.reject.lc 1:1-1:4  {a} -> {b : Eq a} -> {c : Num a} -> {d : Eq a} -> {e : Num a} -> a->Char
 testdata/language-features/basic-values/def07.reject.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index 7b4c5822..aeb988f9 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -13,7 +13,9 @@ value1 = if () then () else ()
 with
 ()
 
-in testdata/language-features/basic-values/if03.reject.lc:1:13
+in testdata/language-features/basic-values/if03.reject.lc:1:13:
+value1 = if () then () else ()
+            ^^
 
 ------------ tooltips
 testdata/language-features/basic-values/if03.reject.lc 1:13-1:15  ()
diff --git a/testdata/language-features/basic-values/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index e8a8d1dc..d882b6a8 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -13,7 +13,9 @@ value1 = if True then () else '_'
 with
 'Char
 
-in testdata/language-features/basic-values/if04.reject.lc:1:31
+in testdata/language-features/basic-values/if04.reject.lc:1:31:
+value1 = if True then () else '_'
+                              ^^^
 
 ------------ tooltips
 testdata/language-features/basic-values/if04.reject.lc 1:13-1:17  Bool
diff --git a/testdata/language-features/basic-values/operator02.reject.out b/testdata/language-features/basic-values/operator02.reject.out
index 8f42573e..31d8ce8c 100644
--- a/testdata/language-features/basic-values/operator02.reject.out
+++ b/testdata/language-features/basic-values/operator02.reject.out
@@ -8,8 +8,12 @@ a #$# b = ()
 #$# :: {a} -> {b} -> a -> b->()
 fun :: {a} -> a->()
 #$# :: {a} -> {b} -> a -> b->()
-!already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3
- and at testdata/language-features/basic-values/operator02.reject.lc:1:3
+!already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
+a #$# b = ()
+  ^^^
+ and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
+a #$# b = ()
+  ^^^
 ------------ tooltips
 testdata/language-features/basic-values/operator02.reject.lc 1:3-1:6  {a} -> {b} -> a -> b->()
 testdata/language-features/basic-values/operator02.reject.lc 1:11-1:13  ()
diff --git a/testdata/language-features/basic-values/redefine01.reject.out b/testdata/language-features/basic-values/redefine01.reject.out
index 8e8e26de..b532c14d 100644
--- a/testdata/language-features/basic-values/redefine01.reject.out
+++ b/testdata/language-features/basic-values/redefine01.reject.out
@@ -8,8 +8,12 @@ unit = ()
 unit :: ()
 tuple :: ()
 unit :: ()
-!already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1
- and at testdata/language-features/basic-values/redefine01.reject.lc:1:1
+!already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1:
+unit = ()
+^^^^
+ and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
+unit = ()
+^^^^
 ------------ tooltips
 testdata/language-features/basic-values/redefine01.reject.lc 1:1-1:5  ()
 testdata/language-features/basic-values/redefine01.reject.lc 1:8-1:10  ()
diff --git a/testdata/language-features/basic-values/typesyn03.reject.out b/testdata/language-features/basic-values/typesyn03.reject.out
index 334be67f..b980b47f 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.out
@@ -7,8 +7,12 @@ type MyUnit = ()
 ------------ trace
 'MyUnit :: Type
 'MyUnit :: Type
-!already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6
- and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6
+!already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6:
+type MyUnit = ()
+     ^^^^^^
+ and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
+type MyUnit = ()
+     ^^^^^^
 ------------ tooltips
 testdata/language-features/basic-values/typesyn03.reject.lc 1:6-1:12  Type
 testdata/language-features/basic-values/typesyn03.reject.lc 2:6-2:12  Type
diff --git a/testdata/language-features/basic-values/typesyn04.reject.out b/testdata/language-features/basic-values/typesyn04.reject.out
index 8dcdc1a5..2fd21298 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.out
@@ -7,8 +7,12 @@ type MyUnit = ()
 ------------ trace
 'MyUnit :: Type
 'MyUnit :: Type
-!already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6
- and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6
+!already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6:
+type MyUnit = ()
+     ^^^^^^
+ and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
+type MyUnit = ()
+     ^^^^^^
 ------------ tooltips
 testdata/language-features/basic-values/typesyn04.reject.lc 1:6-1:12  Type
 testdata/language-features/basic-values/typesyn04.reject.lc 2:6-2:12  Type