several improvement to get better tooltips

39 files changed, 152 insertions, 199 deletions

diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 4821e343..e07bfe63 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,26 +1,21 @@
 main is not found
 tooltips:
 testdata/language-features/basic-list/list01.lc 1:10-1:12  {a} -> 'List a
-testdata/language-features/basic-list/list01.lc 2:11-2:12  V0
-testdata/language-features/basic-list/list01.lc 2:13-2:18  'List V1
-testdata/language-features/basic-list/list01.lc 2:13-2:14  V0
-testdata/language-features/basic-list/list01.lc 2:15-2:18  'List V2
-testdata/language-features/basic-list/list01.lc 2:15-2:16  V0
-testdata/language-features/basic-list/list01.lc 2:17-2:18  'List V3
-testdata/language-features/basic-list/list01.lc 2:17-2:18  V0
 testdata/language-features/basic-list/list01.lc 2:1-2:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list01.lc 3:11-3:14  V0
+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: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:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:15-3:18  V0
 testdata/language-features/basic-list/list01.lc 3:15-3:18  'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:19-3:22  V0
+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:23-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:23-3:26  V0
+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:27-3:30  'List 'Char
-testdata/language-features/basic-list/list01.lc 3:27-3:30  V0
-testdata/language-features/basic-list/list01.lc 3:27-3:30  'Char
-testdata/language-features/basic-list/list01.lc 3:1-3:7  'List '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 ac945c2d..b876a2fa 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,26 +1,21 @@
 main is not found
 tooltips:
 testdata/language-features/basic-list/list02.lc 1:10-2:4  {a} -> 'List a
-testdata/language-features/basic-list/list02.lc 4:11-4:12  V0
-testdata/language-features/basic-list/list02.lc 4:13-5:6  'List V1
-testdata/language-features/basic-list/list02.lc 4:13-4:14  V0
-testdata/language-features/basic-list/list02.lc 5:3-5:6  'List V2
-testdata/language-features/basic-list/list02.lc 5:3-5:4  V0
-testdata/language-features/basic-list/list02.lc 5:5-5:6  'List V3
-testdata/language-features/basic-list/list02.lc 5:5-5:6  V0
 testdata/language-features/basic-list/list02.lc 4:1-4:7  {a} -> {b : 'Num a} -> 'List a
-testdata/language-features/basic-list/list02.lc 8:5-8:8  V0
+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 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-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 9:5-9:8  V0
 testdata/language-features/basic-list/list02.lc 9:5-9:8  'Char
-testdata/language-features/basic-list/list02.lc 10:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 10:5-10:8  V0
+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 11:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 11:5-11:8  V0
+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 12:5-12:8  'List 'Char
-testdata/language-features/basic-list/list02.lc 12:5-12:8  V0
-testdata/language-features/basic-list/list02.lc 12:5-12:8  'Char
-testdata/language-features/basic-list/list02.lc 7:1-7:7  'List '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 336acfed..bb3619ec 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,6 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/basic-list/list08.lc 1:10-1:11  V0
-testdata/language-features/basic-list/list08.lc 1:12-1:15  'List V1
-testdata/language-features/basic-list/list08.lc 1:12-1:15  V0
-testdata/language-features/basic-list/list08.lc 1:12-1:15  '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
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 3805ce5e..938ac595 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -1,9 +1,7 @@
 main is not found
 tooltips:
+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:20-1:27  Type
 testdata/language-features/basic-list/list09.lc 1:21-1:26  Type
-testdata/language-features/basic-list/list09.lc 1:9-1:16  'List 'Float
-testdata/language-features/basic-list/list09.lc 1:10-1:11  V0
-testdata/language-features/basic-list/list09.lc 1:12-1:15  'List 'Float
-testdata/language-features/basic-list/list09.lc 1:12-1:15  V0
-testdata/language-features/basic-list/list09.lc 1:12-1:15  'Float
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index 0f6c53b9..34a84855 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -1,6 +1,7 @@
 main is not found
 tooltips:
+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:9-1:10  V0
-testdata/language-features/basic-list/list11.lc 1:11-1:13  'List V1
 testdata/language-features/basic-list/list11.lc 1:11-1:13  {a} -> 'List a
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 7e32718d..ee722643 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/bool01.lc 1:10-1:14  'Bool
-testdata/language-features/basic-values/bool01.lc 2:10-2:15  'Bool
 testdata/language-features/basic-values/bool01.lc 2:1-2:7  'Bool
+testdata/language-features/basic-values/bool01.lc 2:10-2:15  'Bool
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 4f17a85a..e36beee3 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,25 +1,25 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case01.lc 1:27-1:29  V0
-testdata/language-features/basic-values/case01.lc 1:27-1:29  'Tuple0
+testdata/language-features/basic-values/case01.lc 1:10-1:29  'Tuple0
 testdata/language-features/basic-values/case01.lc 1:15-1:17  'Tuple0
-testdata/language-features/basic-values/case01.lc 4:9-4:11  V0
-testdata/language-features/basic-values/case01.lc 4:9-4:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 3:15-3:17  'Tuple0
+testdata/language-features/basic-values/case01.lc 1:27-1:29  'Tuple0
 testdata/language-features/basic-values/case01.lc 3:1-3:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 8:11-8:13  V0
-testdata/language-features/basic-values/case01.lc 8:11-8:13  'Tuple0
-testdata/language-features/basic-values/case01.lc 7:8-7:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 3:10-4:11  'Tuple0
+testdata/language-features/basic-values/case01.lc 3:15-3:17  'Tuple0
+testdata/language-features/basic-values/case01.lc 4:9-4:11  'Tuple0
 testdata/language-features/basic-values/case01.lc 6:1-6:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 13:7-13:9  V0
-testdata/language-features/basic-values/case01.lc 13:7-13:9  'Tuple0
-testdata/language-features/basic-values/case01.lc 11:8-11:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 7:3-8:13  'Tuple0
+testdata/language-features/basic-values/case01.lc 7:8-7:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 8:11-8:13  'Tuple0
 testdata/language-features/basic-values/case01.lc 10:1-10:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 19:9-19:11  V0
-testdata/language-features/basic-values/case01.lc 19:9-19:11  'Tuple0
-testdata/language-features/basic-values/case01.lc 16:8-16:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 11:3-13:9  'Tuple0
+testdata/language-features/basic-values/case01.lc 11:8-11:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 13:7-13:9  'Tuple0
 testdata/language-features/basic-values/case01.lc 15:1-15:7  'Tuple0
-testdata/language-features/basic-values/case01.lc 23:10-23:12  'Tuple0
-testdata/language-features/basic-values/case01.lc 22:8-22:10  V0
-testdata/language-features/basic-values/case01.lc 22:8-22:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 16:3-19:11  'Tuple0
+testdata/language-features/basic-values/case01.lc 16:8-16:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 19:9-19:11  'Tuple0
 testdata/language-features/basic-values/case01.lc 21:1-21:7  'Tuple0
+testdata/language-features/basic-values/case01.lc 22:3-23:12  'Tuple0
+testdata/language-features/basic-values/case01.lc 22:8-22:10  'Tuple0
+testdata/language-features/basic-values/case01.lc 23:10-23:12  'Tuple0
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index 01244408..22362415 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,14 +1,15 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case02.lc 3:8-3:10  V0
-testdata/language-features/basic-values/case02.lc 3:8-3:10  'Tuple0
+testdata/language-features/basic-values/case02.lc 1:10-3:10  'Tuple0
+testdata/language-features/basic-values/case02.lc 1:15-1:16  V1
 testdata/language-features/basic-values/case02.lc 2:8-2:10  'Tuple0
-testdata/language-features/basic-values/case02.lc 1:15-1:16  'Int
-testdata/language-features/basic-values/case02.lc 7:8-8:11  V0
-testdata/language-features/basic-values/case02.lc 8:8-8:11  V0
-testdata/language-features/basic-values/case02.lc 8:8-8:11  'String
-testdata/language-features/basic-values/case02.lc 7:8-7:11  'String
-testdata/language-features/basic-values/case02.lc 6:8-6:11  'String
-testdata/language-features/basic-values/case02.lc 7:8-8:11  'String
-testdata/language-features/basic-values/case02.lc 5:15-5:16  'Int
+testdata/language-features/basic-values/case02.lc 2:8-3:10  'Tuple0 -> 'Ordering->'Tuple0
+testdata/language-features/basic-values/case02.lc 3:8-3:10  'Tuple0
 testdata/language-features/basic-values/case02.lc 5:1-5:7  'String
+testdata/language-features/basic-values/case02.lc 5:10-8:11  'String
+testdata/language-features/basic-values/case02.lc 5:15-5:16  V1
+testdata/language-features/basic-values/case02.lc 6:8-6:11  'String
+testdata/language-features/basic-values/case02.lc 6:8-8:11  'String -> 'Ordering->'String
+testdata/language-features/basic-values/case02.lc 7:8-7:11  'String
+testdata/language-features/basic-values/case02.lc 7:8-8:11  'String | 'String -> 'Ordering->'String
+testdata/language-features/basic-values/case02.lc 8:8-8:11  'String
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index ec82a845..965a086f 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,6 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case05.lc 2:8-2:11  V0
-testdata/language-features/basic-values/case05.lc 2:8-2:11  'Char
-testdata/language-features/basic-values/case05.lc 1:16-1:17  'Int
+testdata/language-features/basic-values/case05.lc 1:11-2:11  'Char
 testdata/language-features/basic-values/case05.lc 1:16-1:17  V1
+testdata/language-features/basic-values/case05.lc 2:8-2:11  'Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 960169e6..5ddc8bed 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,7 +1,7 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/case06.lc 3:8-3:11  V0
-testdata/language-features/basic-values/case06.lc 3:8-3:11  'Char
-testdata/language-features/basic-values/case06.lc 2:8-2:11  'Char
-testdata/language-features/basic-values/case06.lc 1:16-1:17  'Int
+testdata/language-features/basic-values/case06.lc 1:11-3:11  'Char
 testdata/language-features/basic-values/case06.lc 1:16-1:17  V1
+testdata/language-features/basic-values/case06.lc 2:8-2:11  'Char
+testdata/language-features/basic-values/case06.lc 2:8-3:11  'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/case06.lc 3:8-3:11  'Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index d40b4d12..2687d8b0 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,31 +1,19 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
+testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
 testdata/language-features/basic-values/data01.lc 1:8-1:9  'A
 testdata/language-features/basic-values/data01.lc 1:10-1:11  'A
 testdata/language-features/basic-values/data01.lc 1:12-1:13  'A
-testdata/language-features/basic-values/data01.lc 1:6-1:13  Type->Type
-testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
-testdata/language-features/basic-values/data01.lc 1:6-1:7  Type->Type
 testdata/language-features/basic-values/data01.lc 3:6-3:7  Type
+testdata/language-features/basic-values/data01.lc 3:6-3:22  Type
 testdata/language-features/basic-values/data01.lc 3:10-3:11  'E
+testdata/language-features/basic-values/data01.lc 3:14-3:15  'E | 'Tuple0->'E | Type
 testdata/language-features/basic-values/data01.lc 3:16-3:18  Type
-testdata/language-features/basic-values/data01.lc 3:6-3:7  Type->Type
-testdata/language-features/basic-values/data01.lc 3:14-3:15  'Tuple0->'E
 testdata/language-features/basic-values/data01.lc 3:21-3:22  'E
-testdata/language-features/basic-values/data01.lc 3:6-3:22  Type->Type
-testdata/language-features/basic-values/data01.lc 3:6-3:22  Type
-testdata/language-features/basic-values/data01.lc 3:14-3:15  Type->Type
-testdata/language-features/basic-values/data01.lc 3:14-3:15  Type
-testdata/language-features/basic-values/data01.lc 3:14-3:15  'E
 testdata/language-features/basic-values/data01.lc 5:6-5:8  Type
+testdata/language-features/basic-values/data01.lc 5:6-6:13  Type
 testdata/language-features/basic-values/data01.lc 5:9-5:11  'D1
+testdata/language-features/basic-values/data01.lc 6:5-6:7  'D1 | 'Tuple0->'D1 | Type
 testdata/language-features/basic-values/data01.lc 6:7-6:9  Type
-testdata/language-features/basic-values/data01.lc 5:6-5:8  Type->Type
-testdata/language-features/basic-values/data01.lc 6:5-6:7  'Tuple0->'D1
 testdata/language-features/basic-values/data01.lc 6:11-6:13  'D1
-testdata/language-features/basic-values/data01.lc 5:6-6:13  Type->Type
-testdata/language-features/basic-values/data01.lc 5:6-6:13  Type
-testdata/language-features/basic-values/data01.lc 6:5-6:7  Type->Type
-testdata/language-features/basic-values/data01.lc 6:5-6:7  Type
-testdata/language-features/basic-values/data01.lc 6:5-6:7  'D1
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 11eb7345..1244e37f 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -2,5 +2,5 @@ main is not found
 tooltips:
 testdata/language-features/basic-values/def01.lc 1:8-1:10  'Tuple0
 testdata/language-features/basic-values/def01.lc 3:1-3:5  {a} -> {b} -> {c : 'Num b} -> a->b
-testdata/language-features/basic-values/def01.lc 5:18-5:21  'Char
 testdata/language-features/basic-values/def01.lc 5:1-5:5  {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->'Char
+testdata/language-features/basic-values/def01.lc 5:18-5:21  'Char
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index e0762a2e..ef73403c 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def03.lc 2:9-2:12  V0
-testdata/language-features/basic-values/def03.lc 2:9-2:12  'Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  'Char
+testdata/language-features/basic-values/def03.lc 1:9-2:12  'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/def03.lc 2:9-2:12  'Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index dfa8ca20..601918f0 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,15 +1,13 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/def04.lc 2:9-3:12  V0
-testdata/language-features/basic-values/def04.lc 3:9-3:12  V0
-testdata/language-features/basic-values/def04.lc 3:9-3:12  'Char
-testdata/language-features/basic-values/def04.lc 2:9-2:12  'Char
 testdata/language-features/basic-values/def04.lc 1:9-1:12  'Char
-testdata/language-features/basic-values/def04.lc 2:9-3:12  'Char
-testdata/language-features/basic-values/def04.lc 6:12-7:15  V0
-testdata/language-features/basic-values/def04.lc 7:12-7:15  V0
-testdata/language-features/basic-values/def04.lc 7:12-7:15  'Char
-testdata/language-features/basic-values/def04.lc 6:12-6:15  'Char
-testdata/language-features/basic-values/def04.lc 5:12-5:15  'Char
-testdata/language-features/basic-values/def04.lc 6:12-7:15  'Char
+testdata/language-features/basic-values/def04.lc 1:9-3:12  'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/def04.lc 2:9-2:12  'Char
+testdata/language-features/basic-values/def04.lc 2:9-3:12  'Char | 'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/def04.lc 3:9-3:12  'Char
 testdata/language-features/basic-values/def04.lc 5:1-5:5  {a} -> 'Int -> a->'Char
+testdata/language-features/basic-values/def04.lc 5:12-5:15  'Char
+testdata/language-features/basic-values/def04.lc 5:12-7:15  'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/def04.lc 6:12-6:15  'Char
+testdata/language-features/basic-values/def04.lc 6:12-7:15  'Char | 'Char -> 'Ordering->'Char
+testdata/language-features/basic-values/def04.lc 7:12-7:15  'Char
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index f48f05e7..dcdda519 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/deforder01.lc 1:5-1:8  'Char
-testdata/language-features/basic-values/deforder01.lc 2:5-2:6  'Char
 testdata/language-features/basic-values/deforder01.lc 2:1-2:2  'Char
+testdata/language-features/basic-values/deforder01.lc 2:5-2:6  'Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 8883f385..a0146bd6 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
+testdata/language-features/basic-values/deforder06.lc 1:9-1:12  'Char
 testdata/language-features/basic-values/deforder06.lc 1:23-1:25  'Tuple0
 testdata/language-features/basic-values/deforder06.lc 2:23-2:24  'Tuple0
-testdata/language-features/basic-values/deforder06.lc 1:9-1:12  'Char
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 08a158e4..7068b86b 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,11 +1,13 @@
 main is not found
 tooltips:
+testdata/language-features/basic-values/if01.lc 1:10-1:33  'Tuple0
 testdata/language-features/basic-values/if01.lc 1:13-1:17  'Bool
-testdata/language-features/basic-values/if01.lc 1:23-1:25  V0
+testdata/language-features/basic-values/if01.lc 1:13-1:25  'Tuple0->'Tuple0
 testdata/language-features/basic-values/if01.lc 1:23-1:25  'Tuple0
 testdata/language-features/basic-values/if01.lc 1:31-1:33  'Tuple0
+testdata/language-features/basic-values/if01.lc 2:1-2:7  'Float
+testdata/language-features/basic-values/if01.lc 2:10-2:36  'Float
 testdata/language-features/basic-values/if01.lc 2:13-2:18  'Bool
-testdata/language-features/basic-values/if01.lc 2:24-2:27  V0
+testdata/language-features/basic-values/if01.lc 2:13-2:27  'Float->'Float
 testdata/language-features/basic-values/if01.lc 2:24-2:27  'Float
 testdata/language-features/basic-values/if01.lc 2:33-2:36  'Float
-testdata/language-features/basic-values/if01.lc 2:1-2:7  'Float
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index ecaf32a5..97664599 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/indentation01.lc 1:10-1:12  'Tuple0
-testdata/language-features/basic-values/indentation01.lc 2:10-2:12  'Tuple0
 testdata/language-features/basic-values/indentation01.lc 2:1-2:7  'Tuple0
+testdata/language-features/basic-values/indentation01.lc 2:10-2:12  'Tuple0
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index 8d971325..afac20be 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/indentation02.lc 1:12-1:14  'Tuple0
 testdata/language-features/basic-values/indentation02.lc 1:3-1:9  'Tuple0
-testdata/language-features/basic-values/indentation02.lc 2:12-2:14  'Tuple0
+testdata/language-features/basic-values/indentation02.lc 1:12-1:14  'Tuple0
 testdata/language-features/basic-values/indentation02.lc 2:3-2:9  'Tuple0
+testdata/language-features/basic-values/indentation02.lc 2:12-2:14  'Tuple0
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index 2a987eca..c6f8ce8c 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,9 +1,9 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/lambda01.lc 1:14-1:16  'Tuple0
-testdata/language-features/basic-values/lambda01.lc 2:15-2:17  'Tuple0
 testdata/language-features/basic-values/lambda01.lc 2:1-2:5  {a} -> a->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 3:13-3:15  'Tuple0
+testdata/language-features/basic-values/lambda01.lc 2:15-2:17  'Tuple0
 testdata/language-features/basic-values/lambda01.lc 3:1-3:5  {a} -> a->'Tuple0
-testdata/language-features/basic-values/lambda01.lc 5:28-5:30  'Tuple0
+testdata/language-features/basic-values/lambda01.lc 3:13-3:15  'Tuple0
 testdata/language-features/basic-values/lambda01.lc 4:1-4:5  {a} -> {b} -> {c} -> {d} -> {e} -> {f} -> {g} -> {h} -> {i} -> a -> b -> c -> d -> e -> f -> g -> h -> i->'Tuple0
+testdata/language-features/basic-values/lambda01.lc 5:28-5:30  'Tuple0
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 8ebe69ef..35392d78 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/lambda03.lc 1:22-1:23  V3
-testdata/language-features/basic-values/lambda03.lc 2:25-2:26  V7
 testdata/language-features/basic-values/lambda03.lc 2:1-2:5  {a} -> {b} -> {c} -> {d} -> a -> b -> c -> d->a
+testdata/language-features/basic-values/lambda03.lc 2:25-2:26  V7
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 75c68ac3..bb67c6ca 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,7 +1,7 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/let01.lc 9:11-9:14  'Char
 testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {b : 'Num a}->a
+testdata/language-features/basic-values/let01.lc 9:11-9:14  'Char
 testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {b : 'Num a}->a
 testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {b : 'Num a}->a
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index f143d3fa..9c2179df 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -2,15 +2,15 @@ main is not found
 tooltips:
 testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {b : 'Num a}->a
 testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {b : 'Num a}->a
-testdata/language-features/basic-values/literal01.lc 5:15-5:18  'Float
 testdata/language-features/basic-values/literal01.lc 5:1-5:12  'Float
-testdata/language-features/basic-values/literal01.lc 6:15-6:22  'Float
+testdata/language-features/basic-values/literal01.lc 5:15-5:18  'Float
 testdata/language-features/basic-values/literal01.lc 6:1-6:12  'Float
-testdata/language-features/basic-values/literal01.lc 8:13-8:16  'Char
+testdata/language-features/basic-values/literal01.lc 6:15-6:22  'Float
 testdata/language-features/basic-values/literal01.lc 8:1-8:10  'Char
-testdata/language-features/basic-values/literal01.lc 10:16-10:29  'String
+testdata/language-features/basic-values/literal01.lc 8:13-8:16  'Char
 testdata/language-features/basic-values/literal01.lc 10:1-10:13  'String
-testdata/language-features/basic-values/literal01.lc 11:16-11:45  'String
+testdata/language-features/basic-values/literal01.lc 10:16-10:29  'String
 testdata/language-features/basic-values/literal01.lc 11:1-11:13  'String
-testdata/language-features/basic-values/literal01.lc 13:12-13:17  'Int
+testdata/language-features/basic-values/literal01.lc 11:16-11:45  'String
 testdata/language-features/basic-values/literal01.lc 13:1-13:9  'Int
+testdata/language-features/basic-values/literal01.lc 13:12-13:17  'Int
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index a9ea432e..42644849 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,10 +1,10 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/operator01.lc 1:11-1:13  'Tuple0
 testdata/language-features/basic-values/operator01.lc 1:3-1:6  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 3:8-3:10  'Tuple0
+testdata/language-features/basic-values/operator01.lc 1:11-1:13  'Tuple0
 testdata/language-features/basic-values/operator01.lc 3:3-3:6  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 6:3-6:5  'Tuple0
+testdata/language-features/basic-values/operator01.lc 3:8-3:10  'Tuple0
 testdata/language-features/basic-values/operator01.lc 5:3-5:7  {a} -> {b} -> a -> b->'Tuple0
-testdata/language-features/basic-values/operator01.lc 8:11-8:13  'Tuple0
+testdata/language-features/basic-values/operator01.lc 6:3-6:5  'Tuple0
 testdata/language-features/basic-values/operator01.lc 8:3-8:6  {a} -> {b} -> a -> b->'Tuple0
+testdata/language-features/basic-values/operator01.lc 8:11-8:13  'Tuple0
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 1f0e36dd..f477b66d 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,7 +1,8 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/shadowing02.lc 2:9-2:16  'String
 testdata/language-features/basic-values/shadowing02.lc 2:1-2:6  'String
+testdata/language-features/basic-values/shadowing02.lc 2:9-2:16  'String
+testdata/language-features/basic-values/shadowing02.lc 3:1-3:7  'Char
 testdata/language-features/basic-values/shadowing02.lc 4:11-4:14  'Char
 testdata/language-features/basic-values/shadowing02.lc 5:11-5:18  'String
 testdata/language-features/basic-values/shadowing02.lc 9:17-9:21  'Float
@@ -12,4 +13,3 @@ testdata/language-features/basic-values/shadowing02.lc 13:25-13:26  {a} -> {b :
 testdata/language-features/basic-values/shadowing02.lc 14:20-14:25  'String
 testdata/language-features/basic-values/shadowing02.lc 15:14-15:16  'Tuple0
 testdata/language-features/basic-values/shadowing02.lc 16:6-16:9  'Char
-testdata/language-features/basic-values/shadowing02.lc 3:1-3:7  'Char
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 4e32ee63..c2505cbe 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,24 +1,21 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/tuple02.lc 1:11-1:12  V4
-testdata/language-features/basic-values/tuple02.lc 1:13-1:16  V4
+testdata/language-features/basic-values/tuple02.lc 1:10-1:33  'Tuple5 V1 'Float 'Char 'String 'Tuple0
+testdata/language-features/basic-values/tuple02.lc 1:11-1:12  V1
+testdata/language-features/basic-values/tuple02.lc 1:11-1:16  V3 -> V3 -> V3 -> 'Tuple5 V7 'Float V6 V5 V4
+testdata/language-features/basic-values/tuple02.lc 1:11-1:20  V2 -> V2 -> 'Tuple5 V5 'Float 'Char V4 V3
+testdata/language-features/basic-values/tuple02.lc 1:11-1:29  V1 -> 'Tuple5 V3 'Float 'Char 'String V2
 testdata/language-features/basic-values/tuple02.lc 1:13-1:16  'Float
-testdata/language-features/basic-values/tuple02.lc 1:17-1:20  V3
 testdata/language-features/basic-values/tuple02.lc 1:17-1:20  'Char
-testdata/language-features/basic-values/tuple02.lc 1:21-1:29  V2
 testdata/language-features/basic-values/tuple02.lc 1:21-1:29  'String
-testdata/language-features/basic-values/tuple02.lc 1:30-1:32  V1
 testdata/language-features/basic-values/tuple02.lc 1:30-1:32  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:11-3:13  V1
+testdata/language-features/basic-values/tuple02.lc 3:1-3:7  'Tuple2 'Tuple0 'Tuple0
+testdata/language-features/basic-values/tuple02.lc 3:10-3:17  'Tuple2 'Tuple0 'Tuple0
 testdata/language-features/basic-values/tuple02.lc 3:11-3:13  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:14-3:16  V0
 testdata/language-features/basic-values/tuple02.lc 3:14-3:16  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 3:1-3:7  'Tuple2 'Tuple0 'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:11-5:23  V1
-testdata/language-features/basic-values/tuple02.lc 5:12-5:18  V1
+testdata/language-features/basic-values/tuple02.lc 5:1-5:7  'Tuple2 ('Tuple2 'String 'Char) 'Tuple0
+testdata/language-features/basic-values/tuple02.lc 5:10-5:27  'Tuple2 ('Tuple2 'String 'Char) 'Tuple0
+testdata/language-features/basic-values/tuple02.lc 5:11-5:23  'Tuple2 'String 'Char
 testdata/language-features/basic-values/tuple02.lc 5:12-5:18  'String
-testdata/language-features/basic-values/tuple02.lc 5:19-5:22  V0
 testdata/language-features/basic-values/tuple02.lc 5:19-5:22  'Char
-testdata/language-features/basic-values/tuple02.lc 5:24-5:26  V0
 testdata/language-features/basic-values/tuple02.lc 5:24-5:26  'Tuple0
-testdata/language-features/basic-values/tuple02.lc 5:1-5:7  'Tuple2 ('Tuple2 'String 'Char) 'Tuple0
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index c5caeb34..d3ed98c8 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,8 +1,8 @@
 main is not found
 tooltips:
 testdata/language-features/basic-values/typesig01.lc 1:11-1:15  Type
-testdata/language-features/basic-values/typesig01.lc 2:10-2:13  'Char
 testdata/language-features/basic-values/typesig01.lc 2:1-2:7  'Char
+testdata/language-features/basic-values/typesig01.lc 2:10-2:13  'Char
 testdata/language-features/basic-values/typesig01.lc 4:9-4:13  Type
-testdata/language-features/basic-values/typesig01.lc 5:8-5:11  'Char
 testdata/language-features/basic-values/typesig01.lc 5:1-5:7  'Char
+testdata/language-features/basic-values/typesig01.lc 5:8-5:11  'Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index 5dd7aac0..b387d207 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,7 +1,7 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/typesig02.lc 1:17-1:21  Type
 testdata/language-features/basic-values/typesig02.lc 1:10-1:13  'Char
-testdata/language-features/basic-values/typesig02.lc 3:13-3:17  Type
-testdata/language-features/basic-values/typesig02.lc 3:8-3:11  'Char
+testdata/language-features/basic-values/typesig02.lc 1:17-1:21  Type
 testdata/language-features/basic-values/typesig02.lc 3:1-3:7  'Char
+testdata/language-features/basic-values/typesig02.lc 3:8-3:11  'Char
+testdata/language-features/basic-values/typesig02.lc 3:13-3:17  Type
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 61eab91b..f276a8af 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,40 +1,20 @@
 main is not found
 tooltips:
-testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type->Type
 testdata/language-features/basic-values/typesig03.lc 1:9-1:10  V5
-testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type->Type
-testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
+testdata/language-features/basic-values/typesig03.lc 1:9-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:14-1:15  V4
-testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type->Type
-testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type
+testdata/language-features/basic-values/typesig03.lc 1:14-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:19-1:20  V3
-testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type->Type
+testdata/language-features/basic-values/typesig03.lc 1:19-1:26  Type
 testdata/language-features/basic-values/typesig03.lc 1:24-1:26  Type
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  {a} -> {b} -> V2 -> a -> b->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  {a} -> V2 -> V2 -> a->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  V2 -> V2 -> V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  V2 -> V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 2:14-2:16  'Tuple0
 testdata/language-features/basic-values/typesig03.lc 2:1-2:5  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type->Type
+testdata/language-features/basic-values/typesig03.lc 2:14-2:16  'Tuple0 | V2 -> V2 -> V2->'Tuple0 | V2 -> V2->'Tuple0 | V2->'Tuple0
 testdata/language-features/basic-values/typesig03.lc 4:7-4:8  V5
-testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type->Type
-testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
+testdata/language-features/basic-values/typesig03.lc 4:7-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:10-4:11  V4
-testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type->Type
-testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type
+testdata/language-features/basic-values/typesig03.lc 4:10-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:13-4:14  V3
-testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type->Type
+testdata/language-features/basic-values/typesig03.lc 4:13-4:18  Type
 testdata/language-features/basic-values/typesig03.lc 4:16-4:18  Type
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  {a} -> {b} -> V2 -> a -> b->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  {a} -> V2 -> V2 -> a->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  V2 -> V2 -> V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  V2 -> V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  V2->'Tuple0
-testdata/language-features/basic-values/typesig03.lc 5:14-5:16  'Tuple0
 testdata/language-features/basic-values/typesig03.lc 5:1-5:5  {a} -> {b} -> {c} -> a -> b -> c->'Tuple0
+testdata/language-features/basic-values/typesig03.lc 5:14-5:16  'Tuple0 | V2 -> V2 -> V2->'Tuple0 | V2 -> V2->'Tuple0 | V2->'Tuple0
diff --git a/testdata/language-features/guard/guard01.out b/testdata/language-features/guard/guard01.out
index 154e6e54..4efac740 100644
--- a/testdata/language-features/guard/guard01.out
+++ b/testdata/language-features/guard/guard01.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard01.lc 1:16-1:18  V0
-testdata/language-features/guard/guard01.lc 1:16-1:18  'Tuple0
 testdata/language-features/guard/guard01.lc 1:9-1:13  'Bool
+testdata/language-features/guard/guard01.lc 1:9-1:18  'Tuple0
+testdata/language-features/guard/guard01.lc 1:16-1:18  'Tuple0
diff --git a/testdata/language-features/guard/guard06.out b/testdata/language-features/guard/guard06.out
index 61cdf49c..45fc605b 100644
--- a/testdata/language-features/guard/guard06.out
+++ b/testdata/language-features/guard/guard06.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
-testdata/language-features/guard/guard06.lc 1:21-1:23  V0
-testdata/language-features/guard/guard06.lc 1:21-1:23  'Tuple0
 testdata/language-features/guard/guard06.lc 1:9-1:18  'Bool
+testdata/language-features/guard/guard06.lc 1:9-1:23  'Tuple0
+testdata/language-features/guard/guard06.lc 1:21-1:23  'Tuple0
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index da97e9b5..62f51add 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/Hello01.lc 3:9-3:16  'String
 testdata/language-features/module/Hello01.lc 3:1-3:6  'String
-testdata/language-features/module/Hello01.lc 4:9-4:16  'String
+testdata/language-features/module/Hello01.lc 3:9-3:16  'String
 testdata/language-features/module/Hello01.lc 4:1-4:6  'String
+testdata/language-features/module/Hello01.lc 4:9-4:16  'String
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 8de34af7..07ab1091 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef06.lc 3:9-3:16  'String
 testdata/language-features/module/Moduledef06.lc 3:1-3:6  'String
+testdata/language-features/module/Moduledef06.lc 3:9-3:16  'String
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index b078e94a..9158ff13 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef07.lc 5:9-5:16  'String
 testdata/language-features/module/Moduledef07.lc 5:1-5:6  'String
+testdata/language-features/module/Moduledef07.lc 5:9-5:16  'String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index e798219c..af9cc9fe 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/Moduledef13.lc 3:9-3:16  'String
 testdata/language-features/module/Moduledef13.lc 3:1-3:6  'String
+testdata/language-features/module/Moduledef13.lc 3:9-3:16  'String
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index b4211394..985599af 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -1,4 +1,4 @@
 main is not found
 tooltips:
-testdata/language-features/module/import01.lc 3:5-3:10  'String
 testdata/language-features/module/import01.lc 3:1-3:2  'String
+testdata/language-features/module/import01.lc 3:5-3:10  'String
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index 1e6be704..c713c1a8 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -1,5 +1,5 @@
 main is not found
 tooltips:
 testdata/language-features/module/import05.lc 3:6-3:12  Type
-testdata/language-features/module/import05.lc 4:5-4:10  'String
 testdata/language-features/module/import05.lc 4:1-4:2  'String
+testdata/language-features/module/import05.lc 4:5-4:10  'String
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index 62dbb4d9..395a6e2f 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/import06.lc 3:9-3:11  'Tuple0
 testdata/language-features/module/import06.lc 3:1-3:6  'Tuple0
-testdata/language-features/module/import06.lc 4:5-4:10  'String
+testdata/language-features/module/import06.lc 3:9-3:11  'Tuple0
 testdata/language-features/module/import06.lc 4:1-4:2  'String
+testdata/language-features/module/import06.lc 4:5-4:10  'String
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index cf5326d3..18c88e07 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -1,6 +1,6 @@
 main is not found
 tooltips:
-testdata/language-features/module/import07.lc 3:9-3:11  'Tuple0
 testdata/language-features/module/import07.lc 3:1-3:6  'Tuple0
-testdata/language-features/module/import07.lc 4:5-4:10  'String
+testdata/language-features/module/import07.lc 3:9-3:11  'Tuple0
 testdata/language-features/module/import07.lc 4:1-4:2  'String
+testdata/language-features/module/import07.lc 4:5-4:10  'String