Don't complete inside comments.

Author: cristianoc

analysis/src/Completion.ml

@@ -494,6 +494,7 @@ let completionWithParser ~debug ~path ~posCursor ~currentFile ~text =
       if expr.pexp_loc |> Loc.hasPos ~pos:posNoWhite then (
         setFound ();
         match expr.pexp_desc with
+        | Pexp_constant _ -> setResult Cnone
         | Pexp_ident id ->
           if debug then
             Printf.printf "Pexp_ident %s:%s\n"

analysis/src/NewCompletions.ml

@@ -1160,6 +1160,7 @@ let processCompletable ~package ~scope ~env ~pos (completable : Completable.t) =
     |> completionsGetTypeEnv
   in
   match completable with
+  | Cnone -> []
   | Cpath contextPath ->
     contextPath
     |> getCompletionsForContextPath ~package ~opens ~rawOpens ~allFiles ~pos

analysis/src/SharedTypes.ml

@@ -412,6 +412,7 @@ module Completable = struct
     | Cdecorator of string  (** e.g. @module *)
     | Clabel of string list * string * string list
         (** e.g. (["M", "foo"], "label", ["l1", "l2"]) for M.foo(...~l1...~l2...~label...) *)
+    | Cnone  (** e.g. don't complete inside strings *)
     | Cpath of contextPath
     | Cjsx of string list * string * string list
         (** E.g. (["M", "Comp"], "id", ["id1", "id2"]) for <M.Comp id1=... id2=... ... id *)
@@ -439,6 +440,7 @@ module Completable = struct
     | Cdecorator s -> "Cdecorator(" ^ str s ^ ")"
     | Clabel (sl1, s, sl2) ->
       "Clabel(" ^ (sl1 |> list) ^ ", " ^ str s ^ ", " ^ (sl2 |> list) ^ ")"
+    | Cnone -> "Cnone"
     | Cjsx (sl1, s, sl2) ->
       "Cjsx(" ^ (sl1 |> list) ^ ", " ^ str s ^ ", " ^ (sl2 |> list) ^ ")"
 end

analysis/tests/src/Completion.res

@@ -235,4 +235,7 @@ module FAO = {
 
 let name = "abc"
 // let template = `My name is ${na}`
-//                                ^com
+//                                ^com
+
+let notHere = "      "
+//               ^com

analysis/tests/src/expected/Completion.res.txt

@@ -832,6 +832,11 @@ DocumentSymbol tests/src/Completion.res
         "name": "name",
         "kind": 15,
         "location": {"uri": "Completion.res", "range": {"start": {"line": 235, "character": 0}, "end": {"line": 235, "character": 16}}}
+},
+{
+        "name": "notHere",
+        "kind": 15,
+        "location": {"uri": "Completion.res", "range": {"start": {"line": 239, "character": 0}, "end": {"line": 239, "character": 22}}}
 }
 ]
 
@@ -1306,3 +1311,8 @@ Completable: Cpath Value[na]
     "documentation": null
   }]
 
+Complete tests/src/Completion.res 239:17
+posCursor:[239:17] posNoWhite:[239:14] Found expr:[239:14->239:22]
+Completable: Cnone
+[]
+