New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix delete on optional chain #1103
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2750,16 +2750,16 @@ def_optimize(AST_UnaryPostfix, function(self, compressor) { | |
|
||
def_optimize(AST_UnaryPrefix, function(self, compressor) { | ||
var e = self.expression; | ||
if (self.operator == "delete" | ||
&& !(e instanceof AST_SymbolRef | ||
|| e instanceof AST_PropAccess | ||
|| is_identifier_atom(e))) { | ||
if (e instanceof AST_Sequence) { | ||
const exprs = e.expressions.slice(); | ||
exprs.push(make_node(AST_True, self)); | ||
return make_sequence(self, exprs).optimize(compressor); | ||
} | ||
return make_sequence(self, [ e, make_node(AST_True, self) ]).optimize(compressor); | ||
if ( | ||
self.operator == "delete" && | ||
!( | ||
e instanceof AST_SymbolRef || | ||
e instanceof AST_PropAccess || | ||
e instanceof AST_Chain || | ||
is_identifier_atom(e) | ||
) | ||
) { | ||
return make_sequence(self, [e, make_node(AST_True, self)]).optimize(compressor); | ||
} | ||
var seq = self.lift_sequences(compressor); | ||
if (seq !== self) { | ||
|
@@ -4251,7 +4251,16 @@ def_optimize(AST_Sub, function(self, compressor) { | |
}); | ||
|
||
def_optimize(AST_Chain, function (self, compressor) { | ||
if (is_nullish(self.expression, compressor)) return make_node(AST_Undefined, self); | ||
if (is_nullish(self.expression, compressor)) { | ||
let parent = compressor.parent(); | ||
// It's valid to delete a nullish optional chain, but if we optimized | ||
// this to `delete undefined` then it would appear to be a syntax error | ||
// when we try to optimize the delete. Thankfully, `delete 0` is fine. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great thinking here! |
||
if (parent instanceof AST_UnaryPrefix && parent.operator === "delete") { | ||
return make_node_from_constant(0, self); | ||
} | ||
return make_node(AST_Undefined, self); | ||
} | ||
return self; | ||
}); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm guessing
instanceof AST_Sequence
isn't checked here to avoid nested AST_Sequence because the extra one would be compressed right away