Add support for dotted imports in get_qualified_names #290
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
zsol
changed the title
zsol
force-pushed
the
qname-for-dotted-imports
branch
from
83920a0 to
1c8b3d4
Compare
jimmylai
reviewed
Apr 27, 2020
libcst/metadata/scope_provider.py
Outdated
| # for these we want to find the longest prefix that matches full_name | ||
| parts = real_name.split(".") | ||
| real_names = [ | ||
| ".".join(parts[: i + 1]) for i in reversed(range(len(parts))) |
There was a problem hiding this comment.
This is simpler and probably also easier to read.
Suggested change
| ".".join(parts[: i + 1]) for i in reversed(range(len(parts))) | |
| ".".join(parts[: i]) for i in range(len(parts), 0, -1) |
There was a problem hiding this comment.
that's actually what I started with but the numbers felt a bit arbitrary. Happy to change it back though.
libcst/metadata/scope_provider.py
Outdated
Comment on lines
436
to
440
| for i in reversed(range(len(parts))): | ||
| prefix = ".".join(parts[: i + 1]) | ||
| if prefix in self: | ||
| assignments = self[prefix] | ||
| break |
There was a problem hiding this comment.
Suggested change
| for i in reversed(range(len(parts))): | |
| prefix = ".".join(parts[: i + 1]) | |
| if prefix in self: | |
| assignments = self[prefix] | |
| break | |
| for i in range(len(parts), 0, -1): | |
| prefix = ".".join(parts[: i]) | |
| if prefix in self: | |
| assignments = self[prefix] | |
| break |
jimmylai
reviewed
Apr 27, 2020
libcst/metadata/scope_provider.py
Outdated
Comment on lines
249
to
253
| if name and name.asname: | ||
| name_asname = name.asname | ||
| if name_asname: | ||
| as_name = cst.ensure_type(name_asname.name, cst.Name).value | ||
| if full_name.startswith(as_name): |
There was a problem hiding this comment.
Suggested change
| if name and name.asname: | |
| name_asname = name.asname | |
| if name_asname: | |
| as_name = cst.ensure_type(name_asname.name, cst.Name).value | |
| if full_name.startswith(as_name): | |
| as_name = name.evaluated_alias | |
| if as_name full_name.startswith(as_name): |
|
Is this PR related to #286? |
|
It's not, I just noticed that one. I'll look at it tomorrow. |
jimmylai
reviewed
Apr 28, 2020
| if real_name: | ||
| if name and name.asname: | ||
| as_name = name.evaluated_alias | ||
| if full_name.startswith(as_name): |
There was a problem hiding this comment.
Pyre complains as_name can be None but startswith doesn't take None.
jimmylai
approved these changes
Apr 28, 2020
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
get_qualified_namesnow returns the most appropriate qualified name for bothimport a.b.cstyle imports as well as later references to them.Test Plan
Added unit test.