Skip to content

Commit 883726a

Browse files
committed
Make openedTrees a map with default
1 parent 96ad00a commit 883726a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ object Types {
125125
def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripAnnots.stripTypeVar match {
126126
case this1: TypeRef =>
127127
this1.info match { // see comment in Namer#typeDefSig
128-
case TypeAlias(tp) => assert(tp ne this); tp.isRef(sym)
128+
case TypeAlias(tp) => assert((tp ne this) && (tp ne this), tp); tp.isRef(sym)
129129
case _ => this1.symbol eq sym
130130
}
131131
case this1: RefinedOrRecType => this1.parent.isRef(sym)

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ class InteractiveDriver(settings: List[String]) extends Driver {
4545
def currentCtx: Context = myCtx
4646

4747
private val myOpenedFiles = new mutable.LinkedHashMap[URI, SourceFile]
48-
private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]]
48+
49+
private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]] {
50+
override def default(key: URI) = Nil
51+
}
4952

5053
def openedFiles: Map[URI, SourceFile] = myOpenedFiles
5154
def openedTrees: Map[URI, List[SourceTree]] = myOpenedTrees

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class DottyLanguageServer extends LanguageServer
297297
implicit val ctx = driver.currentCtx
298298

299299
val pos = sourcePosition(driver, uri, params.getPosition)
300-
val tp = Interactive.enclosingType(driver.openedTrees.getOrElse(uri, Nil), pos)
300+
val tp = Interactive.enclosingType(driver.openedTrees(uri), pos)
301301
val tpw = tp.widenTermRefExpr
302302

303303
if (tpw == NoType) new Hover

0 commit comments

Comments
 (0)