Add special case for labels in type enclosing logic

Author: voodoos

src/analysis/type_enclosing.ml

@@ -102,6 +102,11 @@ let from_reconstructed ~nodes ~cursor ~verbosity exprs =
         let ppf, to_string = Format.to_string () in
         Type_utils.print_constr ~verbosity env ppf cd;
         Some (loc, String (to_string ()), `No)
+      | Some (Context.Label { lbl_name; lbl_arg; _ }) ->
+        log ~title:"from_reconstructed" "ctx: label %s" lbl_name;
+        let ppf, to_string = Format.to_string () in
+        Type_utils.print_type_with_decl ~verbosity env ppf lbl_arg;
+        Some (loc, String (to_string ()), `No)
       | Some Context.Constant -> None
       | _ ->
         let context = Option.value ~default:Context.Expr context in

tests/test-dirs/type-enclosing/issue1564.t

@@ -29,10 +29,10 @@ Verbosity 0 should stop at Kind.t
   "Kind.t"
 
 On `let y = x.k|ind`
-FIXME Verbosity 1 should show the actual type definition of Kind.t
+Verbosity 1 should show the actual type definition of Kind.t
   $ $MERLIN single type-enclosing -position 8:11 -verbosity 1 \
   > -filename ./main.ml < ./main.ml | tr '\r\n' ' ' | jq ".value[0].type"
-  "Kind.t"
+  "type t = A | B"
 
 On `let z = { kind = B }.k|ind`
 Verbosity 0 should stop at Kind.t
@@ -53,7 +53,7 @@ Verbosity 0 should stop at Kind.t
   "Kind.t"
 
 On `let x = { k|ind = A }`
-FIXME Verbosity 1 should show the actual type definition of Kind.t
+Verbosity 1 should show the actual type definition of Kind.t
   $ $MERLIN single type-enclosing -position 7:12 -verbosity 1 \
   > -filename ./main.ml < ./main.ml | tr '\r\n' ' ' | jq ".value[0].type"
-  "Kind.t"
+  "type t = A | B"

tests/test-dirs/type-enclosing/record.t/run.t

@@ -231,7 +231,7 @@ FIXME: The following results are not entirely satisfying (`foo.Bar -> foo` could
         "line": 12,
         "col": 18
       },
-      "type": "unit",
+      "type": "type unit = ()",
       "tail": "no"
     },
     {