show tooltips in type namespace

14 files changed, 180 insertions, 180 deletions

diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 91b80943..882020d5 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,22 +1,22 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list01.lc 1:1-1:7  {a} -> 'List a
-testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> 'List a
-testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list01.lc 2:10-2:19  'List V2
+testdata/language-features/basic-list/list01.lc 1:1-1:7  {a} -> List a
+testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> List a
+testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : Num a} -> List a
+testdata/language-features/basic-list/list01.lc 2:10-2:19  List V2
 testdata/language-features/basic-list/list01.lc 2:11-2:12  V1
 testdata/language-features/basic-list/list01.lc 2:13-2:14  V1
-testdata/language-features/basic-list/list01.lc 2:13-2:18  'List V3
+testdata/language-features/basic-list/list01.lc 2:13-2:18  List V3
 testdata/language-features/basic-list/list01.lc 2:15-2:16  V1
-testdata/language-features/basic-list/list01.lc 2:15-2:18  'List V4
-testdata/language-features/basic-list/list01.lc 2:17-2:18  'List V4 | V1
-testdata/language-features/basic-list/list01.lc 3:1-3:7  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:10-3:31  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:11-3:14  'Char
-testdata/language-features/basic-list/list01.lc 3:15-3:18  'Char
-testdata/language-features/basic-list/list01.lc 3:15-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:22  'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:23-3:26  'Char
-testdata/language-features/basic-list/list01.lc 3:23-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:27-3:30  'Char | 'List 'Char
+testdata/language-features/basic-list/list01.lc 2:15-2:18  List V4
+testdata/language-features/basic-list/list01.lc 2:17-2:18  List V4 | V1
+testdata/language-features/basic-list/list01.lc 3:1-3:7  List Char
+testdata/language-features/basic-list/list01.lc 3:10-3:31  List Char
+testdata/language-features/basic-list/list01.lc 3:11-3:14  Char
+testdata/language-features/basic-list/list01.lc 3:15-3:18  Char
+testdata/language-features/basic-list/list01.lc 3:15-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:19-3:22  Char
+testdata/language-features/basic-list/list01.lc 3:19-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:23-3:26  Char
+testdata/language-features/basic-list/list01.lc 3:23-3:30  List Char
+testdata/language-features/basic-list/list01.lc 3:27-3:30  Char | List Char
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index d49614fe..fcb82a6f 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,22 +1,22 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list02.lc 1:1-1:7  {a} -> 'List a
-testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> 'List a
-testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list02.lc 4:10-5:7  'List V2
+testdata/language-features/basic-list/list02.lc 1:1-1:7  {a} -> List a
+testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> List a
+testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : Num a} -> List a
+testdata/language-features/basic-list/list02.lc 4:10-5:7  List V2
 testdata/language-features/basic-list/list02.lc 4:11-4:12  V1
 testdata/language-features/basic-list/list02.lc 4:13-4:14  V1
-testdata/language-features/basic-list/list02.lc 4:13-5:6  'List V3
+testdata/language-features/basic-list/list02.lc 4:13-5:6  List V3
 testdata/language-features/basic-list/list02.lc 5:3-5:4  V1
-testdata/language-features/basic-list/list02.lc 5:3-5:6  'List V4
-testdata/language-features/basic-list/list02.lc 5:5-5:6  'List V4 | V1
-testdata/language-features/basic-list/list02.lc 7:1-7:7  'List 'Char
-testdata/language-features/basic-list/list02.lc 8:3-13:4  'List 'Char
-testdata/language-features/basic-list/list02.lc 8:5-8:8  'Char
-testdata/language-features/basic-list/list02.lc 9:5-9:8  'Char
-testdata/language-features/basic-list/list02.lc 9:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 10:5-10:8  'Char
-testdata/language-features/basic-list/list02.lc 10:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 11:5-11:8  'Char
-testdata/language-features/basic-list/list02.lc 11:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 12:5-12:8  'Char | 'List 'Char
+testdata/language-features/basic-list/list02.lc 5:3-5:6  List V4
+testdata/language-features/basic-list/list02.lc 5:5-5:6  List V4 | V1
+testdata/language-features/basic-list/list02.lc 7:1-7:7  List Char
+testdata/language-features/basic-list/list02.lc 8:3-13:4  List Char
+testdata/language-features/basic-list/list02.lc 8:5-8:8  Char
+testdata/language-features/basic-list/list02.lc 9:5-9:8  Char
+testdata/language-features/basic-list/list02.lc 9:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 10:5-10:8  Char
+testdata/language-features/basic-list/list02.lc 10:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 11:5-11:8  Char
+testdata/language-features/basic-list/list02.lc 11:5-12:8  List Char
+testdata/language-features/basic-list/list02.lc 12:5-12:8  Char | List Char
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index c51990a9..b78f93ed 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list08.lc 1:1-1:6  'List 'Float
-testdata/language-features/basic-list/list08.lc 1:9-1:16  'List 'Float
+testdata/language-features/basic-list/list08.lc 1:1-1:6  List Float
+testdata/language-features/basic-list/list08.lc 1:9-1:16  List Float
 testdata/language-features/basic-list/list08.lc 1:10-1:11  V1
-testdata/language-features/basic-list/list08.lc 1:12-1:15  'Float | 'List 'Float
+testdata/language-features/basic-list/list08.lc 1:12-1:15  Float | List Float
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 9ef706b7..ebd7c983 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list09.lc 1:1-1:6  'List 'Float
-testdata/language-features/basic-list/list09.lc 1:9-1:16  'List 'Float
+testdata/language-features/basic-list/list09.lc 1:1-1:6  List Float
+testdata/language-features/basic-list/list09.lc 1:9-1:16  List Float
 testdata/language-features/basic-list/list09.lc 1:10-1:11  V1
-testdata/language-features/basic-list/list09.lc 1:12-1:15  'Float | 'List 'Float
+testdata/language-features/basic-list/list09.lc 1:12-1:15  Float | List Float
 testdata/language-features/basic-list/list09.lc 1:20-1:27  Type
 testdata/language-features/basic-list/list09.lc 1:21-1:26  Type
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 8da3d8cf..a5d9f3fb 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {b : 'Num a} -> 'List a
+testdata/language-features/basic-list/list11.lc 1:1-1:6  {a} -> {b : Num a} -> List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  V1
-testdata/language-features/basic-list/list11.lc 1:9-1:11  'List V1 -> 'List V2
-testdata/language-features/basic-list/list11.lc 1:9-1:13  'List V1
-testdata/language-features/basic-list/list11.lc 1:10-1:11  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> 'List a
+testdata/language-features/basic-list/list11.lc 1:9-1:11  List V1 -> List V2
+testdata/language-features/basic-list/list11.lc 1:9-1:13  List V1
+testdata/language-features/basic-list/list11.lc 1:10-1:11  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> List a
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index a866896d..1aa35643 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -1,24 +1,24 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {b : 'Num a} -> 'List a
+testdata/language-features/basic-list/list12.lc 1:1-1:6  {a} -> {b : Num a} -> List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  V1
-testdata/language-features/basic-list/list12.lc 1:9-1:11  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:9-1:21  'List V2
-testdata/language-features/basic-list/list12.lc 1:10-1:11  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:9-1:11  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:9-1:21  List V2
+testdata/language-features/basic-list/list12.lc 1:10-1:11  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:11-1:12  V1
-testdata/language-features/basic-list/list12.lc 1:11-1:13  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:11-1:21  'List V3
-testdata/language-features/basic-list/list12.lc 1:12-1:13  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:11-1:13  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:11-1:21  List V3
+testdata/language-features/basic-list/list12.lc 1:12-1:13  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:13-1:14  V1
-testdata/language-features/basic-list/list12.lc 1:13-1:15  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:13-1:21  'List V4
-testdata/language-features/basic-list/list12.lc 1:14-1:15  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:13-1:15  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:13-1:21  List V4
+testdata/language-features/basic-list/list12.lc 1:14-1:15  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:15-1:16  V1
-testdata/language-features/basic-list/list12.lc 1:15-1:17  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:15-1:21  'List V5
-testdata/language-features/basic-list/list12.lc 1:16-1:17  {a} -> a -> 'List a -> 'List a
+testdata/language-features/basic-list/list12.lc 1:15-1:17  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:15-1:21  List V5
+testdata/language-features/basic-list/list12.lc 1:16-1:17  {a} -> a -> List a -> List a
 testdata/language-features/basic-list/list12.lc 1:17-1:18  V1
-testdata/language-features/basic-list/list12.lc 1:17-1:19  'List V1 -> 'List V2
-testdata/language-features/basic-list/list12.lc 1:17-1:21  'List V5
-testdata/language-features/basic-list/list12.lc 1:18-1:19  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list12.lc 1:19-1:21  {a} -> 'List a
+testdata/language-features/basic-list/list12.lc 1:17-1:19  List V1 -> List V2
+testdata/language-features/basic-list/list12.lc 1:17-1:21  List V5
+testdata/language-features/basic-list/list12.lc 1:18-1:19  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list12.lc 1:19-1:21  {a} -> List a
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 65c373ee..bc6bcd99 100644
--- a/testdata/language-features/basic-list/list13.out
+++ b/testdata/language-features/basic-list/list13.out
@@ -1,24 +1,24 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list13.lc 1:1-1:6  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:12  'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:13  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:9-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:12-1:13  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:13-1:16  'Char
-testdata/language-features/basic-list/list13.lc 1:13-1:17  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:13-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:16-1:17  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:17-1:20  'Char
-testdata/language-features/basic-list/list13.lc 1:17-1:21  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:17-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:20-1:21  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:21-1:24  'Char
-testdata/language-features/basic-list/list13.lc 1:21-1:25  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:21-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:24-1:25  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:25-1:28  'Char
-testdata/language-features/basic-list/list13.lc 1:25-1:29  'List 'Char -> 'List 'Char
-testdata/language-features/basic-list/list13.lc 1:25-1:31  'List 'Char
-testdata/language-features/basic-list/list13.lc 1:28-1:29  {a} -> a -> 'List a -> 'List a
-testdata/language-features/basic-list/list13.lc 1:29-1:31  {a} -> 'List a
+testdata/language-features/basic-list/list13.lc 1:1-1:6  List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:12  Char
+testdata/language-features/basic-list/list13.lc 1:9-1:13  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:9-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:12-1:13  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:13-1:16  Char
+testdata/language-features/basic-list/list13.lc 1:13-1:17  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:13-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:16-1:17  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:17-1:20  Char
+testdata/language-features/basic-list/list13.lc 1:17-1:21  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:17-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:20-1:21  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:21-1:24  Char
+testdata/language-features/basic-list/list13.lc 1:21-1:25  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:21-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:24-1:25  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:25-1:28  Char
+testdata/language-features/basic-list/list13.lc 1:25-1:29  List Char -> List Char
+testdata/language-features/basic-list/list13.lc 1:25-1:31  List Char
+testdata/language-features/basic-list/list13.lc 1:28-1:29  {a} -> a -> List a -> List a
+testdata/language-features/basic-list/list13.lc 1:29-1:31  {a} -> List a
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 1aa3da93..157fbf88 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -1,12 +1,12 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  'List 'Tuple0 | 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:24-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:29  'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:27-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp01.lc 1:30-1:32  'List 'Tuple0 | 'Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:10-1:12  List Tuple0 | Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp01.lc 1:20-1:33  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:26  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:24-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:29  Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:27-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp01.lc 1:30-1:32  List Tuple0 | Tuple0
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index d4b84f05..45c67f4a 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:6-1:8  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:11  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:9-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:14  'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  'List 'Tuple0
-testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  'List V2 | V1 -> 'List V1 | V3
-testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  'List 'Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:6-1:8  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:11  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:9-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:14  Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:12-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 1:15-1:17  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:1-2:6  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:9-2:21  List Tuple0
+testdata/language-features/basic-list/listcomp02.lc 2:10-2:11  List V2 | V1 -> List V1 | V3
+testdata/language-features/basic-list/listcomp02.lc 2:19-2:20  List Tuple0
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 7f96d5d4..238bfaf9 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -1,14 +1,14 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  'List 'Tuple0 | 'List 'Tuple0 -> 'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:24-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:29  'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:27-1:32  'List 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:30-1:32  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp03.lc 1:35-1:40  'Bool
+testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:12  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:10-1:40  List Tuple0 | List Tuple0 -> List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp03.lc 1:20-1:33  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:26  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:24-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:29  Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:27-1:32  List Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:30-1:32  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp03.lc 1:35-1:40  Bool
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index 1f65be16..08725820 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -1,16 +1,16 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:6-1:8  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:11  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:9-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:14  'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  'List 'Tuple0 | 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  'List 'Tuple0
-testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  'List 'Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:6-1:8  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:11  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:9-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:14  Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:12-1:17  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 1:15-1:17  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:1-2:6  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:9-2:30  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:12  List Tuple0 | Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp04.lc 2:10-2:29  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp04.lc 2:20-2:21  List Tuple0
+testdata/language-features/basic-list/listcomp04.lc 2:28-2:29  List Tuple0
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index fd9751a0..6b48a5e0 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  'List 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  'List 'Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List Tuple0
 testdata/language-features/basic-list/listcomp05.lc 1:10-1:11  V2
-testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  'List 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp05.lc 1:36-1:38  'Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:10-1:38  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp05.lc 1:19-1:26  List Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:20-1:22  Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:23-1:25  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp05.lc 1:36-1:38  Tuple0
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index 4eeb6035..69ad18bc 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -1,20 +1,20 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  'List V2 | V3
-testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  'List 'Tuple0 | 'List V1 -> 'List V2 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:37-1:39  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  'Bool
-testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  'List 'Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:12  List V2 | V3
+testdata/language-features/basic-list/listcomp06.lc 1:11-1:45  List Tuple0 | List V1 -> List V2 | V1 -> List V1
+testdata/language-features/basic-list/listcomp06.lc 1:20-1:27  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:21-1:23  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:24-1:26  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:37-1:39  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 1:41-1:45  Bool
+testdata/language-features/basic-list/listcomp06.lc 3:1-3:7  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:10-3:46  List Tuple0
 testdata/language-features/basic-list/listcomp06.lc 3:11-3:12  V2
-testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  'List 'Tuple0 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  'List 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp06.lc 3:29-3:33  'Bool
-testdata/language-features/basic-list/listcomp06.lc 3:43-3:45  'Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:11-3:45  List Tuple0 | V1 -> List V1
+testdata/language-features/basic-list/listcomp06.lc 3:20-3:27  List Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:21-3:23  Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:24-3:26  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp06.lc 3:29-3:33  Bool
+testdata/language-features/basic-list/listcomp06.lc 3:43-3:45  Tuple0
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 2cdc8d07..47aae1f7 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -1,32 +1,32 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 1:12-1:13  V5
-testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 3:20-3:22  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 4:12-4:16  'Bool
+testdata/language-features/basic-list/listcomp07.lc 1:12-5:21  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 2:17-2:24  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 2:18-2:20  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 2:21-2:23  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 3:20-3:22  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 4:12-4:16  Bool
 testdata/language-features/basic-list/listcomp07.lc 5:20-5:21  V2
-testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:1-8:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:10-12:11  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 8:12-8:13  V5
-testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 9:20-9:22  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 10:12-10:16  'Bool
+testdata/language-features/basic-list/listcomp07.lc 8:12-11:21  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 8:21-8:28  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:22-8:24  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 8:25-8:27  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 9:20-9:22  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 10:12-10:16  Bool
 testdata/language-features/basic-list/listcomp07.lc 11:20-11:21  V2
-testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  'List 'Tuple0
+testdata/language-features/basic-list/listcomp07.lc 14:1-14:7  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 14:10-20:3  List Tuple0
 testdata/language-features/basic-list/listcomp07.lc 14:12-14:13  V5
-testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  'List 'Tuple0 | 'List V1 | V1 -> 'List V1
-testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  'List 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  'List 'Tuple0 | 'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 17:6-17:8  'Tuple0
-testdata/language-features/basic-list/listcomp07.lc 18:7-18:11  'Bool
+testdata/language-features/basic-list/listcomp07.lc 14:12-19:15  List Tuple0 | List V1 | V1 -> List V1
+testdata/language-features/basic-list/listcomp07.lc 15:15-15:22  List Tuple0
+testdata/language-features/basic-list/listcomp07.lc 15:16-15:18  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 15:19-15:21  List Tuple0 | Tuple0
+testdata/language-features/basic-list/listcomp07.lc 17:6-17:8  Tuple0
+testdata/language-features/basic-list/listcomp07.lc 18:7-18:11  Bool
 testdata/language-features/basic-list/listcomp07.lc 19:14-19:15  V2