[Interactive] Include scope completions for synthic select tree #13515
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
dos65
force-pushed
the
completion_synthetic_select_fix
branch
from
802facd
to
8a560b9
Compare
prolativ
requested changes
Sep 13, 2021
| @@ -112,6 +112,9 @@ object Completion { | |||
| val completer = new Completer(mode, prefix, pos) | |||
|
|
|||
| val completions = path match { | |||
| case Select(qual @ This(_), _) :: _ => | |||
| val scope = if (qual.span.isSynthetic) completer.scopeCompletions else Map.empty | |||
There was a problem hiding this comment.
I would suggest moving this logic into the body of selectionCompletions, leaving this match block here as it was - just as simple dispatching
There was a problem hiding this comment.
I simplified it a bit. Would it be ok to leave it here in this version?
dos65
force-pushed
the
completion_synthetic_select_fix
branch
from
8a560b9
to
5707140
Compare
smarter
reviewed
Sep 13, 2021
| case Import(expr, _) :: _ => completer.directMemberCompletions(expr) | ||
| case (_: untpd.ImportSelector) :: Import(expr, _) :: _ => completer.directMemberCompletions(expr) | ||
| case _ => completer.scopeCompletions | ||
| case Select(qual @ This(_), _) :: _ if qual.span.isSynthetic => completer.scopeCompletions |
There was a problem hiding this comment.
Since it's non-obvious why this would be needed, I suggest adding a comment with an example here (or a reference to the added test case).
dos65
force-pushed
the
completion_synthetic_select_fix
branch
from
5707140
to
08aae18
Compare
Previously, in case if query matches on existing class member
the returned completions were not returning symbols from scope.
Fixes the following case:
```scala
class Y {
def bar: Unit =
val argument: Int = 42
arg@@ // should return both `local.argument` and `this.arg`
// but tree looks like select - `Select(This(Ident(Y)), Ident("arg"))`
def arg: String = ???
}
```
dos65
force-pushed
the
completion_synthetic_select_fix
branch
from
08aae18
to
494094a
Compare
prolativ
approved these changes
Sep 14, 2021
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.
Previously, in case if query matches on existing class member
the returned completions were not returning symbols from scope.
Fixes the following case: