Skip to content

Conversation

@helixbass
Copy link
Collaborator

Fixes #5204

@GeoffreyBooth this PR contains two things (both raised in #5204):

  1. Generate valid JS for (non-static) computed class properties eg
class A
  [b]: 3

I extracted this fix from #5205 to target it here against master

  1. Allow static computed class properties/methods eg
class A
  @[a]: 1
  @[b]: ->

ObjAssignable: [
o 'SimpleObjAssignable'
o '[ Expression ]', -> new Value new ComputedPropertyName $2
o '@ [ Expression ]', -> new Value LOC(1)(new ThisLiteral $1), [LOC(3)(new ComputedPropertyName($3))], 'this'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly copied this grammar rule from the rule for ThisProperty

assign = @externalCtor = new Assign new Value, value
else if not assign.variable.this
name = new (if base.shouldCache() then Index else Access) base
name =
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the fix for the invalid JS for non-static computed class properties (extracted from #5205)

# The lexer has tagged the opening bracket of an indexing operation call.
# Match it with its paired close.
closeOpenIndexes: ->
startToken = null
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allowing static computed class properties/methods was a bit more complex. In addition to the new grammar rule above, in the rewriter here we first want to make sure that the [/] in eg @[b]: ... are not tagged as INDEX_START/INDEX_END since that would be inaccurate and creates an ambiguous grammar

I believe this is safe because there's not a scenario where an actual INDEX_END would be immediately followed by a : token

# Go back to the (implicit) start of the object.
s = switch
when @tag(i - 1) in EXPRESSION_END then start[1]
when @tag(i - 1) in EXPRESSION_END
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then, we have to make sure that for an implicit object (whether an actual implicit object or a class body) starting with a static computed property eg @[b]: ->, the start of the implicit object comes before the @

@GeoffreyBooth GeoffreyBooth merged commit 7175055 into jashkenas:master Apr 28, 2019
@GeoffreyBooth
Copy link
Collaborator

Thanks, this looks great. Seeing how complicated this got, I’m glad we split it off from the AST work.

@helixbass helixbass deleted the iss5204-computed-class-property branch April 29, 2019 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Compiles to invalid JS: computed class property

2 participants