Merge pull request #5062 from dotty-staging/ide-upgrade

Upgrade IDE dependencies

Author: allanrenucci

.drone.yml

@@ -23,23 +23,23 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test:
     group: test
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/cmdTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
       - ./project/scripts/bootstrapCmdTests
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -49,7 +49,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -61,7 +61,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -72,7 +72,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -96,7 +96,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2018-08-22
+    image: lampepfl/dotty:2018-08-31
     environment:
       - RELEASEBUILD=yes
     commands:

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

@@ -381,7 +381,7 @@ class DottyLanguageServer extends LanguageServer
     val uriTrees = driver.openedTrees(uri)
 
     val defs = Interactive.namedTrees(uriTrees, includeReferences = false, _ => true)
-    defs.map(d => symbolInfo(d.tree.symbol, d.namePos)).asJava
+    defs.map(d => JEither.forLeft(symbolInfo(d.tree.symbol, d.namePos))).asJava
   }
 
   override def symbol(params: WorkspaceSymbolParams) = computeAsync { cancelToken =>

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

@@ -17,7 +17,7 @@ import scala.collection.JavaConverters._
 class CodeDocumentSymbol(override val marker: CodeMarker, expected: Seq[SymInfo]) extends ActionOnMarker {
 
   override def execute(): Exec[Unit] = {
-    val results = server.documentSymbol(marker.toDocumentSymbolParams).get().asScala
+    val results = server.documentSymbol(marker.toDocumentSymbolParams).get().asScala.map(_.getLeft)
     val expectedSymInfos = expected.map(_.toSymInformation)
 
     assertEquals(expectedSymInfos, results)

project/Build.scala

@@ -832,7 +832,7 @@ object Build {
       fork in run := true,
       fork in Test := true,
       libraryDependencies ++= Seq(
-        "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.4.1",
+        "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.5.0.M1",
         Dependencies.`jackson-databind`
       ),
       javaOptions := (javaOptions in `dotty-compiler-bootstrapped`).value,