Merge pull request #1690 from DanielXMoore/bind-jsx

Fix bind property shorthand in JSX

source/parser.hera

@@ -1868,6 +1868,7 @@ PropertyGlob
 
 PropertyBind
   # NOTE: foo@.bar and foo@bar shorthand for foo.bar.bind(foo)
+  # foo@bar(baz) shorthand for foo.bar.bind(foo, baz)
   PropertyAccessModifier?:modifier At OptionalDot:dot ( IdentifierName / PrivateIdentifier ):id Arguments?:args ->
     return {
       type: "PropertyBind",
@@ -1876,6 +1877,16 @@ PropertyBind
       args: args?.children.slice(1, -1) ?? [], // remove the parens from the arg list, or give an empty list
     }
 
+# Variation on PropertyBind that forbids implicit arguments (for JSX)
+PropertyBindExplicitArguments
+  PropertyAccessModifier?:modifier At OptionalDot:dot ( IdentifierName / PrivateIdentifier ):id ExplicitArguments?:args ->
+    return {
+      type: "PropertyBind",
+      name: id.name,
+      children: [modifier, dot, id],  // omit `@` from children
+      args: args?.children.slice(1, -1) ?? [], // remove the parens from the arg list, or give an empty list
+    }
+
 SuperProperty
   Super MemberBracketContent
   Super !PropertyAccessModifier PropertyAccess
@@ -7529,7 +7540,7 @@ InlineJSXMemberExpressionRest
     return [...comments, content]
   PropertyAccess
   PropertyGlob
-  PropertyBind
+  PropertyBindExplicitArguments
   NonNullAssertion
 
 # Subset of PrimaryExpression; omissions documented below.

test/jsx/attr.civet

@@ -131,6 +131,22 @@ describe "braced JSX attributes", ->
     <Component x={a.b.bind(a)} />
   """
 
+  testCase """
+    bind shorthand explicit argument
+    ---
+    <Component x=a@b(c) />
+    ---
+    <Component x={a.b.bind(a, c)} />
+  """
+
+  testCase """
+    bind shorthand no implicit argument
+    ---
+    <Component x=a@b c />
+    ---
+    <Component x={a.b.bind(a)} c />
+  """
+
   testCase """
     ++ and --
     ---