Skip to content
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: correctly extract wildcard matchers #355

Merged
merged 2 commits into from
Aug 14, 2020
Merged

Conversation

sk-
Copy link
Contributor

@sk- sk- commented Aug 2, 2020

Summary

SaveMatchedNodes within sequences was not working as expected, the fixes in this PR are:

Test Plan

Unit tests

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Aug 2, 2020
sk- added a commit to sk-/LibCST that referenced this pull request Aug 2, 2020
Note that SaveMatchedNode was already matching leading empty wildcards, however it's value is incorect due to Instagram#337. This is why the test for the leading wildcards are failing, and will be so until Instagram#355 is merged.

This fixes Instagram#336.
@sk-
Copy link
Contributor Author

sk- commented Aug 13, 2020

@zsol @jimmylai It'd be great if you could take a look at this PR and #356.

Copy link
Contributor

@jimmylai jimmylai left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for fixing this!

Comment on lines +936 to +942
class _SequenceMatchesResult:
sequence_capture: Optional[
Dict[str, Union[libcst.CSTNode, Sequence[libcst.CSTNode]]]
]
matched_nodes: Optional[
Union[libcst.CSTNode, MaybeSentinel, Sequence[libcst.CSTNode]]
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Great ideal to use dataclass to store them separately!

@jimmylai jimmylai merged commit 3ada79e into Instagram:master Aug 14, 2020
jimmylai pushed a commit that referenced this pull request Aug 14, 2020
* fix: SaveMachedNode now matches with trailing empty wildcards

Note that SaveMatchedNode was already matching leading empty wildcards, however it's value is incorect due to #337. This is why the test for the leading wildcards are failing, and will be so until #355 is merged.

This fixes #336.

* fix: _matches_zero_nodes type declaration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] matched node in a sequence is returned as an array [BUG] Incorrect saved node
3 participants