Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

REPL: Don't crash if completions throw #16687

Merged
merged 1 commit into from
Jan 14, 2023
Merged

REPL: Don't crash if completions throw #16687

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
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/repl/ReplDriver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import org.jline.reader._
import scala.annotation.tailrec
import scala.collection.mutable
import scala.jdk.CollectionConverters._
import scala.util.control.NonFatal
import scala.util.Using

/** The state of the REPL contains necessary bindings instead of having to have
Expand Down Expand Up @@ -241,7 +242,7 @@ class ReplDriver(settings: Array[String],
unit.tpdTree = tree
given Context = state.context.fresh.setCompilationUnit(unit)
val srcPos = SourcePosition(file, Span(cursor))
val (_, completions) = Completion.completions(srcPos)
val completions = try Completion.completions(srcPos)._2 catch case NonFatal(_) => Nil
completions.map(_.label).distinct.map(makeCandidate)
}
.getOrElse(Nil)
Expand Down
4 changes: 4 additions & 0 deletions compiler/test/dotty/tools/repl/TabcompleteTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,8 @@ class TabcompleteTests extends ReplTest {
val comp = tabComplete("BigInt(1).")
assertTrue(comp.distinct.nonEmpty)
}

@Test def i9334 = initially {
assertEquals(Nil, tabComplete("class Foo[T]; classOf[Foo]."))
}
}