More cases of atomic expressions to assigned to props.

Author: cristianoc

analysis/src/PartialParser.ml

@@ -68,8 +68,8 @@ let skipOptVariant text i =
 (* Figure out whether id should be autocompleted as component prop.
    Find JSX context ctx for component M to autocomplete id (already parsed) as a prop.
    ctx ::= <M args id
-   arg ::= id | id = [?] val
-   val ::= id | "abc" | 42 | optVariant {...} | optVariant (...) | <...> | [...]
+   arg ::= id | id = [?] atomicExpr
+   atomicExpr ::= id | "abc" | 'a' | 42 | `...` | optVariant {...} | optVariant (...) | <...> | [...]
    optVariant ::= a | A | #a |  #A |  _nothing_
  *)
 let findJsxContext text offset =
@@ -92,6 +92,12 @@ let findJsxContext text offset =
       | '"' ->
         let i1 = findBack text '"' (i - 1) in
         if i1 > 0 then beforeValue identsSeen i1 else None
+      | '\'' ->
+        let i1 = findBack text '\'' (i - 1) in
+        if i1 > 0 then beforeValue identsSeen i1 else None
+      | '`' ->
+        let i1 = findBack text '`' (i - 1) in
+        if i1 > 0 then beforeValue identsSeen i1 else None
       | _ ->
         let i1 = startOfLident text i in
         let ident = String.sub text i1 (i - i1 + 1) in

analysis/tests/src/Jsx.res

@@ -26,3 +26,17 @@ let y = 44
 //^com <M prop=list{1,2,3} k
 
 //^com <M prop=<N /> k
+
+//^com <M prop=1.5 k
+
+//^com <M prop=0X33 k
+
+//^com <M prop=12e+3 k
+
+//^com <M prop='z' k
+
+//^com <M prop=`before${foo}` k
+
+//<M prop=module(@foo Three: X_int) k
+
+//<M prop=%bs.raw("1") k

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

@@ -119,3 +119,48 @@ Complete tests/src/Jsx.res 26:2
     "documentation": null
   }]
 
+Complete tests/src/Jsx.res 28:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete tests/src/Jsx.res 30:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete tests/src/Jsx.res 32:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete tests/src/Jsx.res 34:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete tests/src/Jsx.res 36:2
+[{
+    "label": "key",
+    "kind": 4,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+