bugfix: show missing types in tooltips

27 files changed, 79 insertions, 0 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index c7c58e78..45100590 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1951,6 +1951,7 @@ testdata/Builtins.lc 214:14-214:38  Type
 testdata/Builtins.lc 214:15-214:16  V3
 testdata/Builtins.lc 214:20-214:23  Type
 testdata/Builtins.lc 214:21-214:22  V2
+testdata/Builtins.lc 214:28-214:31  Type
 testdata/Builtins.lc 214:28-214:38  Type
 testdata/Builtins.lc 214:29-214:30  Type
 testdata/Builtins.lc 214:35-214:38  Type
@@ -2041,6 +2042,7 @@ testdata/Builtins.lc 243:46-243:59  Type
 testdata/Builtins.lc 243:56-243:57  Type
 testdata/Builtins.lc 243:58-243:59  PrimitiveType
 testdata/Builtins.lc 250:6-250:21  PrimitiveType -> Type->Type
+testdata/Builtins.lc 250:28-250:43  Type
 testdata/Builtins.lc 250:29-250:38  Type -> PrimitiveType->Type
 testdata/Builtins.lc 250:29-250:40  PrimitiveType->Type
 testdata/Builtins.lc 250:29-250:42  Type
@@ -2111,11 +2113,13 @@ testdata/Builtins.lc 264:14-264:20  Type
 testdata/Builtins.lc 264:14-264:25  Type
 testdata/Builtins.lc 264:24-264:25  Type | V2
 testdata/Builtins.lc 266:1-266:12  {a:PrimitiveType} -> {b : List Type} -> String -> (d : List String) -> {e : 'len String d ~ 'len Type b} -> PrimitiveStream a (HList b)
+testdata/Builtins.lc 266:31-266:37  Type
 testdata/Builtins.lc 266:31-266:123  Type
 testdata/Builtins.lc 266:32-266:36  Type
 testdata/Builtins.lc 266:41-266:47  Type
 testdata/Builtins.lc 266:41-266:123  Type
 testdata/Builtins.lc 266:51-266:123  Type
+testdata/Builtins.lc 266:65-266:73  Type
 testdata/Builtins.lc 266:66-266:72  Type
 testdata/Builtins.lc 266:78-266:81  {a} -> List a -> Int
 testdata/Builtins.lc 266:78-266:84  Int
@@ -2157,6 +2161,7 @@ testdata/Builtins.lc 273:34-273:39  Type
 testdata/Builtins.lc 274:7-274:21  {a} -> SimpleFragment a -> a
 testdata/Builtins.lc 274:28-274:29  Type
 testdata/Builtins.lc 277:6-277:20  Nat -> Type->Type
+testdata/Builtins.lc 277:27-277:41  Type
 testdata/Builtins.lc 277:28-277:36  Nat -> Type->Type
 testdata/Builtins.lc 277:28-277:38  Type->Type
 testdata/Builtins.lc 277:28-277:40  Type
@@ -2526,6 +2531,7 @@ testdata/Builtins.lc 445:6-447:16  Type
 testdata/Builtins.lc 446:7-446:16  PointSpriteCoordOrigin
 testdata/Builtins.lc 447:7-447:16  PointSpriteCoordOrigin
 testdata/Builtins.lc 450:1-450:12  () -> Vec 2 Float -> Vec 4 Float
+testdata/Builtins.lc 450:16-450:18  Type
 testdata/Builtins.lc 450:22-450:25  Nat -> Type->Type
 testdata/Builtins.lc 450:22-450:27  Type->Type
 testdata/Builtins.lc 450:22-450:33  Type
@@ -2611,9 +2617,11 @@ testdata/Builtins.lc 462:60-462:70  Type
 testdata/Builtins.lc 462:69-462:70  Type
 testdata/Builtins.lc 463:3-463:8  (BlendEquation, BlendEquation) -> ((BlendingFactor, BlendingFactor), (BlendingFactor, BlendingFactor)) -> Vec 4 Float -> Blending Float | Blending Float
 testdata/Builtins.lc 463:3-465:74  Type
+testdata/Builtins.lc 463:26-463:56  Type
 testdata/Builtins.lc 463:27-463:40  Type
 testdata/Builtins.lc 463:27-463:55  List Type
 testdata/Builtins.lc 463:42-463:55  List Type | Type
+testdata/Builtins.lc 464:29-464:97  Type
 testdata/Builtins.lc 464:29-465:74  Type
 testdata/Builtins.lc 464:30-464:62  Type
 testdata/Builtins.lc 464:30-464:96  List Type
@@ -2766,6 +2774,7 @@ testdata/Builtins.lc 490:36-490:43  Type->Nat
 testdata/Builtins.lc 490:45-490:50  Type
 testdata/Builtins.lc 490:45-490:59  Nat->Nat | Type->Nat
 testdata/Builtins.lc 490:58-490:59  ImageKind->Nat | Nat | Nat -> ImageKind->Nat
+testdata/Builtins.lc 492:12-492:15  Type
 testdata/Builtins.lc 492:12-492:23  Type
 testdata/Builtins.lc 492:12-495:50  V0->V1 | {a} -> List a -> Type
 testdata/Builtins.lc 492:13-492:14  V1
@@ -2803,6 +2812,7 @@ testdata/Builtins.lc 509:6-509:46  Type
 testdata/Builtins.lc 509:24-509:27  Type
 testdata/Builtins.lc 509:35-509:46  Type
 testdata/Builtins.lc 509:36-509:45  Type
+testdata/Builtins.lc 511:15-511:26  Type
 testdata/Builtins.lc 511:16-511:25  Type
 testdata/Builtins.lc 511:30-511:36  Type
 testdata/Builtins.lc 511:31-511:35  Type
@@ -2828,6 +2838,7 @@ testdata/Builtins.lc 515:102-515:103  ImageKind | ImageKind->ImageKind
 testdata/Builtins.lc 517:1-517:11  {a : List ImageKind} -> {b:Nat} -> {c : List Type} -> {d : a ~ 'map Type ImageKind FragmentOperationKind c} -> HList c -> FragmentStream b (HList ('imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 517:15-517:174  Type
 testdata/Builtins.lc 517:28-517:31  Type
+testdata/Builtins.lc 517:39-517:45  Type
 testdata/Builtins.lc 517:39-517:174  Type
 testdata/Builtins.lc 517:40-517:44  Type
 testdata/Builtins.lc 517:49-517:174  Type
@@ -2885,6 +2896,7 @@ testdata/Builtins.lc 524:61-524:66  Type
 testdata/Builtins.lc 524:61-524:75  ImageKind->ImageKind | Type->ImageKind
 testdata/Builtins.lc 524:74-524:75  ImageKind | ImageKind->ImageKind | Nat -> ImageKind->ImageKind
 testdata/Builtins.lc 530:1-530:12  {a : List Type} -> {b : 'sameLayerCounts a} -> HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
+testdata/Builtins.lc 530:30-530:36  Type
 testdata/Builtins.lc 530:31-530:35  Type
 testdata/Builtins.lc 530:40-530:125  Type
 testdata/Builtins.lc 530:41-530:56  List Type -> Type
diff --git a/testdata/Internals.out b/testdata/Internals.out
index 69645429..0d1624b3 100644
--- a/testdata/Internals.out
+++ b/testdata/Internals.out
@@ -400,6 +400,7 @@ testdata/Internals.lc 122:29-122:35  Type
 testdata/Internals.lc 122:34-122:35  Type
 testdata/Internals.lc 126:6-126:11  List Type -> Type | Type
 testdata/Internals.lc 126:6-128:45  Type
+testdata/Internals.lc 126:15-126:21  Type
 testdata/Internals.lc 126:16-126:20  Type
 testdata/Internals.lc 126:25-126:29  Type
 testdata/Internals.lc 127:5-127:9  ()
diff --git a/testdata/Material.out b/testdata/Material.out
index e91e4884..816ce7ad 100644
--- a/testdata/Material.out
+++ b/testdata/Material.out
@@ -344,6 +344,7 @@ testdata/Material.lc 113:7-113:18  StageTexture | String->StageTexture | Type
 testdata/Material.lc 113:21-113:27  Type
 testdata/Material.lc 114:7-114:17  Float -> List String -> StageTexture | StageTexture | Type
 testdata/Material.lc 114:21-114:26  Type
+testdata/Material.lc 114:27-114:35  Type
 testdata/Material.lc 114:28-114:34  Type
 testdata/Material.lc 115:7-115:18  StageTexture
 testdata/Material.lc 116:7-116:20  StageTexture
@@ -374,6 +375,7 @@ testdata/Material.lc 134:24-134:32  Type
 testdata/Material.lc 135:7-135:14  StageAttrs->TCGen
 testdata/Material.lc 135:24-135:29  Type
 testdata/Material.lc 136:7-136:14  StageAttrs -> List TCMod
+testdata/Material.lc 136:24-136:31  Type
 testdata/Material.lc 136:25-136:30  Type
 testdata/Material.lc 137:7-137:16  StageAttrs->StageTexture
 testdata/Material.lc 137:24-137:36  Type
@@ -419,7 +421,9 @@ testdata/Material.lc 163:6-164:18  Type
 testdata/Material.lc 163:6-178:32  Type
 testdata/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type | V1
 testdata/Material.lc 165:7-165:17  CommonAttrs->()
+testdata/Material.lc 165:28-165:30  Type
 testdata/Material.lc 166:7-166:17  CommonAttrs->()
+testdata/Material.lc 166:28-166:30  Type
 testdata/Material.lc 167:7-167:15  CommonAttrs->Bool
 testdata/Material.lc 167:28-167:32  Type
 testdata/Material.lc 168:7-168:13  CommonAttrs->Float
@@ -431,12 +435,14 @@ testdata/Material.lc 170:28-170:32  Type
 testdata/Material.lc 171:7-171:13  CommonAttrs->CullType
 testdata/Material.lc 171:28-171:36  Type
 testdata/Material.lc 172:7-172:23  CommonAttrs -> List Deform
+testdata/Material.lc 172:28-172:36  Type
 testdata/Material.lc 172:29-172:35  Type
 testdata/Material.lc 173:7-173:18  CommonAttrs->Bool
 testdata/Material.lc 173:28-173:32  Type
 testdata/Material.lc 174:7-174:22  CommonAttrs->Bool
 testdata/Material.lc 174:28-174:32  Type
 testdata/Material.lc 175:7-175:15  CommonAttrs -> List StageAttrs
+testdata/Material.lc 175:28-175:40  Type
 testdata/Material.lc 175:29-175:39  Type
 testdata/Material.lc 178:7-178:14  CommonAttrs->Bool
 testdata/Material.lc 178:28-178:32  Type
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 782c2592..4f04ea11 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -204,9 +204,11 @@ testdata/Prelude.lc 27:26-27:29  ((V0))
 testdata/Prelude.lc 27:28-27:29  V11
 testdata/Prelude.lc 29:1-29:3  Float
 testdata/Prelude.lc 29:6-29:23  Float
+testdata/Prelude.lc 31:8-31:11  Type
 testdata/Prelude.lc 31:8-31:29  Type
 testdata/Prelude.lc 31:8-34:39  V0->V1 | {a} -> {b} -> List a -> List b -> List (a, b)
 testdata/Prelude.lc 31:9-31:10  V3
+testdata/Prelude.lc 31:15-31:18  Type
 testdata/Prelude.lc 31:15-31:29  Type
 testdata/Prelude.lc 31:16-31:17  V2
 testdata/Prelude.lc 31:22-31:29  Type
@@ -230,6 +232,7 @@ testdata/Prelude.lc 34:30-34:36  List V0 -> List (V8, V1)
 testdata/Prelude.lc 34:30-34:39  List (V6, V2)
 testdata/Prelude.lc 34:34-34:36  List V8
 testdata/Prelude.lc 34:37-34:39  List V2
+testdata/Prelude.lc 36:10-36:17  Type
 testdata/Prelude.lc 36:10-36:30  Type
 testdata/Prelude.lc 36:10-39:27  V0->V1 | {a} -> {b} -> List (a, b) -> (List a, List b)
 testdata/Prelude.lc 36:11-36:16  Type
@@ -286,6 +289,7 @@ testdata/Prelude.lc 43:49-43:51  List V5
 testdata/Prelude.lc 44:34-44:40  V12
 testdata/Prelude.lc 44:41-44:45  V13
 testdata/Prelude.lc 44:46-44:48  List V10
+testdata/Prelude.lc 49:9-49:12  Type
 testdata/Prelude.lc 49:9-49:19  Type
 testdata/Prelude.lc 49:10-49:11  V1
 testdata/Prelude.lc 49:16-49:19  Type
@@ -294,6 +298,7 @@ testdata/Prelude.lc 50:1-50:5  {a} -> List a -> List a
 testdata/Prelude.lc 50:8-50:9  List V1
 testdata/Prelude.lc 50:8-50:18  List V0 -> List V1 | List V1
 testdata/Prelude.lc 50:16-50:18  List V2 -> V2 | List V3 | V1 -> List V2 -> V2
+testdata/Prelude.lc 52:10-52:13  Type
 testdata/Prelude.lc 52:10-52:25  Type
 testdata/Prelude.lc 52:11-52:12  V1
 testdata/Prelude.lc 52:17-52:25  Type
@@ -466,6 +471,7 @@ testdata/Prelude.lc 124:29-124:30  String -> Type->V2 | Type | Type->V2
 testdata/Prelude.lc 126:6-126:13  List RecItem -> Type | Type
 testdata/Prelude.lc 126:6-127:17  Type
 testdata/Prelude.lc 126:6-127:46  Type
+testdata/Prelude.lc 126:21-126:30  Type
 testdata/Prelude.lc 126:22-126:29  Type
 testdata/Prelude.lc 127:7-127:17  RecordC V2 | Type | {a : List RecItem} -> HList ('map RecItem Type 'recItemType a) -> RecordC a
 testdata/Prelude.lc 127:19-127:24  List Type -> Type
@@ -505,6 +511,7 @@ testdata/Prelude.lc 133:9-133:14  V3
 testdata/Prelude.lc 133:9-133:23  HList V0
 testdata/Prelude.lc 133:22-133:23  HList V2 -> V2 | HList V3 | V2 -> HList V2 -> V2
 testdata/Prelude.lc 136:12-138:180  V0->V1 | {a} -> {b : List RecItem} -> c:String -> {d : 'isKeyC c a b} -> RecordC b -> a
+testdata/Prelude.lc 136:28-136:37  Type
 testdata/Prelude.lc 136:28-136:97  Type
 testdata/Prelude.lc 136:29-136:36  Type
 testdata/Prelude.lc 136:41-136:97  Type
@@ -1589,6 +1596,7 @@ testdata/Prelude.lc 385:30-385:35  Float
 testdata/Prelude.lc 385:32-385:33  {a} -> {b : Num (MatVecScalarElem a)} -> a -> a->a
 testdata/Prelude.lc 385:34-385:35  V1
 testdata/Prelude.lc 385:37-385:38  Float
+testdata/Prelude.lc 387:9-387:12  Type
 testdata/Prelude.lc 387:9-387:24  Type
 testdata/Prelude.lc 387:9-389:30  V0->V1 | {a} -> List a -> Int->a
 testdata/Prelude.lc 387:10-387:11  V1
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 9c4e33f2..adc6ff6d 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -28,9 +28,11 @@ 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 | E | Type
+testdata/language-features/basic-values/data01.lc 3:16-3:18  Type
 testdata/language-features/basic-values/data01.lc 3:21-3:22  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 | D1 | Type
+testdata/language-features/basic-values/data01.lc 6:7-6:9  Type
 testdata/language-features/basic-values/data01.lc 6:11-6:13  D1
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 4b91adc2..72466eb4 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -7,5 +7,6 @@ fun2 :: {a} -> {b} -> {c} -> {d} -> {e} -> a -> b -> c -> d -> e->'Char[39
 testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
 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 3:10-3:11  V1
 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/infix03.out b/testdata/language-features/basic-values/infix03.out
index ce814432..c5db1959 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -13,7 +13,12 @@ testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
 testdata/language-features/basic-values/infix03.lc 1:6-2:12  Type
 testdata/language-features/basic-values/infix03.lc 1:6-2:21  Type
 testdata/language-features/basic-values/infix03.lc 1:10-1:12  () -> ()->D | D | Type
+testdata/language-features/basic-values/infix03.lc 1:13-1:15  Type
+testdata/language-features/basic-values/infix03.lc 1:16-1:18  Type
 testdata/language-features/basic-values/infix03.lc 2:10-2:12  () -> () -> ()->D | D | Type
+testdata/language-features/basic-values/infix03.lc 2:13-2:15  Type
+testdata/language-features/basic-values/infix03.lc 2:16-2:18  Type
+testdata/language-features/basic-values/infix03.lc 2:19-2:21  Type
 testdata/language-features/basic-values/infix03.lc 4:1-4:3  () -> ()->D
 testdata/language-features/basic-values/infix03.lc 4:10-4:11  V3
 testdata/language-features/basic-values/infix03.lc 4:10-4:16  ()->D
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 71622998..cb18e787 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -7,8 +7,19 @@ value4 :: {a} -> {b : 'Num a}->a
 value5 :: {a} -> {b : 'Num a}->a
 ------------ tooltips
 testdata/language-features/basic-values/let01.lc 1:1-1:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 1:18-1:19  V1
+testdata/language-features/basic-values/let01.lc 1:23-1:24  V1
 testdata/language-features/basic-values/let01.lc 3:1-3:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 4:11-4:12  V1
+testdata/language-features/basic-values/let01.lc 5:6-5:7  V1
 testdata/language-features/basic-values/let01.lc 7:1-7:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 8:11-8:12  V1
 testdata/language-features/basic-values/let01.lc 9:11-9:14  Char
+testdata/language-features/basic-values/let01.lc 10:6-10:7  V1
 testdata/language-features/basic-values/let01.lc 12:1-12:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 12:18-12:19  V1
+testdata/language-features/basic-values/let01.lc 13:13-13:14  V1
 testdata/language-features/basic-values/let01.lc 15:1-15:7  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/let01.lc 15:18-15:19  V1
+testdata/language-features/basic-values/let01.lc 16:18-16:19  V1
+testdata/language-features/basic-values/let01.lc 17:13-17:14  V1
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index d3f7c31b..cbbba1b1 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -7,6 +7,7 @@ testdata/language-features/basic-values/let02.lc 2:11-2:13  ()
 testdata/language-features/basic-values/let02.lc 3:19-3:22  Char
 testdata/language-features/basic-values/let02.lc 3:26-3:28  ()
 testdata/language-features/basic-values/let02.lc 5:17-5:19  ()
+testdata/language-features/basic-values/let02.lc 6:17-6:18  V1
 testdata/language-features/basic-values/let02.lc 7:17-7:24  String
 testdata/language-features/basic-values/let02.lc 8:12-8:15  Char
 testdata/language-features/basic-values/let02.lc 9:6-9:8  ()
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 3c3ea255..4d1bb07e 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -10,8 +10,11 @@ stringValue1 :: 'String
 stringValue2 :: 'String
 ------------ tooltips
 testdata/language-features/basic-values/literal01.lc 1:1-1:10  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/literal01.lc 1:13-1:14  V1
 testdata/language-features/basic-values/literal01.lc 2:1-2:10  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/literal01.lc 2:13-2:14  V1
 testdata/language-features/basic-values/literal01.lc 3:1-3:10  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/literal01.lc 3:13-3:18  V1
 testdata/language-features/basic-values/literal01.lc 5:1-5:12  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
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 51674710..d210aa29 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -5,6 +5,7 @@ value :: 'Char
 testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
 testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
 testdata/language-features/basic-values/shadowing01.lc 3:11-3:18  String
+testdata/language-features/basic-values/shadowing01.lc 5:17-5:18  V1
 testdata/language-features/basic-values/shadowing01.lc 6:17-6:21  Float
 testdata/language-features/basic-values/shadowing01.lc 7:25-7:27  ()
 testdata/language-features/basic-values/shadowing01.lc 8:25-8:28  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index b0a4ee08..b5315a86 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -5,11 +5,14 @@ world :: 'String
 value2 :: 'Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  {a} -> {b : Num a}->a
+testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  V1
 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 6:11-6:14  V1
+testdata/language-features/basic-values/shadowing02.lc 8:17-8:18  V1
 testdata/language-features/basic-values/shadowing02.lc 9:17-9:21  Float
 testdata/language-features/basic-values/shadowing02.lc 10:25-10:27  ()
 testdata/language-features/basic-values/shadowing02.lc 11:25-11:28  Char
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index eac8581d..a88c824d 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -14,6 +14,8 @@ testdata/language-features/basic-values/typesig07.lc 4:1-4:7  Int
 testdata/language-features/basic-values/typesig07.lc 4:10-4:11  V1
 testdata/language-features/basic-values/typesig07.lc 5:1-5:7  Int
 testdata/language-features/basic-values/typesig07.lc 5:10-5:11  V1
+testdata/language-features/basic-values/typesig07.lc 8:12-8:14  Type
+testdata/language-features/basic-values/typesig07.lc 8:18-8:20  Type
 testdata/language-features/basic-values/typesig07.lc 8:18-8:26  Type
 testdata/language-features/basic-values/typesig07.lc 8:24-8:26  Type
 testdata/language-features/basic-values/typesig07.lc 10:1-10:7  () -> ()->()
diff --git a/testdata/language-features/basic-values/typesyn01.out b/testdata/language-features/basic-values/typesyn01.out
index cca031fc..3e2d214b 100644
--- a/testdata/language-features/basic-values/typesyn01.out
+++ b/testdata/language-features/basic-values/typesyn01.out
@@ -3,3 +3,4 @@ main is not found
 'MyUnit :: Type
 ------------ tooltips
 testdata/language-features/basic-values/typesyn01.lc 1:6-1:12  Type
+testdata/language-features/basic-values/typesyn01.lc 1:15-1:17  Type
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index b8070de1..657f3fef 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -4,6 +4,7 @@ main is not found
 fun :: {a} -> a -> ()->()
 ------------ tooltips
 testdata/language-features/basic-values/typesyn02.lc 1:6-1:12  Type
+testdata/language-features/basic-values/typesyn02.lc 1:15-1:17  Type
 testdata/language-features/basic-values/typesyn02.lc 3:8-3:9  V1
 testdata/language-features/basic-values/typesyn02.lc 3:8-3:29  Type
 testdata/language-features/basic-values/typesyn02.lc 3:13-3:19  Type
diff --git a/testdata/language-features/basic-values/typesyn03.reject.out b/testdata/language-features/basic-values/typesyn03.reject.out
index b980b47f..e55ce30e 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.out
@@ -15,4 +15,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 1:15-1:17  Type
 testdata/language-features/basic-values/typesyn03.reject.lc 2:6-2:12  Type
+testdata/language-features/basic-values/typesyn03.reject.lc 2:15-2:17  Type
diff --git a/testdata/language-features/basic-values/typesyn04.reject.out b/testdata/language-features/basic-values/typesyn04.reject.out
index 2fd21298..6e93a12a 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.out
@@ -15,4 +15,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 1:15-1:17  Type
 testdata/language-features/basic-values/typesyn04.reject.lc 2:6-2:12  Type
+testdata/language-features/basic-values/typesyn04.reject.lc 2:15-2:17  Type
diff --git a/testdata/language-features/module/TypeSyn01Mod.out b/testdata/language-features/module/TypeSyn01Mod.out
index 86988558..d1af6425 100644
--- a/testdata/language-features/module/TypeSyn01Mod.out
+++ b/testdata/language-features/module/TypeSyn01Mod.out
@@ -3,3 +3,4 @@ main is not found
 'MyUnit :: Type
 ------------ tooltips
 testdata/language-features/module/TypeSyn01Mod.lc 2:6-2:12  Type
+testdata/language-features/module/TypeSyn01Mod.lc 2:15-2:17  Type
diff --git a/testdata/language-features/module/import10.reject.out b/testdata/language-features/module/import10.reject.out
index d4f63553..387cc439 100644
--- a/testdata/language-features/module/import10.reject.out
+++ b/testdata/language-features/module/import10.reject.out
@@ -14,3 +14,4 @@ type MyUnit = ()
      ^^^^^^
 ------------ tooltips
 testdata/language-features/module/import10.reject.lc 3:6-3:12  Type
+testdata/language-features/module/import10.reject.lc 3:15-3:17  Type
diff --git a/testdata/language-features/module/import11.reject.out b/testdata/language-features/module/import11.reject.out
index c2d3550a..79b26f64 100644
--- a/testdata/language-features/module/import11.reject.out
+++ b/testdata/language-features/module/import11.reject.out
@@ -14,3 +14,4 @@ type MyUnit = ()
      ^^^^^^
 ------------ tooltips
 testdata/language-features/module/import11.reject.lc 3:6-3:12  Type
+testdata/language-features/module/import11.reject.lc 3:15-3:17  Type
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 0fe9fad8..e09c60fc 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -6,3 +6,4 @@ testdata/language-features/recursion/simplerec01.lc 1:1-1:4  {a} -> {b : Num a}
 testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char
 testdata/language-features/recursion/simplerec01.lc 1:9-2:14  Bool->Char | V0->V1
 testdata/language-features/recursion/simplerec01.lc 2:9-2:12  V4
+testdata/language-features/recursion/simplerec01.lc 2:13-2:14  V1
diff --git a/testdata/language-features/recursion/simplerec02.out b/testdata/language-features/recursion/simplerec02.out
index 5c4ed127..7f15bef6 100644
--- a/testdata/language-features/recursion/simplerec02.out
+++ b/testdata/language-features/recursion/simplerec02.out
@@ -6,4 +6,5 @@ testdata/language-features/recursion/simplerec02.lc 1:1-1:6  ()
 testdata/language-features/recursion/simplerec02.lc 1:21-1:24  Char
 testdata/language-features/recursion/simplerec02.lc 1:21-2:26  Bool->Char | V0->V1
 testdata/language-features/recursion/simplerec02.lc 2:21-2:24  V4
+testdata/language-features/recursion/simplerec02.lc 2:25-2:26  V1
 testdata/language-features/recursion/simplerec02.lc 3:12-3:14  ()
diff --git a/testdata/language-features/recursion/simplerec03.out b/testdata/language-features/recursion/simplerec03.out
index 641d1f98..a4b0473e 100644
--- a/testdata/language-features/recursion/simplerec03.out
+++ b/testdata/language-features/recursion/simplerec03.out
@@ -7,3 +7,4 @@ testdata/language-features/recursion/simplerec03.lc 1:9-1:11  ()
 testdata/language-features/recursion/simplerec03.lc 3:13-3:16  Char
 testdata/language-features/recursion/simplerec03.lc 3:13-4:18  Bool->Char | V0->V1
 testdata/language-features/recursion/simplerec03.lc 4:13-4:16  V4
+testdata/language-features/recursion/simplerec03.lc 4:17-4:18  V1
diff --git a/testdata/letIndent.out b/testdata/letIndent.out
index 90844a4c..abaf52ca 100644
--- a/testdata/letIndent.out
+++ b/testdata/letIndent.out
@@ -3,4 +3,6 @@ main is not found
 fun :: {a} -> a->a
 ------------ tooltips
 testdata/letIndent.lc 2:1-2:4  {a} -> a->a
+testdata/letIndent.lc 3:10-3:11  V1
+testdata/letIndent.lc 4:10-4:11  V1
 testdata/letIndent.lc 5:7-5:8  V3
diff --git a/testdata/performance/Material.out b/testdata/performance/Material.out
index d46c991d..b67330c2 100644
--- a/testdata/performance/Material.out
+++ b/testdata/performance/Material.out
@@ -344,6 +344,7 @@ testdata/performance/Material.lc 113:7-113:18  StageTexture | String->StageTextu
 testdata/performance/Material.lc 113:21-113:27  Type
 testdata/performance/Material.lc 114:7-114:17  Float -> List String -> StageTexture | StageTexture | Type
 testdata/performance/Material.lc 114:21-114:26  Type
+testdata/performance/Material.lc 114:27-114:35  Type
 testdata/performance/Material.lc 114:28-114:34  Type
 testdata/performance/Material.lc 115:7-115:18  StageTexture
 testdata/performance/Material.lc 116:7-116:20  StageTexture
@@ -374,6 +375,7 @@ testdata/performance/Material.lc 134:24-134:32  Type
 testdata/performance/Material.lc 135:7-135:14  StageAttrs->TCGen
 testdata/performance/Material.lc 135:24-135:29  Type
 testdata/performance/Material.lc 136:7-136:14  StageAttrs -> List TCMod
+testdata/performance/Material.lc 136:24-136:31  Type
 testdata/performance/Material.lc 136:25-136:30  Type
 testdata/performance/Material.lc 137:7-137:16  StageAttrs->StageTexture
 testdata/performance/Material.lc 137:24-137:36  Type
@@ -419,7 +421,9 @@ testdata/performance/Material.lc 163:6-164:18  Type
 testdata/performance/Material.lc 163:6-178:32  Type
 testdata/performance/Material.lc 164:7-164:18  () -> () -> Bool -> Float -> Bool -> Bool -> CullType -> List Deform -> Bool -> Bool -> List StageAttrs -> Bool->CommonAttrs | CommonAttrs | Type | V1
 testdata/performance/Material.lc 165:7-165:17  CommonAttrs->()
+testdata/performance/Material.lc 165:28-165:30  Type
 testdata/performance/Material.lc 166:7-166:17  CommonAttrs->()
+testdata/performance/Material.lc 166:28-166:30  Type
 testdata/performance/Material.lc 167:7-167:15  CommonAttrs->Bool
 testdata/performance/Material.lc 167:28-167:32  Type
 testdata/performance/Material.lc 168:7-168:13  CommonAttrs->Float
@@ -431,12 +435,14 @@ testdata/performance/Material.lc 170:28-170:32  Type
 testdata/performance/Material.lc 171:7-171:13  CommonAttrs->CullType
 testdata/performance/Material.lc 171:28-171:36  Type
 testdata/performance/Material.lc 172:7-172:23  CommonAttrs -> List Deform
+testdata/performance/Material.lc 172:28-172:36  Type
 testdata/performance/Material.lc 172:29-172:35  Type
 testdata/performance/Material.lc 173:7-173:18  CommonAttrs->Bool
 testdata/performance/Material.lc 173:28-173:32  Type
 testdata/performance/Material.lc 174:7-174:22  CommonAttrs->Bool
 testdata/performance/Material.lc 174:28-174:32  Type
 testdata/performance/Material.lc 175:7-175:15  CommonAttrs -> List StageAttrs
+testdata/performance/Material.lc 175:28-175:40  Type
 testdata/performance/Material.lc 175:29-175:39  Type
 testdata/performance/Material.lc 178:7-178:14  CommonAttrs->Bool
 testdata/performance/Material.lc 178:28-178:32  Type
diff --git a/testdata/traceTest.out b/testdata/traceTest.out
index eb004b93..fe39b9a1 100644
--- a/testdata/traceTest.out
+++ b/testdata/traceTest.out
@@ -13,6 +13,7 @@ testdata/traceTest.lc 8:6-8:18  Type
 testdata/traceTest.lc 8:17-8:18  Type
 testdata/traceTest.lc 10:6-10:7  {a} -> a->Type
 testdata/traceTest.lc 10:6-10:25  Type
+testdata/traceTest.lc 10:17-10:24  Type
 testdata/traceTest.lc 10:19-10:20  V4
 testdata/traceTest.lc 10:19-10:23  List Type
 testdata/traceTest.lc 10:22-10:23  List Type | V2
diff --git a/testdata/zip01.out b/testdata/zip01.out
index 3f3699cf..7ceab8e3 100644
--- a/testdata/zip01.out
+++ b/testdata/zip01.out
@@ -2,9 +2,11 @@ main is not found
 ------------ trace
 zip2 :: {a} -> {b} -> 'List a -> 'List b -> 'List (a, b)
 ------------ tooltips
+testdata/zip01.lc 1:9-1:12  Type
 testdata/zip01.lc 1:9-1:30  Type
 testdata/zip01.lc 1:9-4:40  V0->V1 | {a} -> {b} -> List a -> List b -> List (a, b)
 testdata/zip01.lc 1:10-1:11  V3
+testdata/zip01.lc 1:16-1:19  Type
 testdata/zip01.lc 1:16-1:30  Type
 testdata/zip01.lc 1:17-1:18  V2
 testdata/zip01.lc 1:23-1:30  Type