From d9dd274d473fbb88968adf80fa32bbc5bcee8700 Mon Sep 17 00:00:00 2001
From: Spotandjake <40705786+spotandjake@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:53:30 -0500
Subject: [PATCH] fix(compiler): Correct `in_function` state when typing record
 properties (#2205)

---
 compiler/src/typed/typecore.re  | 15 ++++++++++-----
 compiler/test/suites/returns.re | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/compiler/src/typed/typecore.re b/compiler/src/typed/typecore.re
index 76b37d21b8..37fb66c681 100644
--- a/compiler/src/typed/typecore.re
+++ b/compiler/src/typed/typecore.re
@@ -1105,7 +1105,8 @@ and type_expect_ =
           loc,
           closed,
           env,
-          (e, k) => k(type_label_exp(true, env, loc, ty_record, e)),
+          (e, k) =>
+            k(type_label_exp(~in_function, true, env, loc, ty_record, e)),
           opath,
           es,
         ),
@@ -1422,6 +1423,7 @@ and type_expect_ =
     });
   | PExpConstruct(cstr, arg) =>
     type_construct(
+      ~in_function,
       env,
       loc,
       cstr,
@@ -2098,7 +2100,8 @@ and type_application = (~in_function=?, ~loc, env, funct, sargs) => {
   (ordered_labels, omitted_args @ typed_args, instance(env, ty_ret));
 }
 
-and type_construct = (env, loc, lid, sarg, ty_expected_explained, attrs) => {
+and type_construct =
+    (~in_function, env, loc, lid, sarg, ty_expected_explained, attrs) => {
   let {ty: ty_expected, explanation} = ty_expected_explained;
   let (sargs, is_record_cstr) =
     switch (sarg) {
@@ -2215,7 +2218,7 @@ and type_construct = (env, loc, lid, sarg, ty_expected_explained, attrs) => {
   let args =
     List.map2(
       (sarg, (ty_arg, ty_arg0)) =>
-        type_argument(~recarg, env, sarg, ty_arg, ty_arg0),
+        type_argument(~in_function?, ~recarg, env, sarg, ty_arg, ty_arg0),
       sargs,
       List.combine(ty_args, ty_args0),
     );
@@ -2725,7 +2728,8 @@ and type_label_access = (env, srecord, lid) => {
   (record, label, opath);
 }
 
-and type_label_exp = (create, env, loc, ty_expected, (lid, label, sarg)) => {
+and type_label_exp =
+    (~in_function, create, env, loc, ty_expected, (lid, label, sarg)) => {
   /* Here also ty_expected may be at generic_level */
   begin_def();
   let separate = Env.has_local_constraints(env);
@@ -2758,7 +2762,8 @@ and type_label_exp = (create, env, loc, ty_expected, (lid, label, sarg)) => {
       } else {
         Some(Btype.snapshot());
       };
-    let arg = type_argument(env, sarg, ty_arg, instance(env, ty_arg));
+    let arg =
+      type_argument(~in_function?, env, sarg, ty_arg, instance(env, ty_arg));
     end_def();
     try(
       {
diff --git a/compiler/test/suites/returns.re b/compiler/test/suites/returns.re
index d10abd1ec6..ab6cbb2af7 100644
--- a/compiler/test/suites/returns.re
+++ b/compiler/test/suites/returns.re
@@ -108,4 +108,32 @@ describe("early return", ({test, testSkip}) => {
     |},
     "7\n",
   );
+  assertRun(
+    "regression_2204_1",
+    {|
+      record Test {
+        a: Number,
+      }
+      let test = () => {
+        { a: if (true) return 1 else 0, }
+        return -1
+      }
+      print(test())
+    |},
+    "1\n",
+  );
+  assertRun(
+    "regression_2204_2",
+    {|
+      record Test {
+        a: Number,
+      }
+      let test = () => {
+        Ok({ a: if (true) return 1 else 0, })
+        return -1
+      }
+      print(test())
+    |},
+    "1\n",
+  );
 });