Rip out probes on types

Author: 7h3kk1d

src/haz3lcore/ProbePerform.re

@@ -87,13 +87,12 @@ let rec target_subterm_ids = (id: Id.t, info_map: Statics.Map.t) =>
       ]
     | _ => [id]
     }
-  /* Filter out terms that can't meaningfully be probed (type patterns, labels, etc.) */
+  /* Filter out terms that can't meaningfully be probed */
   | info when !Info.is_typable_term(info) => []
   /* Default: use rep_id for expressions and patterns to handle multi-tile forms
      (tuples, list literals, case expressions) where non-representative tile IDs
      would otherwise cause probe_map/evaluator ID mismatch */
   | Some(InfoExp({term, _})) => [IdTagged.rep_id(term)]
-  | Some(InfoTyp({term, _})) => [IdTagged.rep_id(term)]
   | Some(InfoPat({term, _})) => [Pat.rep_id(term)]
   | _ => [id]
   };
@@ -530,10 +529,9 @@ let rm_probes_in_selection =
      );
 };
 
-/* Check if type annotation is allowed for the given id.
-   Uses target_subterm_ids to support types (which redirect to their parent expressions). */
+/* Check if type annotation is allowed for the given id. */
 let can_statics = (id: Id.t, info_map: Statics.Map.t): bool =>
-  target_subterm_ids(id, info_map) != [];
+  Info.is_typable_term(Statics.Map.lookup(id, info_map));
 
 /* Toggle type annotation on the indicated term.
    Unlike probes, type annotations don't support auto mode or pins. */

src/haz3lcore/projectors/implementations/ProbeProj.re

@@ -833,9 +833,12 @@ let move_cursor =
   /* Cursor would be outside window, reset to next visible sample */
   | Some(idx) =>
     let next_idx_maybe = idx - offset;
-    switch (List.nth_opt(samples, next_idx_maybe)) {
-    | Some(sample) => parent(SampleCursor(Capture(sample, ap_id)))
-    | None => Effect.Ignore
+    if (next_idx_maybe >= 0 && next_idx_maybe < List.length(samples)) {
+      parent(
+        SampleCursor(Capture(List.nth(samples, next_idx_maybe), ap_id)),
+      );
+    } else {
+      Effect.Ignore;
     };
   | _ => Effect.Ignore
   };
@@ -1170,7 +1173,6 @@ module M: Projector = {
     | Exp(_)
     | Pat(_) => Some()
     | Any(_) => Some() /* Grout don't have sorts rn */
-    | Typ(_) => Some()
     | _ => None
     };
 
@@ -1189,16 +1191,8 @@ module M: Projector = {
   let view = ({info, local, parent, view_seg, _}: View.args(model, action)) => {
     let settings = Settings.s^;
     /* Wrap view_seg to fix single_line=true for all probe displays */
-    let view_seg_single_line =
-        (~background=?, ~text_only: option(bool)=?, sort, segment) =>
-      view_seg(
-        ~single_line=true,
-        ~background?,
-        ~text_only?,
-        ~is_dynamic=?None,
-        sort,
-        segment,
-      );
+    let view_seg_single_line = (~background=?, ~text_only=?, sort, segment) =>
+      view_seg(~single_line=true, ~background?, ~text_only?, sort, segment);
     View.{
       inline: Node.div([]),
       overlay: Some(overlay_view(info)),

src/haz3lcore/projectors/implementations/TypeProj.re

@@ -15,7 +15,6 @@ let self_ty = (info: option(Info.t)): option(Typ.t) =>
   switch (info) {
   | Some(InfoExp({self, _})) => Self.typ_of_exp(self)
   | Some(InfoPat({self, _})) => Self.typ_of_pat(self)
-  | Some(InfoTyp({term, _})) => Some(term)
   | _ => None
   };