Split up cases in frontend.

Author: nojaf

analysis/src/CompletionFrontEnd.ml

@@ -1128,31 +1128,52 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
          so the apply expression does not include the cursor *)
       if setPipeResult ~lhs ~id:"" then setFound ()
     (*
-       A dot completion for a tagged templated application.
+       A dot completion for a tagged templated application with an expr hole.
        Example:
          sh`echo "meh"`.
-       or
-         sh`bar`.len
     *)
     | Pexp_apply
         {
           funct = {pexp_desc = Pexp_ident {txt = Lident "."; loc = _}};
           args =
-            [(_, ({pexp_desc = Pexp_apply _} as innerExpr)); (_, fieldExpr)];
+            [
+              (* sh`echo "meh"` *)
+              (_, ({pexp_desc = Pexp_apply _} as innerExpr));
+              (* recovery inserted node *)
+              (_, {pexp_desc = Pexp_extension ({txt = "rescript.exprhole"}, _)});
+            ];
+        }
+      when Res_parsetree_viewer.is_tagged_template_literal innerExpr ->
+      exprToContextPath innerExpr
+      |> Option.iter (fun cpath ->
+             setResult
+               (Cpath
+                  (CPField
+                     {
+                       contextPath = cpath;
+                       fieldName = "";
+                       posOfDot;
+                       exprLoc = expr.pexp_loc;
+                     }));
+             setFound ())
+      (*
+       A dot completion for a tagged templated application with an ident.
+       Example:
+         sh`echo "meh"`.foo
+    *)
+    | Pexp_apply
+        {
+          funct = {pexp_desc = Pexp_ident {txt = Lident "."; loc = _}};
+          args =
+            [
+              (_, ({pexp_desc = Pexp_apply _} as innerExpr));
+              (_, {pexp_desc = Pexp_ident {txt = Lident fieldName}});
+            ];
         }
       when Res_parsetree_viewer.is_tagged_template_literal innerExpr
-           && expr.pexp_loc |> Loc.hasPos ~pos:posBeforeCursor
-           || CompletionExpressions.isExprHole fieldExpr ->
+           && expr.pexp_loc |> Loc.hasPos ~pos:posBeforeCursor ->
       exprToContextPath innerExpr
       |> Option.iter (fun cpath ->
-             (* Determine the field name if present *)
-             let fieldName =
-               match fieldExpr.pexp_desc with
-               | Pexp_ident {txt = Lident fieldName} -> fieldName
-               (* This is likely to be an exprhole *)
-               | _ -> ""
-             in
-
              setResult
                (Cpath
                   (CPField