Skip to content

IDE: guard against SourceFile -> URI conversion failing #5389

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
Nov 5, 2018
Merged

IDE: guard against SourceFile -> URI conversion failing #5389

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
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 @@ -475,7 +475,7 @@ object Interactive {
Include.definitions | Include.overriding | Include.overridden)
else sym.topLevelClass match {
case cls: ClassSymbol =>
val trees = Option(cls.sourceFile).map(InteractiveDriver.toUri) match {
val trees = Option(cls.sourceFile).flatMap(InteractiveDriver.toUriOption) match {
case Some(uri) if driver.openedTrees.contains(uri) =>
driver.openedTrees(uri)
case _ => // Symbol comes from the classpath
Expand Down
23 changes: 20 additions & 3 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 @@ -265,7 +265,24 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
}

object InteractiveDriver {
def toUri(file: AbstractFile): URI = Paths.get(file.path).toUri
def toUri(source: SourceFile): URI = toUri(source.file)
def toUriOption(file: AbstractFile): Option[URI] =
if (!file.exists)
None
else
try {
// We don't use file.file here since it'll be null
// for the VirtualFiles created by InteractiveDriver#toSource
// TODO: To avoid these round trip conversions, we could add an
// AbstractFile#toUri method and implement it by returning a constant
// passed as a parameter to a constructor of VirtualFile
Some(Paths.get(file.path).toUri)
} catch {
case e: InvalidPathException =>
None
}
def toUriOption(source: SourceFile): Option[URI] =
if (!source.exists)
None
else
toUriOption(source.file)
}

8 changes: 6 additions & 2 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 @@ -315,7 +315,8 @@ class DottyLanguageServer extends LanguageServer
Include.references | Include.definitions | Include.linkedClass | Include.overriding
val refs = Interactive.findTreesMatching(trees, includes, sym)

val changes = refs.groupBy(ref => toUri(ref.source).toString)
val changes = refs.groupBy(ref => toUriOption(ref.source))
.flatMap((uriOpt, ref) => uriOpt.map(uri => (uri.toString, ref)))
.mapValues(refs =>
refs.flatMap(ref =>
range(ref.namePos, positionMapperFor(ref.source)).map(nameRange => new TextEdit(nameRange, newName))).asJava)
Expand Down Expand Up @@ -433,7 +434,10 @@ object DottyLanguageServer {

/** Convert a SourcePosition to an lsp4.Location */
def location(p: SourcePosition, positionMapper: Option[SourcePosition => SourcePosition] = None): Option[lsp4j.Location] =
range(p, positionMapper).map(r => new lsp4j.Location(toUri(p.source).toString, r))
for {
uri <- toUriOption(p.source)
r <- range(p, positionMapper)
} yield new lsp4j.Location(uri.toString, r)

/**
* Convert a MessageContainer to an lsp4j.Diagnostic. The positions are transformed vy
Expand Down