Don't merge code completion items having the same name. #12029
Merged
Conversation
This file contains hidden or 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
dos65
reviewed
Apr 8, 2021
Comment on lines
134
to
135
| * If several denotations share the same name, the type denotations appear before term denotations inside | ||
| * the same `Completion`. |
Contributor
There was a problem hiding this comment.
It seems this part of the comment should be deleted
Contributor
Author
There was a problem hiding this comment.
I updated the comment instead for clarity
Also fix completion of references to primary constructor parameters
prolativ
force-pushed
the
dont-merge-completion-items
branch
from
0cf4732 to
3ff472f
Compare
liufengyun
approved these changes
Apr 8, 2021
| .completion(m1, Set(("HashMap", Class, "java.util.HashMap"), | ||
| ("HashMap", Module, "java.util.HashMap$"), | ||
| ("HashMap2", Class, "java.util.HashMap"), | ||
| ("HashMap2", Module, "java.util.HashMap$"))) |
Contributor
There was a problem hiding this comment.
Might be an orthogonal issue: for a module, it is more friendly to show java.util.HashMap instead of java.util.HashMap$.
It can be addressed in a different PR.
Contributor
Author
There was a problem hiding this comment.
Yeah, but that's because of how .show works by default. An even more enigmatic example is
code"class Foo { val foo: Runn${m1} }".withSource
.completion(m1, Set(
("Runnable", Class, "java.lang.Runnable"),
("Runnable", Module, "Runnable$")
))
but that's definitely a separate issue
alexarchambault
approved these changes
Apr 8, 2021
Contributor
alexarchambault
left a comment
alexarchambault
left a comment
There was a problem hiding this comment.
Looks good 👍, AFAIC.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Don't merge code completion items having the same name.
Also fix completion of references to primary constructor parameters.
Fixes #11313
Fixes #12018
/cc @tgodzik @dos65 @alexarchambault