Jsx ast (#7286)

* Intial exploration of JSX ast

Map child expressions

Initial mapping of Pexp_jsx_fragment to 0

Correct location in mapping

Update analysis for jsx_fragment

Remove unused code

Print something for ml print

Commit invalid test results for reference

Try improve printing

Correct fragment range, try and print comments

Indent jsx

Process comments from children inside fragment

Attach comments to fragment tags

Fix comment

Improve comment formatting

Print single element on same line

Update comment

WIP: Debug

More debugging

Works

Fix some jsx printing

Fix the test

Clean up

Update tests with location changes

* Initial mapping from0

* Format code

* Fix jsx fragment mapping

* Remove fragment

* Update test output

* Introducing Pexp_jsx_unary_element & Pexp_jsx_container_element

* Refactor fragment transformation.

* Initial transform of Pexp_jsx_unary_element in automatic mode

* Make props for unary element in automatic mode.

* Initial custom component unary tag

* lowercase container element with children.

* Uppercase container elements

* Streamline automatic element calls

* lowercase container element in classic mode

* Deal with uppercase tags in classic mode.

* Remove old code

* Improve recovery of incomplete jsx tags.
Port frontend completion.

* Correct range of incomplete jsx elements

* Update semantic tokens

* Make the closing tag optional for jsx_container_element.

* Add tighter pattern match for edge case in jsx props completion.

* Update analysis tests for jsx elements ast.

* print_jsx_unary_tag

* Rough print_jsx_container_tag

* Add ml printing

* Wing the sexp thing

* First step towards ast mapping

* prop punning conversion

* Map prop value

* Map prop spreading

* Initial container element mapping.

* Try support children spreading

* Only print space when there are props

* Add space after children.

* Restore braces in props and children

* Inline is_jsx_expression and remove old code

* Better indentation of children

* Handle unary tag

* Refactor

* WIP: Fix unary tag comments handling

* Fix comments inside prop expression

* Formats

* Fix closing tag indentation

* Fix closing tag indentation for cases with break vs inline

* Handle some edge cases

* Refactor

* WIP: Handle punning

* Fix optional printing with braces

* WIP: Handle comments attachment in a different way

* Handle empty props

* Handle props spread

* Fix optional with punning

* Indent props if they don't fit on one line.

* Fix indentation of children when props are multiline.

* Refactor to Pexp_jsx_element

* Don't always append make when uppercase component

* Use Doc.line for child spreading

* Exotic prop name

* Don't create record if only spreading prop, use that expression instead.

* Key prop can be optional

* Keep comment after opening greater than

* Print prop value with comments

* Update generic jsx completion tests

* Revert isJsxComponent

* Assign comment to the opening element tag name.

* Attach comments to closing > and closing tag

* Extract helpers to parsetree_viewer

* setup to walk jsx props

* Correct range for prop spreading

* Complete walk_jsx_prop

* Finish comment assignment for container elements

* Revisit comment attachment for unary tags

* Improve behaviour for comments in unary tag

* Keep location as is for prop spreading

* print leading comments of closing unary token

* Attach comments between empty container tag

* comments between opening and closing tag

* Correct opening_greater_than_doc

* Deal with container element comment edge cases.

* Ensure comments inside braced property values are correct.

* More accurate locations

* Update syntax roundtrip test files

* Update mapping test results

* comment after prop name

* For them older camls

* More older caml stuff

* Remove unreached code in typecore

* Remove leftover comments

* Preserve lines between jsx elements

* Preserve newline between jsx children, streamline jsx fragment children printing

* Update analysis expected

* Another location change in expected

* One more update?

* Remove leftover comments

* Remove obsolete comment

* Ensure fragment starts after arrow

* Add changelog entry

* Add missing Pexp_await

---------

Co-authored-by: Shulhi Sapli <[email protected]>

Author: nojaf

Diff for: CHANGELOG.md

@@ -12,6 +12,9 @@
 
 # 12.0.0-alpha.12 (Unreleased)
 
+#### :house: Internal
+- Better representation of JSX in AST . https://github.com/rescript-lang/rescript/pull/7286
+
 # 12.0.0-alpha.11
 
 #### :bug: Bug fix

Diff for: analysis/src/CompletionFrontEnd.ml

@@ -1233,8 +1233,6 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
                          then ValueOrField
                          else Value);
                     }))
-        | Pexp_construct ({txt = Lident ("::" | "()")}, _) ->
-          (* Ignore list expressions, used in JSX, unit, and more *) ()
         | Pexp_construct (lid, eOpt) -> (
           let lidPath = flattenLidCheckDot lid in
           if debug then
@@ -1325,10 +1323,29 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
                         inJsx = !inJsxContext;
                       }))
             | None -> ())
-        | Pexp_apply {funct = {pexp_desc = Pexp_ident compName}; args}
-          when Res_parsetree_viewer.is_jsx_expression expr ->
+        | Pexp_jsx_element
+            ( Jsx_unary_element
+                {
+                  jsx_unary_element_tag_name = compName;
+                  jsx_unary_element_props = props;
+                }
+            | Jsx_container_element
+                {
+                  jsx_container_element_tag_name_start = compName;
+                  jsx_container_element_props = props;
+                } ) ->
           inJsxContext := true;
-          let jsxProps = CompletionJsx.extractJsxProps ~compName ~args in
+          let children =
+            match expr.pexp_desc with
+            | Pexp_jsx_element
+                (Jsx_container_element
+                   {jsx_container_element_children = children}) ->
+              children
+            | _ -> JSXChildrenItems []
+          in
+          let jsxProps =
+            CompletionJsx.extractJsxProps ~compName ~props ~children
+          in
           let compNamePath = flattenLidCheckDot ~jsx:true compName in
           if debug then
             Printf.printf "JSX <%s:%s %s> _children:%s\n"
@@ -1345,10 +1362,21 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
               | None -> "None"
               | Some childrenPosStart -> Pos.toString childrenPosStart);
           let jsxCompletable =
-            CompletionJsx.findJsxPropsCompletable ~jsxProps
-              ~endPos:(Loc.end_ expr.pexp_loc) ~posBeforeCursor
-              ~posAfterCompName:(Loc.end_ compName.loc)
-              ~firstCharBeforeCursorNoWhite ~charAtCursor
+            match expr.pexp_desc with
+            | Pexp_jsx_element
+                (Jsx_container_element
+                   {
+                     jsx_container_element_closing_tag = None;
+                     jsx_container_element_children =
+                       JSXChildrenSpreading _ | JSXChildrenItems (_ :: _);
+                   }) ->
+              (* This is a weird edge case where there is no closing tag but there are children *)
+              None
+            | _ ->
+              CompletionJsx.findJsxPropsCompletable ~jsxProps
+                ~endPos:(Loc.end_ expr.pexp_loc) ~posBeforeCursor
+                ~posAfterCompName:(Loc.end_ compName.loc)
+                ~firstCharBeforeCursorNoWhite ~charAtCursor
           in
           if jsxCompletable <> None then setResultOpt jsxCompletable
           else if compName.loc |> Loc.hasPos ~pos:posBeforeCursor then