fix RemoveImportsVisitor crash when ImportAlias is inserted without comma #397
Conversation
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
facebook-github-bot
added
the
CLA Signed
jimmylai
approved these changes
Sep 30, 2020
Comment on lines
378
to
383
| prev = prev.with_deep_changes( | ||
| whitespace_after=_merge_whitespace_after( | ||
| prev.comma.whitespace_after, | ||
| comma.whitespace_after, | ||
| ) | ||
| ) |
There was a problem hiding this comment.
This is not tested. Can you add a test case?
Codecov Report
@@ Coverage Diff @@
## master #397 +/- ##
==========================================
+ Coverage 94.08% 94.09% +0.01%
==========================================
Files 231 231
Lines 22348 22360 +12
==========================================
+ Hits 21026 21040 +14
+ Misses 1322 1320 -2
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
The comment preserving logic introduced in #392 assumed that in an
ImportFromnode,ImportAliases have acommaproperty (except for the last one). That's only true if theImportFromnode is parsed from actual source, but isn't necessarily true if it's constructed manually.This PR adds a defensive check for the existence of a proper
Commanode, and in case it doesn't exist (because it's aMaybeSentinel), the logic now just moves over theCommanode from the alias that's about to be removed.Test Plan
Added a test case that adds a new
ImportAliasnode manually (withcomma=MaybeSentinel.DEFAULT), then removes the next alias.