Fix JSX prop autocomplete special case (#984)

* ensure there is an equal sign present when triggering special cased JSX prop completion * changelog
rescript-lang · May 25, 2024 · 2d8d942 · 2d8d942
1 parent 3375705
commit 2d8d942
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - Fix highlighting of other languages being affected by rescript-vscode. https://github.com/rescript-lang/rescript-vscode/pull/973
 - Use canonicalized URIs/paths for jump to definition. https://github.com/rescript-lang/rescript-vscode/pull/982
+- Fix JSX prop special case in end of JSX element. https://github.com/rescript-lang/rescript-vscode/pull/984
 
 #### :nail_care: Polish
 

diff --git a/analysis/src/CompletionJsx.ml b/analysis/src/CompletionJsx.ml
@@ -909,7 +909,10 @@ let findJsxPropsCompletable ~jsxProps ~endPos ~posBeforeCursor
                  nested = [];
                }))
         else None)
-      else if rest = [] && beforeChildrenStart && charAtCursor = '>' then (
+      else if
+        rest = [] && beforeChildrenStart && charAtCursor = '>'
+        && firstCharBeforeCursorNoWhite = Some '='
+      then (
         (* This is a special case for: <SomeComponent someProp=> (completing directly after the '=').
            The completion comes at the end of the component, after the equals sign, but before any
            children starts, and '>' marks that it's at the end of the component JSX.

diff --git a/analysis/tests/src/CompletionJsx.res b/analysis/tests/src/CompletionJsx.res
@@ -79,3 +79,13 @@ module MultiPropComp = {
 
 // <MultiPropComp name time= age
 //                          ^com
+
+module Info = {
+  @react.component
+  let make = (~_type: [#warning | #info]) => {
+    React.string((_type :> string))
+  }
+}
+
+// <Info _type={#warning} >
+//                        ^com
diff --git a/analysis/tests/src/expected/CompletionJsx.res.txt b/analysis/tests/src/expected/CompletionJsx.res.txt
@@ -600,3 +600,18 @@ Path MultiPropComp.make
     "insertTextFormat": 2
   }]
 
+Complete src/CompletionJsx.res 89:26
+posCursor:[89:26] posNoWhite:[89:24] Found expr:[89:4->89:27]
+JSX <Info:[89:4->89:8] _type[89:9->89:14]=...[89:16->89:24]> _children:89:26
+Completable: Cjsx([Info], "", [_type])
+Package opens Pervasives.JsxModules.place holder
+Resolved opens 1 pervasives
+Path Info.make
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+