bugfix: Case completions for tuple type #5292
Merged
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
kasiaMarek
reviewed
Jun 13, 2023
mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala
Outdated
Show resolved
Hide resolved
| // Special handle case when selector is a tuple or `FunctionN`. | ||
| if definitions.isTupleClass(selectorSym) || definitions.isFunctionClass( | ||
| selectorSym | ||
| ) | ||
| then | ||
| val selectorTpe = parents.selector.show | ||
| val tpeLabel = | ||
| if !selectorTpe.contains("x$1") then selectorTpe |
There was a problem hiding this comment.
Maybe it'd be better to match on the parents.selector to check when there will be an argument? In case somehow it can have a different name than x$1.
tgodzik
requested changes
Jun 20, 2023
| if (patternOnly.isEmpty) | ||
| List( | ||
| new TextEditMember( | ||
| "case () =>", |
There was a problem hiding this comment.
Can you check if this actually shows up on the VS Code side?
There was a problem hiding this comment.
Label is shown, eg. case (Int, Int) =>
mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala
Show resolved
Hide resolved
mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala
Show resolved
Hide resolved
jkciesluk
force-pushed
the
case-comp-for
branch
from
bd76385 to
e5af5d1
Compare
jkciesluk
force-pushed
the
case-comp-for
branch
from
e5af5d1 to
0ad09aa
Compare
We shouldn't show case completions for tuple type if query doesn't match label. Also, sometimes label contained `x$1` symbol (eg. `(x$1: (Int, Int)) @unchecked scala`, which we don't want to show to the user. I think the simplest way to detect it is just by looking if label contains `x$1`
It was hard to detect we are in `yield @@` or `case (@@)` and this completion was not really usefull, so it was best to remove it
jkciesluk
force-pushed
the
case-comp-for
branch
from
0ad09aa to
ad44111
Compare
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.
We shouldn't show case completions for tuple type if query doesn't match label.
Also, sometimes label contained
x$1symbol (eg.(x$1: (Int, Int)) @unchecked scala, which we don't want to show to the user.I think the simplest way to detect it is just by looking if label contains
x$1connected to the issue found in #5196 (comment)