Skip to content

Fix #2743: Fix hover problem #2744

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 4 commits into from
Jun 15, 2017
Merged

Fix #2743: Fix hover problem #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96ad00a
Fix #2743: Fix hover problem
odersky Jun 13, 2017
883726a
Make openedTrees a map with default
odersky Jun 13, 2017
32fb05c
Avoid exception in sourcePosition
odersky Jun 13, 2017
bda0318
Fix typo in assertion
odersky Jun 14, 2017
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
4 changes: 3 additions & 1 deletion compiler/src/dotty/tools/dotc/core/Types.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ object Types {
def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripAnnots.stripTypeVar match {
case this1: TypeRef =>
this1.info match { // see comment in Namer#typeDefSig
case TypeAlias(tp) => tp.isRef(sym)
case TypeAlias(tp) =>
assert((tp ne this) && (tp ne this1), s"$tp / $this")
tp.isRef(sym)
case _ => this1.symbol eq sym
}
case this1: RefinedOrRecType => this1.parent.isRef(sym)
Expand Down
9 changes: 7 additions & 2 deletions compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,13 @@ class InteractiveDriver(settings: List[String]) extends Driver {

def currentCtx: Context = myCtx

private val myOpenedFiles = new mutable.LinkedHashMap[URI, SourceFile]
private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]]
private val myOpenedFiles = new mutable.LinkedHashMap[URI, SourceFile] {
override def default(key: URI) = NoSource
}

private val myOpenedTrees = new mutable.LinkedHashMap[URI, List[SourceTree]] {
override def default(key: URI) = Nil
}

def openedFiles: Map[URI, SourceFile] = myOpenedFiles
def openedTrees: Map[URI, List[SourceTree]] = myOpenedTrees
Expand Down
9 changes: 6 additions & 3 deletions language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,12 @@ object DottyLanguageServer {

/** Convert an lsp4j.Position to a SourcePosition */
def sourcePosition(driver: InteractiveDriver, uri: URI, pos: lsp4j.Position): SourcePosition = {
val source = driver.openedFiles(uri) // might throw exception
val p = Positions.Position(source.lineToOffset(pos.getLine) + pos.getCharacter)
new SourcePosition(source, p)
val source = driver.openedFiles(uri)
if (source.exists) {
val p = Positions.Position(source.lineToOffset(pos.getLine) + pos.getCharacter)
new SourcePosition(source, p)
}
else NoSourcePosition
}

/** Convert a SourcePosition to an lsp4j.Range */
Expand Down