From d7df33b97e483f62a21f0b5a965c762db70bb04e Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Sat, 7 Jan 2023 17:52:54 +0100 Subject: [PATCH 1/8] complete for functions creating React.element when in a JSX context --- analysis/src/CompletionBackEnd.ml | 56 ++- analysis/src/CompletionFrontEnd.ml | 24 +- analysis/src/SharedTypes.ml | 6 +- analysis/src/Utils.ml | 5 + analysis/src/Xform.ml | 9 +- analysis/tests/src/CompletionJsx.res | 37 ++ .../tests/src/expected/CompletionJsx.res.txt | 389 ++++++++++++++++++ 7 files changed, 506 insertions(+), 20 deletions(-) create mode 100644 analysis/tests/src/CompletionJsx.res create mode 100644 analysis/tests/src/expected/CompletionJsx.res.txt diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml index f59cf191b..6b2cef43d 100644 --- a/analysis/src/CompletionBackEnd.ml +++ b/analysis/src/CompletionBackEnd.ml @@ -1477,7 +1477,7 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env else None) | None -> []) | None -> []) - | CPPipe {contextPath = cp; id = funNamePrefix; lhsLoc} -> ( + | CPPipe {contextPath = cp; id = funNamePrefix; lhsLoc; inJsx} -> ( match cp |> getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env @@ -1584,7 +1584,7 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env | None -> None in match completionPath with - | Some completionPath -> + | Some completionPath -> ( let completionPathMinusOpens = completionPath |> removeRawOpens package.opens @@ -1599,14 +1599,50 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env |> getCompletionsForPath ~completionContext:Value ~exact:false ~package ~opens ~allFiles ~pos ~env ~scope in - completions - |> List.map (fun (completion : Completion.t) -> - { - completion with - name = completionName completion.name; - env - (* Restore original env for the completion after x->foo()... *); - }) + let completions = + completions + |> List.map (fun (completion : Completion.t) -> + { + completion with + name = completionName completion.name; + env + (* Restore original env for the completion after x->foo()... *); + }) + in + (* We add React element functions to the completion if we're in a JSX context *) + let forJsxCompletion = + match (inJsx, getTypePath typ) with + | true, Some (Path.Pident id) when Ident.name id = "int" -> Some "int" + | true, Some (Path.Pident id) when Ident.name id = "float" -> + Some "float" + | true, Some (Path.Pident id) when Ident.name id = "string" -> + Some "string" + | true, Some (Path.Pident id) when Ident.name id = "array" -> + (* Make sure the array contains React.element *) + let isReactElementArray = + match typ |> extractType ~env ~package with + | Some (Tarray (_env, payload)) -> ( + match + payload |> getTypePath |> Option.map pathIdentToString + with + | Some "React.element" -> true + | _ -> false) + | _ -> false + in + if isReactElementArray then Some "array" else None + | _ -> None + in + match forJsxCompletion with + | Some builtinNameToComplete + when checkName builtinNameToComplete ~prefix:funNamePrefix + ~exact:false -> + [ + Completion.create + ~name:("React." ^ builtinNameToComplete) + ~kind:(Value typ) ~env; + ] + @ completions + | _ -> completions) | None -> []) | None -> []) | CTuple ctxPaths -> diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml index c54bbc4df..5a49c4cc9 100644 --- a/analysis/src/CompletionFrontEnd.ml +++ b/analysis/src/CompletionFrontEnd.ml @@ -914,6 +914,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = !scope |> Scope.addModule ~name:md.pmd_name.txt ~loc:md.pmd_name.loc in let setLookingForPat ctxPath = lookingForPat := Some ctxPath in + let inJsxContext = ref false in let unsetLookingForPat () = lookingForPat := None in (* Identifies expressions where we can do typed pattern or expr completion. *) @@ -1035,6 +1036,14 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = if not !processed then Ast_iterator.default_iterator.structure_item iterator item in + let value_binding (iterator : Ast_iterator.iterator) + (value_binding : Parsetree.value_binding) = + if + locHasCursor value_binding.pvb_expr.pexp_loc + && Utils.isReactComponent value_binding + then inJsxContext := true; + Ast_iterator.default_iterator.value_binding iterator value_binding + in let signature (iterator : Ast_iterator.iterator) (signature : Parsetree.signature) = let oldScope = !scope in @@ -1125,11 +1134,20 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = match exprToContextPath lhs with | Some pipe -> setResult - (Cpath (CPPipe {contextPath = pipe; id; lhsLoc = lhs.pexp_loc})); + (Cpath + (CPPipe + { + contextPath = pipe; + id; + lhsLoc = lhs.pexp_loc; + inJsx = !inJsxContext; + })); true | None -> false) | Some (pipe, lhsLoc) -> - setResult (Cpath (CPPipe {contextPath = pipe; id; lhsLoc})); + setResult + (Cpath + (CPPipe {contextPath = pipe; id; lhsLoc; inJsx = !inJsxContext})); true in typedCompletionExpr expr; @@ -1201,6 +1219,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = | None -> ()) | Pexp_apply ({pexp_desc = Pexp_ident compName}, args) when Res_parsetree_viewer.isJsxExpression expr -> + inJsxContext := true; let jsxProps = extractJsxProps ~compName ~args in let compNamePath = flattenLidCheckDot ~jsx:true compName in if debug then @@ -1468,6 +1487,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = structure_item; typ; type_kind; + value_binding; } in diff --git a/analysis/src/SharedTypes.ml b/analysis/src/SharedTypes.ml index 38f6a550a..3b4c71227 100644 --- a/analysis/src/SharedTypes.ml +++ b/analysis/src/SharedTypes.ml @@ -546,6 +546,7 @@ module Completable = struct | CPPipe of { contextPath: contextPath; id: string; + inJsx: bool; (** Whether this pipe was found in a JSX context. *) lhsLoc: Location.t; (** The loc item for the left hand side of the pipe. *) } @@ -648,7 +649,10 @@ module Completable = struct completionContextToString completionContext ^ list sl | CPField (cp, s) -> contextPathToString cp ^ "." ^ str s | CPObj (cp, s) -> contextPathToString cp ^ "[\"" ^ s ^ "\"]" - | CPPipe {contextPath; id} -> contextPathToString contextPath ^ "->" ^ id + | CPPipe {contextPath; id; inJsx} -> + contextPathToString contextPath + ^ "->" ^ id + ^ if inJsx then " <>" else "" | CTuple ctxPaths -> "CTuple(" ^ (ctxPaths |> List.map contextPathToString |> String.concat ", ") diff --git a/analysis/src/Utils.ml b/analysis/src/Utils.ml index e51a301f1..d62334bc7 100644 --- a/analysis/src/Utils.ml +++ b/analysis/src/Utils.ml @@ -168,3 +168,8 @@ let rec unwrapIfOption (t : Types.type_expr) = | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> unwrapIfOption t1 | Tconstr (Path.Pident {name = "option"}, [unwrappedType], _) -> unwrappedType | _ -> t +let isReactComponent (vb : Parsetree.value_binding) = + vb.pvb_attributes + |> List.exists (function + | {Location.txt = "react.component"}, _payload -> true + | _ -> false) diff --git a/analysis/src/Xform.ml b/analysis/src/Xform.ml index 198580cb9..dc8fa8cb9 100644 --- a/analysis/src/Xform.ml +++ b/analysis/src/Xform.ml @@ -212,13 +212,8 @@ module AddTypeAnnotation = struct match si.pstr_desc with | Pstr_value (_recFlag, bindings) -> let processBinding (vb : Parsetree.value_binding) = - let isReactComponent = - (* Can't add a type annotation to a react component, or the compiler crashes *) - vb.pvb_attributes - |> List.exists (function - | {Location.txt = "react.component"}, _payload -> true - | _ -> false) - in + (* Can't add a type annotation to a react component, or the compiler crashes *) + let isReactComponent = Utils.isReactComponent vb in if not isReactComponent then processPattern vb.pvb_pat; processFunction vb.pvb_expr in diff --git a/analysis/tests/src/CompletionJsx.res b/analysis/tests/src/CompletionJsx.res new file mode 100644 index 000000000..c89c74f78 --- /dev/null +++ b/analysis/tests/src/CompletionJsx.res @@ -0,0 +1,37 @@ +let someString = "hello" +ignore(someString) + +// someString->st +// ^com + +module SomeComponent = { + @react.component + let make = (~someProp) => { + let someInt = 12 + let someArr = [React.null] + let someInvalidArr = [12] + ignore(someInt) + ignore(someArr) + ignore(someInvalidArr) + // someString->st + // ^com +
+ {React.string(someProp)} +
{React.null}
+ // {someString->st} + // ^com + // {"Some string"->st} + // ^com + // {"Some string"->Js.String2.trim->st} + // ^com + // {someInt->} + // ^com + // {12->} + // ^com + // {someArr->a} + // ^com + // {someInvalidArr->a} + // ^com +
+ } +} diff --git a/analysis/tests/src/expected/CompletionJsx.res.txt b/analysis/tests/src/expected/CompletionJsx.res.txt new file mode 100644 index 000000000..bd2254691 --- /dev/null +++ b/analysis/tests/src/expected/CompletionJsx.res.txt @@ -0,0 +1,389 @@ +Complete src/CompletionJsx.res 3:17 +posCursor:[3:17] posNoWhite:[3:16] Found expr:[3:3->3:17] +Completable: Cpath Value[someString]->st +[{ + "label": "Js.String2.startsWith", + "kind": 12, + "tags": [], + "detail": "(t, t) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWith(\"BuckleScript\", \"Buckle\") == true\nJs.String2.startsWith(\"BuckleScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Buckle\") == false\n```\n"} + }, { + "label": "Js.String2.startsWithFrom", + "kind": 12, + "tags": [], + "detail": "(t, t, int) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} + }] + +Complete src/CompletionJsx.res 15:21 +posCursor:[15:21] posNoWhite:[15:20] Found expr:[8:13->35:3] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[9:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[10:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[11:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[12:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[13:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[14:4->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[15:7->34:10] +posCursor:[15:21] posNoWhite:[15:20] Found expr:[15:7->15:21] +Completable: Cpath Value[someString]->st <> +[{ + "label": "React.string", + "kind": 12, + "tags": [], + "detail": "string", + "documentation": null + }, { + "label": "Js.String2.startsWith", + "kind": 12, + "tags": [], + "detail": "(t, t) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWith(\"BuckleScript\", \"Buckle\") == true\nJs.String2.startsWith(\"BuckleScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Buckle\") == false\n```\n"} + }, { + "label": "Js.String2.startsWithFrom", + "kind": 12, + "tags": [], + "detail": "(t, t, int) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} + }] + +Complete src/CompletionJsx.res 20:24 +posCursor:[20:24] posNoWhite:[20:23] Found expr:[8:13->35:3] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[9:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[10:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[11:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[12:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[13:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[14:4->34:10] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[20:24] posNoWhite:[20:23] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[18:7->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[19:7->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->34:4] +Pexp_construct :::[20:10->34:4] [20:10->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->34:4] +posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->20:24] +Completable: Cpath Value[someString]->st <> +[{ + "label": "React.string", + "kind": 12, + "tags": [], + "detail": "string", + "documentation": null + }, { + "label": "Js.String2.startsWith", + "kind": 12, + "tags": [], + "detail": "(t, t) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWith(\"BuckleScript\", \"Buckle\") == true\nJs.String2.startsWith(\"BuckleScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Buckle\") == false\n```\n"} + }, { + "label": "Js.String2.startsWithFrom", + "kind": 12, + "tags": [], + "detail": "(t, t, int) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} + }] + +Complete src/CompletionJsx.res 22:27 +posCursor:[22:27] posNoWhite:[22:26] Found expr:[8:13->35:3] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[9:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[10:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[11:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[12:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[13:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[14:4->34:10] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[22:27] posNoWhite:[22:26] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[18:7->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[19:7->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->34:4] +Pexp_construct :::[22:10->34:4] [22:10->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->34:4] +posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->22:27] +Completable: Cpath string->st <> +[{ + "label": "React.string", + "kind": 12, + "tags": [], + "detail": "string", + "documentation": null + }, { + "label": "Js.String2.startsWith", + "kind": 12, + "tags": [], + "detail": "(t, t) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWith(\"BuckleScript\", \"Buckle\") == true\nJs.String2.startsWith(\"BuckleScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Buckle\") == false\n```\n"} + }, { + "label": "Js.String2.startsWithFrom", + "kind": 12, + "tags": [], + "detail": "(t, t, int) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} + }] + +Complete src/CompletionJsx.res 24:44 +posCursor:[24:44] posNoWhite:[24:43] Found expr:[8:13->35:3] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[9:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[10:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[11:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[12:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[13:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[14:4->34:10] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[24:44] posNoWhite:[24:43] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[18:7->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[19:7->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->34:4] +Pexp_construct :::[24:10->34:4] [24:10->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->34:4] +posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->24:44] +Completable: Cpath Value[Js, String2, trim](Nolabel)->st <> +[{ + "label": "React.string", + "kind": 12, + "tags": [], + "detail": "string", + "documentation": null + }, { + "label": "Js.String2.startsWith", + "kind": 12, + "tags": [], + "detail": "(t, t) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWith(\"BuckleScript\", \"Buckle\") == true\nJs.String2.startsWith(\"BuckleScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Buckle\") == false\n```\n"} + }, { + "label": "Js.String2.startsWithFrom", + "kind": 12, + "tags": [], + "detail": "(t, t, int) => bool", + "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} + }] + +Complete src/CompletionJsx.res 26:19 +posCursor:[26:19] posNoWhite:[26:18] Found expr:[8:13->35:3] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[9:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[10:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[11:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[12:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[13:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[14:4->34:10] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[26:19] posNoWhite:[26:18] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[18:7->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[19:7->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->34:4] +Pexp_construct :::[26:10->34:4] [26:10->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->34:4] +posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->0:-1] +Completable: Cpath Value[someInt]-> <> +[{ + "label": "React.int", + "kind": 12, + "tags": [], + "detail": "int", + "documentation": null + }, { + "label": "Belt.Int.fromString", + "kind": 12, + "tags": [], + "detail": "string => option", + "documentation": {"kind": "markdown", "value": "\n Converts a given `string` to an `int`. Returns `Some(int)` when the input is a number, `None` otherwise.\n\n ```res example\n Js.log(Belt.Int.fromString(\"1\") === Some(1)) /* true */\n ```\n"} + }, { + "label": "Belt.Int.*", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Multiplication of two `int` values. Same as the multiplication from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 * 2 === 4) /* true */\n ```\n"} + }, { + "label": "Belt.Int./", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Division of two `int` values. Same as the division from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(4 / 2 === 2); /* true */\n ```\n"} + }, { + "label": "Belt.Int.toString", + "kind": 12, + "tags": [], + "detail": "int => string", + "documentation": {"kind": "markdown", "value": "\n Converts a given `int` to a `string`. Uses the JavaScript `String` constructor under the hood.\n\n ```res example\n Js.log(Belt.Int.toString(1) === \"1\") /* true */\n ```\n"} + }, { + "label": "Belt.Int.toFloat", + "kind": 12, + "tags": [], + "detail": "int => float", + "documentation": {"kind": "markdown", "value": "\n Converts a given `int` to a `float`.\n\n ```res example\n Js.log(Belt.Int.toFloat(1) === 1.0) /* true */\n ```\n"} + }, { + "label": "Belt.Int.fromFloat", + "kind": 12, + "tags": [], + "detail": "float => int", + "documentation": {"kind": "markdown", "value": "\n Converts a given `float` to an `int`.\n\n ```res example\n Js.log(Belt.Int.fromFloat(1.0) === 1) /* true */\n ```\n"} + }, { + "label": "Belt.Int.-", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Subtraction of two `int` values. Same as the subtraction from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 - 1 === 1) /* true */\n ```\n"} + }, { + "label": "Belt.Int.+", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Addition of two `int` values. Same as the addition from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 + 2 === 4) /* true */\n ```\n"} + }] + +Complete src/CompletionJsx.res 28:14 +posCursor:[28:14] posNoWhite:[28:13] Found expr:[8:13->35:3] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[9:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[10:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[11:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[12:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[13:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[14:4->34:10] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[28:14] posNoWhite:[28:13] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[18:7->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[19:7->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->34:4] +Pexp_construct :::[28:10->34:4] [28:10->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->34:4] +posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->0:-1] +Completable: Cpath int-> <> +[{ + "label": "React.int", + "kind": 12, + "tags": [], + "detail": "int", + "documentation": null + }, { + "label": "Belt.Int.fromString", + "kind": 12, + "tags": [], + "detail": "string => option", + "documentation": {"kind": "markdown", "value": "\n Converts a given `string` to an `int`. Returns `Some(int)` when the input is a number, `None` otherwise.\n\n ```res example\n Js.log(Belt.Int.fromString(\"1\") === Some(1)) /* true */\n ```\n"} + }, { + "label": "Belt.Int.*", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Multiplication of two `int` values. Same as the multiplication from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 * 2 === 4) /* true */\n ```\n"} + }, { + "label": "Belt.Int./", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Division of two `int` values. Same as the division from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(4 / 2 === 2); /* true */\n ```\n"} + }, { + "label": "Belt.Int.toString", + "kind": 12, + "tags": [], + "detail": "int => string", + "documentation": {"kind": "markdown", "value": "\n Converts a given `int` to a `string`. Uses the JavaScript `String` constructor under the hood.\n\n ```res example\n Js.log(Belt.Int.toString(1) === \"1\") /* true */\n ```\n"} + }, { + "label": "Belt.Int.toFloat", + "kind": 12, + "tags": [], + "detail": "int => float", + "documentation": {"kind": "markdown", "value": "\n Converts a given `int` to a `float`.\n\n ```res example\n Js.log(Belt.Int.toFloat(1) === 1.0) /* true */\n ```\n"} + }, { + "label": "Belt.Int.fromFloat", + "kind": 12, + "tags": [], + "detail": "float => int", + "documentation": {"kind": "markdown", "value": "\n Converts a given `float` to an `int`.\n\n ```res example\n Js.log(Belt.Int.fromFloat(1.0) === 1) /* true */\n ```\n"} + }, { + "label": "Belt.Int.-", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Subtraction of two `int` values. Same as the subtraction from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 - 1 === 1) /* true */\n ```\n"} + }, { + "label": "Belt.Int.+", + "kind": 12, + "tags": [], + "detail": "(int, int) => int", + "documentation": {"kind": "markdown", "value": "\n Addition of two `int` values. Same as the addition from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 + 2 === 4) /* true */\n ```\n"} + }] + +Complete src/CompletionJsx.res 30:20 +posCursor:[30:20] posNoWhite:[30:19] Found expr:[8:13->35:3] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[9:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[10:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[11:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[12:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[13:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[14:4->34:10] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[30:20] posNoWhite:[30:19] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[18:7->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[19:7->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->34:4] +Pexp_construct :::[30:10->34:4] [30:10->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->34:4] +posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->30:20] +Completable: Cpath Value[someArr]->a <> +[{ + "label": "React.array", + "kind": 12, + "tags": [], + "detail": "array", + "documentation": null + }, { + "label": "Js.Array2.append", + "kind": 12, + "tags": [1], + "detail": "(t<'a>, 'a) => t<'a>", + "documentation": {"kind": "markdown", "value": "Deprecated: `append` is not type-safe. Use `concat` instead.\n\n"} + }] + +Complete src/CompletionJsx.res 32:27 +posCursor:[32:27] posNoWhite:[32:26] Found expr:[8:13->35:3] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[9:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[10:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[11:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[12:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[13:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[14:4->34:10] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[17:5->34:10] +JSX 17:8] > _children:17:8 +posCursor:[32:27] posNoWhite:[32:26] Found expr:[17:8->34:4] +Pexp_construct :::[18:7->34:4] [18:7->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[18:7->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[19:7->34:4] +Pexp_construct :::[19:7->34:4] [19:7->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[19:7->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->34:4] +Pexp_construct :::[32:10->34:4] [32:10->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->34:4] +posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->32:27] +Completable: Cpath Value[someInvalidArr]->a <> +[{ + "label": "Js.Array2.append", + "kind": 12, + "tags": [1], + "detail": "(t<'a>, 'a) => t<'a>", + "documentation": {"kind": "markdown", "value": "Deprecated: `append` is not type-safe. Use `concat` instead.\n\n"} + }] + From a3fa3649e2f455d2e9ef2309c5b95d6a737796bc Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Tue, 10 Jan 2023 20:59:35 +0100 Subject: [PATCH 2/8] simplify by skipping check on whether array contains React.element --- analysis/src/CompletionBackEnd.ml | 13 +- analysis/tests/src/CompletionJsx.res | 4 - .../tests/src/expected/CompletionJsx.res.txt | 275 ++++++++---------- 3 files changed, 117 insertions(+), 175 deletions(-) diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml index 6b2cef43d..68155dffd 100644 --- a/analysis/src/CompletionBackEnd.ml +++ b/analysis/src/CompletionBackEnd.ml @@ -1618,18 +1618,7 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env | true, Some (Path.Pident id) when Ident.name id = "string" -> Some "string" | true, Some (Path.Pident id) when Ident.name id = "array" -> - (* Make sure the array contains React.element *) - let isReactElementArray = - match typ |> extractType ~env ~package with - | Some (Tarray (_env, payload)) -> ( - match - payload |> getTypePath |> Option.map pathIdentToString - with - | Some "React.element" -> true - | _ -> false) - | _ -> false - in - if isReactElementArray then Some "array" else None + Some "array" | _ -> None in match forJsxCompletion with diff --git a/analysis/tests/src/CompletionJsx.res b/analysis/tests/src/CompletionJsx.res index c89c74f78..c08889d8b 100644 --- a/analysis/tests/src/CompletionJsx.res +++ b/analysis/tests/src/CompletionJsx.res @@ -9,10 +9,8 @@ module SomeComponent = { let make = (~someProp) => { let someInt = 12 let someArr = [React.null] - let someInvalidArr = [12] ignore(someInt) ignore(someArr) - ignore(someInvalidArr) // someString->st // ^com
@@ -30,8 +28,6 @@ module SomeComponent = { // ^com // {someArr->a} // ^com - // {someInvalidArr->a} - // ^com
} } diff --git a/analysis/tests/src/expected/CompletionJsx.res.txt b/analysis/tests/src/expected/CompletionJsx.res.txt index bd2254691..b6b56a49c 100644 --- a/analysis/tests/src/expected/CompletionJsx.res.txt +++ b/analysis/tests/src/expected/CompletionJsx.res.txt @@ -15,16 +15,14 @@ Completable: Cpath Value[someString]->st "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} }] -Complete src/CompletionJsx.res 15:21 -posCursor:[15:21] posNoWhite:[15:20] Found expr:[8:13->35:3] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[9:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[10:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[11:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[12:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[13:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[14:4->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[15:7->34:10] -posCursor:[15:21] posNoWhite:[15:20] Found expr:[15:7->15:21] +Complete src/CompletionJsx.res 13:21 +posCursor:[13:21] posNoWhite:[13:20] Found expr:[8:13->31:3] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[9:4->30:10] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[10:4->30:10] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[11:4->30:10] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[12:4->30:10] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[13:7->30:10] +posCursor:[13:21] posNoWhite:[13:20] Found expr:[13:7->13:21] Completable: Cpath Value[someString]->st <> [{ "label": "React.string", @@ -46,26 +44,24 @@ Completable: Cpath Value[someString]->st <> "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} }] -Complete src/CompletionJsx.res 20:24 -posCursor:[20:24] posNoWhite:[20:23] Found expr:[8:13->35:3] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[9:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[10:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[11:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[12:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[13:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[14:4->34:10] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[20:24] posNoWhite:[20:23] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[18:7->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[19:7->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->34:4] -Pexp_construct :::[20:10->34:4] [20:10->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->34:4] -posCursor:[20:24] posNoWhite:[20:23] Found expr:[20:10->20:24] +Complete src/CompletionJsx.res 18:24 +posCursor:[18:24] posNoWhite:[18:23] Found expr:[8:13->31:3] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[9:4->30:10] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[10:4->30:10] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[11:4->30:10] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[12:4->30:10] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[18:24] posNoWhite:[18:23] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[16:7->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[17:7->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[18:10->30:4] +Pexp_construct :::[18:10->30:4] [18:10->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[18:10->30:4] +posCursor:[18:24] posNoWhite:[18:23] Found expr:[18:10->18:24] Completable: Cpath Value[someString]->st <> [{ "label": "React.string", @@ -87,26 +83,24 @@ Completable: Cpath Value[someString]->st <> "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} }] -Complete src/CompletionJsx.res 22:27 -posCursor:[22:27] posNoWhite:[22:26] Found expr:[8:13->35:3] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[9:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[10:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[11:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[12:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[13:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[14:4->34:10] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[22:27] posNoWhite:[22:26] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[18:7->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[19:7->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->34:4] -Pexp_construct :::[22:10->34:4] [22:10->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->34:4] -posCursor:[22:27] posNoWhite:[22:26] Found expr:[22:10->22:27] +Complete src/CompletionJsx.res 20:27 +posCursor:[20:27] posNoWhite:[20:26] Found expr:[8:13->31:3] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[9:4->30:10] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[10:4->30:10] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[11:4->30:10] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[12:4->30:10] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[20:27] posNoWhite:[20:26] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[16:7->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[17:7->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[20:10->30:4] +Pexp_construct :::[20:10->30:4] [20:10->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[20:10->30:4] +posCursor:[20:27] posNoWhite:[20:26] Found expr:[20:10->20:27] Completable: Cpath string->st <> [{ "label": "React.string", @@ -128,26 +122,24 @@ Completable: Cpath string->st <> "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} }] -Complete src/CompletionJsx.res 24:44 -posCursor:[24:44] posNoWhite:[24:43] Found expr:[8:13->35:3] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[9:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[10:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[11:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[12:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[13:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[14:4->34:10] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[24:44] posNoWhite:[24:43] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[18:7->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[19:7->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->34:4] -Pexp_construct :::[24:10->34:4] [24:10->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->34:4] -posCursor:[24:44] posNoWhite:[24:43] Found expr:[24:10->24:44] +Complete src/CompletionJsx.res 22:44 +posCursor:[22:44] posNoWhite:[22:43] Found expr:[8:13->31:3] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[9:4->30:10] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[10:4->30:10] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[11:4->30:10] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[12:4->30:10] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[22:44] posNoWhite:[22:43] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[16:7->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[17:7->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[22:10->30:4] +Pexp_construct :::[22:10->30:4] [22:10->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[22:10->30:4] +posCursor:[22:44] posNoWhite:[22:43] Found expr:[22:10->22:44] Completable: Cpath Value[Js, String2, trim](Nolabel)->st <> [{ "label": "React.string", @@ -169,26 +161,24 @@ Completable: Cpath Value[Js, String2, trim](Nolabel)->st <> "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n```res example\nJs.String2.startsWithFrom(\"BuckleScript\", \"kle\", 3) == true\nJs.String2.startsWithFrom(\"BuckleScript\", \"\", 3) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Buckle\", 2) == false\n```\n"} }] -Complete src/CompletionJsx.res 26:19 -posCursor:[26:19] posNoWhite:[26:18] Found expr:[8:13->35:3] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[9:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[10:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[11:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[12:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[13:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[14:4->34:10] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[26:19] posNoWhite:[26:18] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[18:7->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[19:7->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->34:4] -Pexp_construct :::[26:10->34:4] [26:10->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->34:4] -posCursor:[26:19] posNoWhite:[26:18] Found expr:[26:10->0:-1] +Complete src/CompletionJsx.res 24:19 +posCursor:[24:19] posNoWhite:[24:18] Found expr:[8:13->31:3] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[9:4->30:10] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[10:4->30:10] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[11:4->30:10] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[12:4->30:10] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[24:19] posNoWhite:[24:18] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[16:7->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[17:7->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[24:10->30:4] +Pexp_construct :::[24:10->30:4] [24:10->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[24:10->30:4] +posCursor:[24:19] posNoWhite:[24:18] Found expr:[24:10->0:-1] Completable: Cpath Value[someInt]-> <> [{ "label": "React.int", @@ -246,26 +236,24 @@ Completable: Cpath Value[someInt]-> <> "documentation": {"kind": "markdown", "value": "\n Addition of two `int` values. Same as the addition from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 + 2 === 4) /* true */\n ```\n"} }] -Complete src/CompletionJsx.res 28:14 -posCursor:[28:14] posNoWhite:[28:13] Found expr:[8:13->35:3] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[9:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[10:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[11:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[12:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[13:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[14:4->34:10] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[28:14] posNoWhite:[28:13] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[18:7->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[19:7->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->34:4] -Pexp_construct :::[28:10->34:4] [28:10->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->34:4] -posCursor:[28:14] posNoWhite:[28:13] Found expr:[28:10->0:-1] +Complete src/CompletionJsx.res 26:14 +posCursor:[26:14] posNoWhite:[26:13] Found expr:[8:13->31:3] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[9:4->30:10] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[10:4->30:10] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[11:4->30:10] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[12:4->30:10] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[26:14] posNoWhite:[26:13] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[16:7->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[17:7->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[26:10->30:4] +Pexp_construct :::[26:10->30:4] [26:10->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[26:10->30:4] +posCursor:[26:14] posNoWhite:[26:13] Found expr:[26:10->0:-1] Completable: Cpath int-> <> [{ "label": "React.int", @@ -323,26 +311,24 @@ Completable: Cpath int-> <> "documentation": {"kind": "markdown", "value": "\n Addition of two `int` values. Same as the addition from `Pervasives`.\n\n ```res example\n open Belt.Int\n Js.log(2 + 2 === 4) /* true */\n ```\n"} }] -Complete src/CompletionJsx.res 30:20 -posCursor:[30:20] posNoWhite:[30:19] Found expr:[8:13->35:3] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[9:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[10:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[11:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[12:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[13:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[14:4->34:10] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[30:20] posNoWhite:[30:19] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[18:7->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[19:7->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->34:4] -Pexp_construct :::[30:10->34:4] [30:10->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->34:4] -posCursor:[30:20] posNoWhite:[30:19] Found expr:[30:10->30:20] +Complete src/CompletionJsx.res 28:20 +posCursor:[28:20] posNoWhite:[28:19] Found expr:[8:13->31:3] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[9:4->30:10] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[10:4->30:10] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[11:4->30:10] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[12:4->30:10] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[15:5->30:10] +JSX 15:8] > _children:15:8 +posCursor:[28:20] posNoWhite:[28:19] Found expr:[15:8->30:4] +Pexp_construct :::[16:7->30:4] [16:7->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[16:7->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[17:7->30:4] +Pexp_construct :::[17:7->30:4] [17:7->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[17:7->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[28:10->30:4] +Pexp_construct :::[28:10->30:4] [28:10->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[28:10->30:4] +posCursor:[28:20] posNoWhite:[28:19] Found expr:[28:10->28:20] Completable: Cpath Value[someArr]->a <> [{ "label": "React.array", @@ -358,32 +344,3 @@ Completable: Cpath Value[someArr]->a <> "documentation": {"kind": "markdown", "value": "Deprecated: `append` is not type-safe. Use `concat` instead.\n\n"} }] -Complete src/CompletionJsx.res 32:27 -posCursor:[32:27] posNoWhite:[32:26] Found expr:[8:13->35:3] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[9:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[10:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[11:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[12:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[13:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[14:4->34:10] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[17:5->34:10] -JSX 17:8] > _children:17:8 -posCursor:[32:27] posNoWhite:[32:26] Found expr:[17:8->34:4] -Pexp_construct :::[18:7->34:4] [18:7->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[18:7->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[19:7->34:4] -Pexp_construct :::[19:7->34:4] [19:7->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[19:7->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->34:4] -Pexp_construct :::[32:10->34:4] [32:10->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->34:4] -posCursor:[32:27] posNoWhite:[32:26] Found expr:[32:10->32:27] -Completable: Cpath Value[someInvalidArr]->a <> -[{ - "label": "Js.Array2.append", - "kind": 12, - "tags": [1], - "detail": "(t<'a>, 'a) => t<'a>", - "documentation": {"kind": "markdown", "value": "Deprecated: `append` is not type-safe. Use `concat` instead.\n\n"} - }] - From 25b4f3b219f8f7726121a1593934bf530a3e29c3 Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Tue, 10 Jan 2023 21:00:38 +0100 Subject: [PATCH 3/8] simplify --- analysis/src/CompletionBackEnd.ml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml index 68155dffd..eac272ddc 100644 --- a/analysis/src/CompletionBackEnd.ml +++ b/analysis/src/CompletionBackEnd.ml @@ -1611,15 +1611,15 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env in (* We add React element functions to the completion if we're in a JSX context *) let forJsxCompletion = - match (inJsx, getTypePath typ) with - | true, Some (Path.Pident id) when Ident.name id = "int" -> Some "int" - | true, Some (Path.Pident id) when Ident.name id = "float" -> - Some "float" - | true, Some (Path.Pident id) when Ident.name id = "string" -> - Some "string" - | true, Some (Path.Pident id) when Ident.name id = "array" -> - Some "array" - | _ -> None + if inJsx then + match getTypePath typ with + | Some (Path.Pident id) when Ident.name id = "int" -> Some "int" + | Some (Path.Pident id) when Ident.name id = "float" -> Some "float" + | Some (Path.Pident id) when Ident.name id = "string" -> + Some "string" + | Some (Path.Pident id) when Ident.name id = "array" -> Some "array" + | _ -> None + else None in match forJsxCompletion with | Some builtinNameToComplete From a5dfd94fc87adb4c40f19a9172c0cf0631a75b25 Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Tue, 10 Jan 2023 21:03:44 +0100 Subject: [PATCH 4/8] small docs for React.element methods --- analysis/src/CompletionBackEnd.ml | 10 +++++++-- analysis/src/SharedTypes.ml | 5 +++-- .../tests/src/expected/CompletionJsx.res.txt | 21 ++++++++++++------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml index eac272ddc..57220a96a 100644 --- a/analysis/src/CompletionBackEnd.ml +++ b/analysis/src/CompletionBackEnd.ml @@ -1626,9 +1626,15 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env when checkName builtinNameToComplete ~prefix:funNamePrefix ~exact:false -> [ - Completion.create + Completion.createWithSnippet ~name:("React." ^ builtinNameToComplete) - ~kind:(Value typ) ~env; + ~kind:(Value typ) ~env + ~docstring: + [ + "Turns `" ^ builtinNameToComplete + ^ "` into `React.element` so it can be used inside of JSX."; + ] + (); ] @ completions | _ -> completions) diff --git a/analysis/src/SharedTypes.ml b/analysis/src/SharedTypes.ml index 3b4c71227..a9962c62f 100644 --- a/analysis/src/SharedTypes.ml +++ b/analysis/src/SharedTypes.ml @@ -316,12 +316,13 @@ module Completion = struct insertTextFormat = None; } - let createWithSnippet ~name ?insertText ~kind ~env ?sortText () = + let createWithSnippet ~name ?insertText ~kind ~env ?sortText ?(docstring = []) + () = { name; env; deprecated = None; - docstring = []; + docstring; kind; sortText; insertText; diff --git a/analysis/tests/src/expected/CompletionJsx.res.txt b/analysis/tests/src/expected/CompletionJsx.res.txt index b6b56a49c..774584593 100644 --- a/analysis/tests/src/expected/CompletionJsx.res.txt +++ b/analysis/tests/src/expected/CompletionJsx.res.txt @@ -29,7 +29,8 @@ Completable: Cpath Value[someString]->st <> "kind": 12, "tags": [], "detail": "string", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", "kind": 12, @@ -68,7 +69,8 @@ Completable: Cpath Value[someString]->st <> "kind": 12, "tags": [], "detail": "string", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", "kind": 12, @@ -107,7 +109,8 @@ Completable: Cpath string->st <> "kind": 12, "tags": [], "detail": "string", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", "kind": 12, @@ -146,7 +149,8 @@ Completable: Cpath Value[Js, String2, trim](Nolabel)->st <> "kind": 12, "tags": [], "detail": "string", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", "kind": 12, @@ -185,7 +189,8 @@ Completable: Cpath Value[someInt]-> <> "kind": 12, "tags": [], "detail": "int", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `int` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Belt.Int.fromString", "kind": 12, @@ -260,7 +265,8 @@ Completable: Cpath int-> <> "kind": 12, "tags": [], "detail": "int", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `int` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Belt.Int.fromString", "kind": 12, @@ -335,7 +341,8 @@ Completable: Cpath Value[someArr]->a <> "kind": 12, "tags": [], "detail": "array", - "documentation": null + "documentation": {"kind": "markdown", "value": "Turns `array` into `React.element` so it can be used inside of JSX."}, + "insertTextFormat": 2 }, { "label": "Js.Array2.append", "kind": 12, From 1f7ac4487a07bbd11f53fc5fd74b811f9124c47e Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Tue, 10 Jan 2023 21:09:58 +0100 Subject: [PATCH 5/8] set/unset jsx context marker --- analysis/src/CompletionFrontEnd.ml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml index 5a49c4cc9..cb72af15b 100644 --- a/analysis/src/CompletionFrontEnd.ml +++ b/analysis/src/CompletionFrontEnd.ml @@ -1038,11 +1038,10 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = in let value_binding (iterator : Ast_iterator.iterator) (value_binding : Parsetree.value_binding) = - if - locHasCursor value_binding.pvb_expr.pexp_loc - && Utils.isReactComponent value_binding - then inJsxContext := true; - Ast_iterator.default_iterator.value_binding iterator value_binding + let oldInJsxContext = !inJsxContext in + if Utils.isReactComponent value_binding then inJsxContext := true; + Ast_iterator.default_iterator.value_binding iterator value_binding; + inJsxContext := oldInJsxContext in let signature (iterator : Ast_iterator.iterator) (signature : Parsetree.signature) = @@ -1120,6 +1119,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = Ast_iterator.default_iterator.attribute iterator (id, payload) in let expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression) = + let oldInJsxContext = !inJsxContext in let processed = ref false in let setFound () = found := true; @@ -1379,6 +1379,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = processed := true | _ -> ()); if not !processed then Ast_iterator.default_iterator.expr iterator expr + else inJsxContext := oldInJsxContext in let typ (iterator : Ast_iterator.iterator) (core_type : Parsetree.core_type) = if core_type.ptyp_loc |> Loc.hasPos ~pos:posNoWhite then ( From a10280d9e1494897e8d0e502c68405df12496706 Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Wed, 11 Jan 2023 16:26:12 +0100 Subject: [PATCH 6/8] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31525ffea..98d114866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Add support for completion in patterns. https://github.com/rescript-lang/rescript-vscode/pull/670 - Add support for pattern completion of unsaved tuples. https://github.com/rescript-lang/rescript-vscode/pull/679 - Add support for completion in typed expressions. https://github.com/rescript-lang/rescript-vscode/pull/682 +- Complete for `React.element` creator functions (`React.string` etc) when in JSX context. https://github.com/rescript-lang/rescript-vscode/pull/681 #### :nail_care: Polish From 3e1212413eb4c17d9c45e13434df8d878302e826 Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Wed, 11 Jan 2023 18:03:50 +0100 Subject: [PATCH 7/8] always restore jsx context --- analysis/src/CompletionFrontEnd.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml index cb72af15b..d42f8f448 100644 --- a/analysis/src/CompletionFrontEnd.ml +++ b/analysis/src/CompletionFrontEnd.ml @@ -1378,8 +1378,8 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text = scope := oldScope; processed := true | _ -> ()); - if not !processed then Ast_iterator.default_iterator.expr iterator expr - else inJsxContext := oldInJsxContext + if not !processed then Ast_iterator.default_iterator.expr iterator expr; + inJsxContext := oldInJsxContext in let typ (iterator : Ast_iterator.iterator) (core_type : Parsetree.core_type) = if core_type.ptyp_loc |> Loc.hasPos ~pos:posNoWhite then ( From b0bec9da45d8ef08ce5a57e3d0f1c41bea4d2f7e Mon Sep 17 00:00:00 2001 From: Gabriel Nordeborn Date: Wed, 11 Jan 2023 18:20:39 +0100 Subject: [PATCH 8/8] sort React.element functions on top --- analysis/src/CompletionBackEnd.ml | 2 +- analysis/tests/src/expected/CompletionJsx.res.txt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml index 57220a96a..bf9bf65f0 100644 --- a/analysis/src/CompletionBackEnd.ml +++ b/analysis/src/CompletionBackEnd.ml @@ -1628,7 +1628,7 @@ let rec getCompletionsForContextPath ~full ~opens ~rawOpens ~allFiles ~pos ~env [ Completion.createWithSnippet ~name:("React." ^ builtinNameToComplete) - ~kind:(Value typ) ~env + ~kind:(Value typ) ~env ~sortText:"A" ~docstring: [ "Turns `" ^ builtinNameToComplete diff --git a/analysis/tests/src/expected/CompletionJsx.res.txt b/analysis/tests/src/expected/CompletionJsx.res.txt index 774584593..133aeaec9 100644 --- a/analysis/tests/src/expected/CompletionJsx.res.txt +++ b/analysis/tests/src/expected/CompletionJsx.res.txt @@ -30,6 +30,7 @@ Completable: Cpath Value[someString]->st <> "tags": [], "detail": "string", "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", @@ -70,6 +71,7 @@ Completable: Cpath Value[someString]->st <> "tags": [], "detail": "string", "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", @@ -110,6 +112,7 @@ Completable: Cpath string->st <> "tags": [], "detail": "string", "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", @@ -150,6 +153,7 @@ Completable: Cpath Value[Js, String2, trim](Nolabel)->st <> "tags": [], "detail": "string", "documentation": {"kind": "markdown", "value": "Turns `string` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Js.String2.startsWith", @@ -190,6 +194,7 @@ Completable: Cpath Value[someInt]-> <> "tags": [], "detail": "int", "documentation": {"kind": "markdown", "value": "Turns `int` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Belt.Int.fromString", @@ -266,6 +271,7 @@ Completable: Cpath int-> <> "tags": [], "detail": "int", "documentation": {"kind": "markdown", "value": "Turns `int` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Belt.Int.fromString", @@ -342,6 +348,7 @@ Completable: Cpath Value[someArr]->a <> "tags": [], "detail": "array", "documentation": {"kind": "markdown", "value": "Turns `array` into `React.element` so it can be used inside of JSX."}, + "sortText": "A", "insertTextFormat": 2 }, { "label": "Js.Array2.append",