Traverse template interpolations in analysis

Signed-off-by: Christoph Knittel <ck@cca.io>

Author: cknitt

analysis/src/process_cmt.ml

@@ -688,57 +688,21 @@ and for_module ~env mod_desc module_name =
   scope lookups match precisely.
 *)
 and scan_let_modules ~env (e : Typedtree.expression) =
-  match e.exp_desc with
-  | Texp_letmodule (id, name, mexpr, body) ->
-    let stamp = Ident.binding_time id in
-    let item = for_module ~env mexpr.mod_desc name.txt in
-    let declared =
-      Process_attributes.new_declared ~item ~extent:name.loc ~name ~stamp
-        ~module_path:NotVisible false []
-    in
-    Stamps.add_module env.stamps stamp declared;
-    scan_let_modules ~env body
-  | Texp_let (_rf, bindings, body) ->
-    List.iter
-      (fun {Typedtree.vb_expr} -> scan_let_modules ~env vb_expr)
-      bindings;
-    scan_let_modules ~env body
-  | Texp_apply {funct; args; _} ->
-    scan_let_modules ~env funct;
-    args
-    |> List.iter (function
-      | _, Some e -> scan_let_modules ~env e
-      | _, None -> ())
-  | Texp_tuple exprs -> List.iter (scan_let_modules ~env) exprs
-  | Texp_sequence (e1, e2) ->
-    scan_let_modules ~env e1;
-    scan_let_modules ~env e2
-  | Texp_match (e, cases, exn_cases, _) ->
-    scan_let_modules ~env e;
-    let scan_case {Typedtree.c_lhs = _; c_guard; c_rhs} =
-      (match c_guard with
-      | Some g -> scan_let_modules ~env g
-      | None -> ());
-      scan_let_modules ~env c_rhs
-    in
-    List.iter scan_case cases;
-    List.iter scan_case exn_cases
-  | Texp_function {body; _} -> scan_let_modules ~env body
-  | Texp_try (e, cases) ->
-    scan_let_modules ~env e;
-    cases
-    |> List.iter (fun {Typedtree.c_lhs = _; c_guard; c_rhs} ->
-        (match c_guard with
-        | Some g -> scan_let_modules ~env g
-        | None -> ());
-        scan_let_modules ~env c_rhs)
-  | Texp_ifthenelse (e1, e2, e3_opt) -> (
-    scan_let_modules ~env e1;
-    scan_let_modules ~env e2;
-    match e3_opt with
-    | Some e3 -> scan_let_modules ~env e3
-    | None -> ())
-  | _ -> ()
+  let expr iterator (expression : Typedtree.expression) =
+    (match expression.exp_desc with
+    | Texp_letmodule (id, name, mexpr, _body) ->
+      let stamp = Ident.binding_time id in
+      let item = for_module ~env mexpr.mod_desc name.txt in
+      let declared =
+        Process_attributes.new_declared ~item ~extent:name.loc ~name ~stamp
+          ~module_path:NotVisible false []
+      in
+      Stamps.add_module env.stamps stamp declared
+    | _ -> ());
+    Tast_iterator.default_iterator.expr iterator expression
+  in
+  let iterator = {Tast_iterator.default_iterator with expr} in
+  iterator.expr iterator e
 
 and for_structure ~name ~env str_items =
   let exported = Exported.init () in

tests/analysis_tests/tests/src/CompletionTaggedTemplate.res

@@ -16,3 +16,17 @@ let w = meh``
 
 // let x = meh`foo`.
 //                  ^com
+
+let ordinaryInterpolation = `value: ${{
+  module LocalOrdinary = M
+  // LocalOrdinary.
+  //               ^com
+  LocalOrdinary.b(w)
+}}`
+
+let taggedInterpolation = meh`value: ${{
+  module LocalTagged = M
+  // LocalTagged.
+  //             ^com
+  LocalTagged.b(w)
+}}`

tests/analysis_tests/tests/src/expected/CompletionTaggedTemplate.res.txt

@@ -137,3 +137,59 @@ Path
   }
 ]
 
+Complete src/CompletionTaggedTemplate.res 21:19
+posCursor:[21:19] posNoWhite:[21:18] Found expr:[19:28->24:3]
+posCursor:[21:19] posNoWhite:[21:18] Found expr:[20:2->23:20]
+posCursor:[21:19] posNoWhite:[21:18] Found expr:[21:5->23:20]
+Pexp_apply ...[21:5->23:17] (...[23:18->23:19])
+posCursor:[21:19] posNoWhite:[21:18] Found expr:[21:5->23:17]
+Pexp_ident LocalOrdinary.:[21:5->23:17]
+Completable: Cpath Value[LocalOrdinary, ""]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[LocalOrdinary, ""]
+Path LocalOrdinary.
+[
+  {
+    "detail": "type t",
+    "documentation": {
+      "kind": "markdown",
+      "value": "```rescript\ntype t = promise<string>\n```"
+    },
+    "kind": 22,
+    "label": "t",
+    "tags": []
+  },
+  { "detail": "t => int", "kind": 12, "label": "a", "tags": [] },
+  { "detail": "t => string", "kind": 12, "label": "b", "tags": [] },
+  { "detail": "(t, int) => int", "kind": 12, "label": "xyz", "tags": [] }
+]
+
+Complete src/CompletionTaggedTemplate.res 28:17
+posCursor:[28:17] posNoWhite:[28:16] Found expr:[26:26->31:3]
+posCursor:[28:17] posNoWhite:[28:16] Found expr:[27:2->30:18]
+posCursor:[28:17] posNoWhite:[28:16] Found expr:[28:5->30:18]
+Pexp_apply ...[28:5->30:15] (...[30:16->30:17])
+posCursor:[28:17] posNoWhite:[28:16] Found expr:[28:5->30:15]
+Pexp_ident LocalTagged.:[28:5->30:15]
+Completable: Cpath Value[LocalTagged, ""]
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath Value[LocalTagged, ""]
+Path LocalTagged.
+[
+  {
+    "detail": "type t",
+    "documentation": {
+      "kind": "markdown",
+      "value": "```rescript\ntype t = promise<string>\n```"
+    },
+    "kind": 22,
+    "label": "t",
+    "tags": []
+  },
+  { "detail": "t => int", "kind": 12, "label": "a", "tags": [] },
+  { "detail": "t => string", "kind": 12, "label": "b", "tags": [] },
+  { "detail": "(t, int) => int", "kind": 12, "label": "xyz", "tags": [] }
+]
+