Skip to content

Add pattern completion for unapply contexts #20274

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.

Sign up for GitHub

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

Merged
natsukagami merged 5 commits into from
May 22, 2024
Merged

Add pattern completion for unapply contexts #20274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6bf36d
Add unapply pattern completion test
natsukagami Apr 27, 2024
433a897
Add pattern completion based on the Unapply argument type
natsukagami Apr 5, 2024
67e6505
Add more tests for deeply nested patterns and patterns with Select in…
natsukagami May 7, 2024
a399946
Contribute candidates when the selection is a Select
natsukagami May 7, 2024
fbfcdf8
Remove redundant cases with UnApply
natsukagami May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Contribute candidates when the selection is a Select
  • Loading branch information
@natsukagami
natsukagami committed May 20, 2024
commit a399946afe0977e275e77d44283790eaf982072a
14 changes: 14 additions & 0 deletions presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,20 @@ class Completions(
),
false,
)
case Select(_, name) :: (unapp : UnApply) :: _ =>
(
CaseKeywordCompletion.contribute(
EmptyTree, // no selector
completionPos,
indexedContext,
config,
search,
parent = unapp,
autoImports,
patternOnly = Some(name.decoded)
),
false,
)

// class FooImpl extends Foo:
// def x|
Expand Down
5 changes: 3 additions & 2 deletions presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ object CaseKeywordCompletion:
val argPts = UnapplyArgs(fn.tpe.widen.finalResultType, fn, patterns, parent.srcPos).argTypes
patterns.zipWithIndex
.find:
case (id@Ident(v), tpe) => v.decoded == value
case _ => false
case (Ident(v), tpe) => v.decoded == value
case (Select(_, v), tpe) => v.decoded == value
case t => false
.map((_, id) => argPts(id).widen.deepDealias)
/* Parent is a function expecting a case match expression */
case TreeApply(fun, _) if !fun.tpe.isErroneous =>
Expand Down