Skip to content

Fix incorrect context scope for CaseDefs inside Interactive.contextOfPath #15807

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
merged 1 commit into from
Aug 3, 2022
Merged

Fix incorrect context scope for CaseDefs inside Interactive.contextOfPath #15807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions compiler/src/dotty/tools/dotc/interactive/Completion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,8 @@ object Completion {
val mappings = collection.mutable.Map.empty[Name, List[ScopedDenotations]].withDefaultValue(List.empty)
def addMapping(name: Name, denots: ScopedDenotations) =
mappings(name) = mappings(name) :+ denots
var ctx = context

while ctx ne NoContext do
given Context = ctx
ctx.outersIterator.foreach { case ctx @ given Context =>
if ctx.isImportContext then
importedCompletions.foreach { (name, denots) =>
addMapping(name, ScopedDenotations(denots, ctx))
Expand All @@ -251,9 +249,7 @@ object Completion {
.groupByName.foreach { (name, denots) =>
addMapping(name, ScopedDenotations(denots, ctx))
}

ctx = ctx.outer
end while
}

var resultMappings = Map.empty[Name, Seq[SingleDenotation]]

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/interactive/Interactive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ object Interactive {
case _ =>
}
contextOfStat(stats, nested, ctx.owner, localCtx)
case tree @ CaseDef(pat, guard, rhs) if nested `eq` rhs =>
case tree @ CaseDef(pat, _, _) =>
val localCtx = outer.fresh.setNewScope
pat.foreachSubTree {
case bind: Bind => localCtx.enter(bind.symbol)
Expand Down
44 changes: 44 additions & 0 deletions language-server/test/dotty/tools/languageserver/CompletionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,4 +1474,48 @@ class CompletionTest {
("xClass", Module, "Foo.xClass"),
("xClass", Class, "Foo.xClass")))
}

@Test def patternGuardCompletions: Unit = {
code"""object Foo:
| 1 match { case foo if fo${m1} => }
| 1 match { case foo => fo${m2} }
"""
.completion(m1, Set(("foo", Field, "Int")))
.completion(m2, Set(("foo", Field, "Int")))
}

@Test def patternGuardCompletionsUnApply: Unit = {
code"""object Foo:
| Some(1) match { case Some(foo) if fo${m1} => }
| Some(1) match { case Some(foo) => fo${m2} }
"""
.completion(m1, Set(("foo", Field, "Int")))
.completion(m2, Set(("foo", Field, "Int")))
}

@Test def patternGuardCompletionsNested: Unit = {
code"""object Foo:
| ((1, 2), 3) match { case ((foo1, foo2), foo3) if fo${m1} => }
| ((1, 2), 3) match { case ((foo1, foo2), foo3) => fo${m2} }
"""
.completion(m1, Set(("foo1", Field, "Int"), ("foo2", Field, "Int"), ("foo3", Field, "Int")))
.completion(m2, Set(("foo1", Field, "Int"), ("foo2", Field, "Int"), ("foo3", Field, "Int")))
}

@Test def patternGuardCompletionsSeq: Unit = {
code"""object Foo:
| Seq(1, 2) match { case foo1 :: foo2 if fo${m1} => }
| Seq(1, 2) match { case foo1 :: foo2 => fo${m2} }
"""
.completion(m1, Set(("foo1", Field, "Int"), ("foo2", Field, "List[Int]")))
.completion(m2, Set(("foo1", Field, "Int"), ("foo2", Field, "List[Int]")))
}

@Test def noCompletionsInsidePatternBind: Unit = {
code"""object Foo:
| (1, 2) match { case (foo, fo${m1}
"""
.noCompletions()
}

}