Evaluate method calls within attribute

Summary: Takes advantage of D72272575 by allowing the SimpliHack interpreter to directly evaluate the first argument instead of building a call itself. I'll add support for top level function calls in a subsequent diff.

Reviewed By: patriciamckenzie

Differential Revision: D72281549

fbshipit-source-id: e19e2c83f050379296acfee5fef48d18922215ce

Author: dlreeves

hphp/hack/src/client/ide_service/code_actions_services/code_actions_commands.ml

@@ -222,10 +222,10 @@ let generate_simplihack_commands ctx tast pos =
     Simplihack_prompt.find ctx tast.Tast_with_dynamic.under_normal_assumptions
   in
   let create_code_action
-      Simplihack_prompt.{ attribute_pos; derive_prompt; edit_span } =
+      Simplihack_prompt.{ param_pos; derive_prompt; edit_span } =
     let open Option.Let_syntax in
     (* Convert the relative position to an absolute position *)
-    let attribute_pos = Pos.to_absolute attribute_pos in
+    let param_pos = Pos.to_absolute param_pos in
     let* derived_prompt = derive_prompt () in
     let user_prompt =
       Format.sprintf
@@ -251,7 +251,7 @@ let generate_simplihack_commands ctx tast pos =
         }
     in
     (* Calculate the webview start line (LSP uses 0-based line numbers) *)
-    let webview_start_line = Pos.line attribute_pos - 1 in
+    let webview_start_line = Pos.line param_pos - 1 in
     let command_args =
       Code_action_types.(
         Show_inline_chat
@@ -272,7 +272,7 @@ let generate_simplihack_commands ctx tast pos =
     ~f:(fun prompt ->
       if
         Pos.inside_one_based
-          prompt.Simplihack_prompt.attribute_pos
+          prompt.Simplihack_prompt.param_pos
           cursor_line
           cursor_col
       then

hphp/hack/src/client/ide_service/code_actions_services/simplihack/simplihack_interpreter.ml

@@ -293,26 +293,6 @@ end = struct
 end
 
 (* Top-level evaluation function for user attributes *)
-let eval provider (ua : Tast.user_attribute) method_name =
-  let open Option.Let_syntax in
+let eval provider (e : Tast.expr) =
   let ctx = Context.init provider in
-  (* Extract promptlet and arguments *)
-  let* (promptlet, args) =
-    match ua.Aast.ua_params with
-    | promptlet :: args -> Some (promptlet, args)
-    | [] -> None
-  in
-  (* Evaluate the first argument *)
-  let promptlet_value = Expr.eval ctx promptlet in
-  (* If it's a string, return it directly *)
-  match Value.str promptlet_value with
-  | Some str -> Some str
-  | None ->
-    (* Otherwise, proceed with the original class pointer logic *)
-    let* promptlet_class = Value.class_ptr promptlet_value in
-    let* method_ = Context.find_method ~ctx promptlet_class method_name in
-    (* Evaluate method call *)
-    let* value =
-      Call.eval ctx method_ @@ List.map ~f:(fun a -> Aast.Anormal a) args
-    in
-    Value.str value
+  Value.str @@ Expr.eval ctx e

hphp/hack/src/client/ide_service/code_actions_services/simplihack/simplihack_interpreter.mli

@@ -6,4 +6,4 @@
  *
  *)
 
-val eval : Provider_context.t -> Tast.user_attribute -> string -> string option
+val eval : Provider_context.t -> Tast.expr -> string option

hphp/hack/src/client/ide_service/code_actions_services/simplihack/simplihack_prompt.ml

@@ -9,29 +9,24 @@
 open Hh_prelude
 
 type t = {
-  attribute_pos: Pos.t;
+  param_pos: Pos.t;
   derive_prompt: unit -> string option;
   edit_span: Pos.t;
 }
 
-let derive_prompt ctx ua method_name () =
-  Simplihack_interpreter.eval ctx ua method_name
+let derive_prompt ctx e () = Simplihack_interpreter.eval ctx e
 
 let find ctx tast =
-  let user_attribute edit_span method_name acc ua =
+  let user_attribute edit_span acc ua =
     let attribute_name = snd ua.Aast.ua_name in
     if
       String.equal
         attribute_name
         Naming_special_names.UserAttributes.uaSimpliHack
     then
-      let attribute_pos = fst ua.Aast.ua_name in
-      {
-        attribute_pos;
-        edit_span;
-        derive_prompt = derive_prompt ctx ua method_name;
-      }
-      :: acc
+      List.fold ~init:acc ua.Aast.ua_params ~f:(fun acc e ->
+          let param_pos = snd3 e in
+          { param_pos; edit_span; derive_prompt = derive_prompt ctx e } :: acc)
     else
       acc
   in
@@ -47,42 +42,42 @@ let find ctx tast =
         let acc = super#on_class_ env cls in
         List.fold
           ~init:acc
-          ~f:(user_attribute cls.Aast.c_span "onClass")
+          ~f:(user_attribute cls.Aast.c_span)
           cls.Aast.c_user_attributes
 
       method! on_method_ env meth =
         let acc = super#on_method_ env meth in
         List.fold
           ~init:acc
-          ~f:(user_attribute meth.Aast.m_span "onMethod")
+          ~f:(user_attribute meth.Aast.m_span)
           meth.Aast.m_user_attributes
 
       method! on_fun_ env func =
         let acc = super#on_fun_ env func in
         List.fold
           ~init:acc
-          ~f:(user_attribute func.Aast.f_span "onFunction")
+          ~f:(user_attribute func.Aast.f_span)
           func.Aast.f_user_attributes
 
       method! on_class_var env cv =
         let acc = super#on_class_var env cv in
         List.fold
           ~init:acc
-          ~f:(user_attribute cv.Aast.cv_span "onField")
+          ~f:(user_attribute cv.Aast.cv_span)
           cv.Aast.cv_user_attributes
 
       method! on_typedef env x =
         let acc = super#on_typedef env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute x.Aast.t_span "onTypeDef")
+          ~f:(user_attribute x.Aast.t_span)
           x.Aast.t_user_attributes
 
       method! on_class_const env x =
         let acc = super#on_class_const env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute x.Aast.cc_span "onClassConstant")
+          ~f:(user_attribute x.Aast.cc_span)
           x.Aast.cc_user_attributes
 
       method! on_fun_param env x =
@@ -92,35 +87,35 @@ let find ctx tast =
         | Some _ ->
           List.fold
             ~init:acc
-            ~f:(user_attribute x.Aast.param_pos "onParameter")
+            ~f:(user_attribute x.Aast.param_pos)
             x.Aast.param_user_attributes
 
       method! on_file_attribute env x =
         let acc = super#on_file_attribute env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute Pos.none "onFile")
+          ~f:(user_attribute Pos.none)
           x.Aast.fa_user_attributes
 
       method! on_tparam env x =
         let acc = super#on_tparam env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute (fst x.Aast.tp_name) "onGeneric")
+          ~f:(user_attribute (fst x.Aast.tp_name))
           x.Aast.tp_user_attributes
 
       method! on_class_typeconst_def env x =
         let acc = super#on_class_typeconst_def env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute x.Aast.c_tconst_span "onTypeConstant")
+          ~f:(user_attribute x.Aast.c_tconst_span)
           x.Aast.c_tconst_user_attributes
 
       method! on_module_def env x =
         let acc = super#on_module_def env x in
         List.fold
           ~init:acc
-          ~f:(user_attribute x.Aast.md_span "onModule")
+          ~f:(user_attribute x.Aast.md_span)
           x.Aast.md_user_attributes
     end
   in

hphp/hack/src/client/ide_service/code_actions_services/simplihack/simplihack_prompt.mli

@@ -7,7 +7,7 @@
  *)
 
 type t = {
-  attribute_pos: Pos.t;
+  param_pos: Pos.t;
   derive_prompt: unit -> string option;
   edit_span: Pos.t;
 }

hphp/hack/test/ide_code_actions/simplihack/simplihack_getter.php

@@ -1,6 +1,6 @@
 <?hh
-<<__SimpliHack(DeriveGetters::class)>>
- //   ^ at-caret
+<<__SimpliHack(DeriveGetters::onClass())>>
+ //                  ^ at-caret
 class SomeClass {
   public int $one;
   public string $word;

hphp/hack/test/ide_code_actions/simplihack/simplihack_interp.php

@@ -1,6 +1,6 @@
 <?hh
-<<__SimpliHack(DeriveGetters::class, "and setters")>>
- //   ^ at-caret
+<<__SimpliHack(DeriveGetters::onClass("and setters"))>>
+ //                 ^ at-caret
 class SomeClass {
   public int $one;
   public string $word;

hphp/hack/test/ide_code_actions/simplihack/simplihack_interp_string.php

@@ -1,6 +1,6 @@
 <?hh
 <<__SimpliHack("Direct string value", "additional parameter")>>
- //   ^ at-caret
+ //                  ^ at-caret
 class SomeClass {
   public int $one;
   public string $word;