Add autocomplete for props in JSX components.

First working version of autocomplete for JSX props.

Author: cristianoc

Changes.md

@@ -1,6 +1,7 @@
 # master
 - Fix issue in jump-to-definition on Windows. (See https://github.com/rescript-lang/rescript-vscode/issues/98) where the wrong URI was generated.
 - Don't show file path on hover.
+- Add autocomplete for props in JSX components.
 
 ## Release 1.0.6 of rescript-vscode
 This [commit](https://github.com/rescript-lang/rescript-editor-support/commit/03ee0d97b250474028d4fb08eac81ddb21ccb082) is vendored in [rescript-vscode 1.0.6](https://github.com/rescript-lang/rescript-vscode/releases/tag/1.0.6).

src/rescript-editor-support/NewCompletions.re

@@ -491,7 +491,6 @@ let getItems =
     let localModuleNames =
       allModules
       |> Utils.filterMap(name =>
-           /* Log.log("Checking " ++ name); */
            Utils.startsWith(name, suffix) && !String.contains(name, '-')
              ? Some((
                  env.file.uri,
@@ -610,40 +609,78 @@ let mkItem = (~name, ~kind, ~detail, ~deprecated, ~docstring, ~uri, ~pos_lnum) =
 
 let processCompletable =
     (
+      ~findItems,
       ~full,
       ~package,
-      ~state,
       ~pos,
       ~rawOpens,
-      ~allModules,
       completable: PartialParser.completable,
     ) =>
   switch (completable) {
-  | Cjsx(componentName, id) =>
-    ["first", "second"]
-    |> List.map(name =>
-         mkItem(
-           ~name=name ++ " " ++ componentName ++ " " ++ id,
-           ~kind=4,
-           ~deprecated=None,
-           ~detail="",
-           ~docstring=[],
-           ~uri=full.file.uri,
-           ~pos_lnum=fst(pos),
-         )
-       )
+  | Cjsx(componentPath, prefix) =>
+    let items = findItems(~exact=true, componentPath @ ["make"]);
+    let labels = {
+      switch (items) {
+      | [(_uri, {SharedTypes.item: Value(typ)}), ..._] =>
+        let rec getFields = (texp: Types.type_expr) =>
+          switch (texp.desc) {
+          | Tfield(name, _, t1, t2) =>
+            let fields = t2 |> getFields;
+            [(name, t1), ...fields];
+
+          | Tlink(te) => te |> getFields
+          | Tvar(None) => []
+          | _ => []
+          };
+        let rec getLabels = (t: Types.type_expr) =>
+          switch (t.desc) {
+          | Tlink(t1)
+          | Tsubst(t1) => getLabels(t1)
+          | Tarrow(
+              Nolabel,
+              {
+                desc:
+                  Tconstr /* Js.t */(_, [{desc: Tobject(tObj, _)}], _) |
+                  Tobject(tObj, _),
+              },
+              _,
+              _,
+            ) =>
+            getFields(tObj)
+          | _ => []
+          };
+        typ |> getLabels;
+      | _ => []
+      };
+    };
 
-  | Cpath(parts) =>
-    let items =
-      getItems(
-        ~full,
-        ~package,
-        ~rawOpens,
-        ~getModule=State.fileForModule(state, ~package),
-        ~allModules,
-        ~pos,
-        ~parts,
+    let mkLabel_ = (name, typString) =>
+      mkItem(
+        ~name,
+        ~kind=4,
+        ~deprecated=None,
+        ~detail=typString,
+        ~docstring=[],
+        ~uri=full.file.uri,
+        ~pos_lnum=fst(pos),
       );
+    let mkLabel = ((name, typ)) =>
+      mkLabel_(name, typ |> Shared.typeToString);
+    let keyLabel = mkLabel_("key", "string");
+
+    if (labels == []) {
+      [];
+    } else {
+      [
+        keyLabel,
+        ...labels
+           |> List.filter(((name, _t)) => Utils.startsWith(name, prefix))
+           |> List.map(mkLabel),
+      ];
+    };
+
+  | Cpath(parts) =>
+    let items = parts |> findItems(~exact=false);
     /* TODO(#107): figure out why we're getting duplicates. */
     items
     |> Utils.dedup
@@ -671,19 +708,8 @@ let processCompletable =
        );
 
   | Cpipe(s) =>
-    let getItems = parts =>
-      getItems(
-        ~full,
-        ~package,
-        ~rawOpens,
-        ~getModule=State.fileForModule(state, ~package),
-        ~allModules,
-        ~pos,
-        ~parts,
-      );
-
     let getLhsType = (~lhs, ~partialName) => {
-      switch (getItems([lhs])) {
+      switch ([lhs] |> findItems(~exact=true)) {
       | [(_uri, {SharedTypes.item: Value(t)}), ..._] =>
         Some((t, partialName))
       | _ => None
@@ -701,7 +727,7 @@ let processCompletable =
 
     let removePackageOpens = modulePath =>
       switch (modulePath) {
-      | [toplevel, ...rest] when package.opens |> List.mem(toplevel) => rest
+      | [toplevel, ...rest] when package.TopTypes.opens |> List.mem(toplevel) => rest
       | _ => modulePath
       };
 
@@ -756,7 +782,7 @@ let processCompletable =
           modulePathMinusOpens == ""
             ? name : modulePathMinusOpens ++ "." ++ name;
         let parts = modulePath @ [partialName];
-        let items = getItems(parts);
+        let items = parts |> findItems(~exact=false);
         items
         |> List.filter(((_, {item})) =>
              switch (item) {
@@ -839,19 +865,8 @@ let processCompletable =
     |> List.map(mkDecorator);
 
   | Clabel(funPath, prefix) =>
-    let getItems = parts =>
-      getItems(
-        ~full,
-        ~package,
-        ~rawOpens,
-        ~getModule=State.fileForModule(state, ~package),
-        ~allModules,
-        ~pos,
-        ~parts,
-      );
-
     let labels = {
-      switch (getItems(funPath)) {
+      switch (funPath |> findItems(~exact=true)) {
       | [(_uri, {SharedTypes.item: Value(typ)}), ..._] =>
         let rec getLabels = (t: Types.type_expr) =>
           switch (t.desc) {
@@ -899,15 +914,28 @@ let computeCompletions = (~full, ~maybeText, ~package, ~pos, ~state) => {
           let rawOpens = PartialParser.findOpens(text, offset);
           let allModules =
             package.TopTypes.localModules @ package.dependencyModules;
+          let findItems = (~exact, parts) => {
+            let items =
+              getItems(
+                ~full,
+                ~package,
+                ~rawOpens,
+                ~getModule=State.fileForModule(state, ~package),
+                ~allModules,
+                ~pos,
+                ~parts,
+              );
+            switch (parts |> List.rev) {
+            | [last, ..._] when exact =>
+              items
+              |> List.filter(((_uri, {SharedTypes.name: {txt}})) =>
+                   txt == last
+                 )
+            | _ => items
+            };
+          };
           completable
-          |> processCompletable(
-               ~full,
-               ~package,
-               ~state,
-               ~pos,
-               ~rawOpens,
-               ~allModules,
-             );
+          |> processCompletable(~findItems, ~full, ~package, ~pos, ~rawOpens);
         }
       }
     };

src/rescript-editor-support/PartialParser.re

@@ -170,7 +170,7 @@ type completable =
   | Cdecorator(string) // e.g. @module
   | Clabel(list(string), string) // e.g. (["M", "foo"], "label") for M.foo(...~label...)
   | Cpath(list(string)) // e.g. ["M", "foo"] for M.foo
-  | Cjsx(string, string) // E.g. ["M", "id"] for <M ... id
+  | Cjsx(list(string), string) // E.g. (["M", "Comp"], "id") for <M.Comp ... id
   | Cpipe(string); // E.g. "x->foo"
 
 let findCompletable = (text, offset) => {
@@ -186,10 +186,11 @@ let findCompletable = (text, offset) => {
       let parts = Str.split(Str.regexp_string("."), s);
       let parts = s.[len - 1] == '.' ? parts @ [""] : parts;
       switch (parts) {
-      | [id] when String.lowercase_ascii(id) == id && false /* TODO */ =>
+      | [id] when String.lowercase_ascii(id) == id =>
         switch (findJsxContext(text, offset - len - 1)) {
         | None => Cpath(parts)
-        | Some(componentName) => Cjsx(componentName, id)
+        | Some(componentName) =>
+          Cjsx(Str.split(Str.regexp_string("."), componentName), id)
         }
       | _ => Cpath(parts)
       };