Fix JSX autocomplete tests.

Author: cristianoc

analysis/src/PartialParser.ml

@@ -52,16 +52,16 @@ let findCallFromArgument text offset =
   loop ~i:offset ~nClosed:0
 
 (* skip A or #A if present *)
-let skipOptVariant text i =
-  prerr_endline "skipOptIdent";
+let rec skipOptVariant text i =
   if i > 0 then
     match text.[i] with
     | 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' ->
       let i = startOfLident text i - 1 in
       let i =
-        if i > 0 then match text.[i] with '#' -> i - 1 | _ -> i else i
+        if i > 0 then match text.[i] with '#' | '%' -> i - 1 | _ -> i else i
       in
       i
+    | '%' -> skipOptVariant text (i - 1)
     | _ -> i
   else i
 

analysis/tests/src/Jsx.res

@@ -37,6 +37,6 @@ let y = 44
 
 //^com <M prop=`before${foo}` k
 
-//<M prop=module(@foo Three: X_int) k
+//^com <M prop=module(@foo Three: X_int) k
 
-//<M prop=%bs.raw("1") k
+//^com <M prop=%bs.raw("1") k

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

@@ -71,7 +71,6 @@ Complete tests/src/Jsx.res 11:2
   }]
 
 Complete tests/src/Jsx.res 18:2
-skipOptIdent
 [{
     "label": "key",
     "kind": 4,
@@ -81,7 +80,6 @@ skipOptIdent
   }]
 
 Complete tests/src/Jsx.res 20:2
-skipOptIdent
 [{
     "label": "key",
     "kind": 4,
@@ -91,7 +89,6 @@ skipOptIdent
   }]
 
 Complete tests/src/Jsx.res 22:2
-skipOptIdent
 [{
     "label": "key",
     "kind": 4,
@@ -101,7 +98,6 @@ skipOptIdent
   }]
 
 Complete tests/src/Jsx.res 24:2
-skipOptIdent
 [{
     "label": "key",
     "kind": 4,
@@ -164,3 +160,21 @@ Complete tests/src/Jsx.res 36:2
     "documentation": null
   }]
 
+Complete tests/src/Jsx.res 38:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete tests/src/Jsx.res 40:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+