Mark return expressions in parsed and typed ASTs

Signed-off-by: Cristiano Calcagno <[email protected]>

Author: cristianoc

analysis/src/CompletionFrontEnd.ml

@@ -277,6 +277,7 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
             {funct = d; args = (Nolabel, lhs) :: args; partial; transformed_jsx};
         pexp_loc;
         pexp_attributes;
+        pexp_is_return = false;
       }
   | Pexp_apply
       ({
@@ -294,11 +295,18 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
           Pexp_apply
             {
               app with
-              funct = {pexp_desc = Pexp_ident id; pexp_loc; pexp_attributes};
+              funct =
+                {
+                  pexp_desc = Pexp_ident id;
+                  pexp_loc;
+                  pexp_attributes;
+                  pexp_is_return = false;
+                };
               args = [(Nolabel, lhs)];
             };
         pexp_loc;
         pexp_attributes;
+        pexp_is_return = false;
       }
   | Pexp_apply {funct = e1; args} -> (
     match exprToContextPath ~inJsxContext e1 with

compiler/frontend/ast_compatible.ml

@@ -35,6 +35,7 @@ let apply_simple ?(loc = default_loc) ?(attrs = []) (fn : expression)
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_apply
         {
@@ -49,6 +50,7 @@ let app1 ?(loc = default_loc) ?(attrs = []) fn arg1 : expression =
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_apply
         {
@@ -63,6 +65,7 @@ let app2 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 : expression =
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_apply
         {
@@ -77,6 +80,7 @@ let app3 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 arg3 : expression =
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_apply
         {
@@ -91,6 +95,7 @@ let fun_ ?(loc = default_loc) ?(attrs = []) ?(async = false) ~arity pat exp =
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_fun
         {
@@ -108,13 +113,15 @@ let const_exp_string ?(loc = default_loc) ?(attrs = []) ?delimiter (s : string)
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc = Pexp_constant (Pconst_string (s, delimiter));
   }
 
 let const_exp_int ?(loc = default_loc) ?(attrs = []) (s : int) : expression =
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc = Pexp_constant (Pconst_integer (string_of_int s, None));
   }
 
@@ -123,6 +130,7 @@ let apply_labels ?(loc = default_loc) ?(attrs = []) fn
   {
     pexp_loc = loc;
     pexp_attributes = attrs;
+    pexp_is_return = false;
     pexp_desc =
       Pexp_apply
         {

compiler/frontend/ast_exp_apply.ml

@@ -96,6 +96,7 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
             {funct = fn1; args = (Nolabel, a) :: args; partial; transformed_jsx};
         pexp_loc = e.pexp_loc;
         pexp_attributes = e.pexp_attributes @ f.pexp_attributes;
+        pexp_is_return = false;
       }
     | Pexp_tuple xs ->
       bound a (fun bounded_obj_arg ->
@@ -122,11 +123,13 @@ let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) : exp =
                                transformed_jsx;
                              };
                          pexp_attributes = [];
+                         pexp_is_return = false;
                          pexp_loc = fn.pexp_loc;
                        }
                      | _ ->
                        Ast_compatible.app1 ~loc:fn.pexp_loc fn bounded_obj_arg));
             pexp_attributes = f.pexp_attributes;
+            pexp_is_return = false;
             pexp_loc = f.pexp_loc;
           })
     | _ -> Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a)

compiler/frontend/ast_external_mk.ml

@@ -54,6 +54,7 @@ let local_external_apply loc ?(pval_attributes = []) ~(pval_prim : string list)
              Pexp_ident
                {txt = Ldot (Lident local_module_name, local_fun_name); loc};
            pexp_attributes = [];
+           pexp_is_return = false;
            pexp_loc = loc;
          }
           : Parsetree.expression)
@@ -90,6 +91,7 @@ let local_external_obj loc ?(pval_attributes = []) ~pval_prim ~pval_type
              Pexp_ident
                {txt = Ldot (Lident local_module_name, local_fun_name); loc};
            pexp_attributes = [];
+           pexp_is_return = false;
            pexp_loc = loc;
          }
           : Parsetree.expression)
@@ -126,5 +128,6 @@ let local_extern_cont_to_obj loc ?(pval_attributes = []) ~pval_prim ~pval_type
             Pexp_ident
               {txt = Ldot (Lident local_module_name, local_fun_name); loc};
           pexp_attributes = [];
+          pexp_is_return = false;
           pexp_loc = loc;
         } )

compiler/frontend/ast_open_cxt.ml

@@ -56,6 +56,7 @@ let restore_exp (xs : Parsetree.expression) (qualifiers : t) :
         ({
            pexp_desc = Pexp_open (flag, lid, x);
            pexp_attributes = attrs;
+           pexp_is_return = false;
            pexp_loc = loc;
          }
           : Parsetree.expression))

compiler/ml/ast_helper.ml

@@ -154,7 +154,12 @@ end
 
 module Exp = struct
   let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {pexp_desc = d; pexp_loc = loc; pexp_attributes = attrs}
+    {
+      pexp_desc = d;
+      pexp_loc = loc;
+      pexp_attributes = attrs;
+      pexp_is_return = false;
+    }
   let attr d a = {d with pexp_attributes = d.pexp_attributes @ [a]}
 
   let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)

compiler/ml/parsetree.ml

@@ -212,6 +212,7 @@ and expression = {
   pexp_loc: Location.t;
   (* Hack: made pexp_attributes mutable for use in analysis exe. Please do not use elsewhere! *)
   mutable pexp_attributes: attributes; (* ... [@id1] [@id2] *)
+  mutable pexp_is_return: bool;
 }
 
 and expression_desc =