Skip to content

Commit 1969635

Browse files
committed
Upgrade IDE dependencies
1 parent c9cae24 commit 1969635

File tree

5 files changed

+137
-110
lines changed

5 files changed

+137
-110
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ class DottyLanguageServer extends LanguageServer
381381
val uriTrees = driver.openedTrees(uri)
382382

383383
val defs = Interactive.namedTrees(uriTrees, includeReferences = false, _ => true)
384-
defs.map(d => symbolInfo(d.tree.symbol, d.namePos)).asJava
384+
defs.map(d => JEither.forLeft(symbolInfo(d.tree.symbol, d.namePos))).asJava
385385
}
386386

387387
override def symbol(params: WorkspaceSymbolParams) = computeAsync { cancelToken =>

language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentSymbol.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import scala.collection.JavaConverters._
1717
class CodeDocumentSymbol(override val marker: CodeMarker, expected: Seq[SymInfo]) extends ActionOnMarker {
1818

1919
override def execute(): Exec[Unit] = {
20-
val results = server.documentSymbol(marker.toDocumentSymbolParams).get().asScala
20+
val results = server.documentSymbol(marker.toDocumentSymbolParams).get().asScala.map(_.getLeft)
2121
val expectedSymInfos = expected.map(_.toSymInformation)
2222

2323
assertEquals(expectedSymInfos, results)

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ object Build {
822822
fork in run := true,
823823
fork in Test := true,
824824
libraryDependencies ++= Seq(
825-
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.4.1",
825+
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.5.0.M1",
826826
Dependencies.`jackson-databind`
827827
),
828828
javaOptions := (javaOptions in `dotty-compiler-bootstrapped`).value,

0 commit comments

Comments
 (0)