Cleanup

Author: Duhemm

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

@@ -5,7 +5,7 @@ import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.TestFile
 
 import org.eclipse.lsp4j.CompletionItemKind
-import org.junit.Assert.assertEquals
+import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
 
 import scala.collection.JavaConverters._
 
@@ -21,8 +21,8 @@ class CodeCompletion(override val marker: CodeMarker,
 
   override def execute(): Exec[Unit] = {
     val result = server.completion(marker.toTextDocumentPositionParams).get()
-    assert(result.isRight, result)
-    assert(!result.getRight.isIncomplete, s"Completion results were 'incomplete': $result")
+    assertTrue(s"Completion results where not 'right': $result", result.isRight)
+    assertFalse(s"Completion results were 'incomplete': $result", result.getRight.isIncomplete)
     val completionResults = result.getRight.getItems.asScala.toSet.map { item =>
       (item.getLabel, item.getKind, item.getDetail)
     }

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

@@ -1,6 +1,6 @@
 package dotty.tools.languageserver.util.actions
 
-import dotty.tools.languageserver.util._
+import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import dotty.tools.languageserver.util.embedded.CodeMarker
 
 import scala.collection.JavaConverters._

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

@@ -2,7 +2,7 @@ package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
-import org.eclipse.lsp4j._
+import org.eclipse.lsp4j.DocumentHighlightKind
 import org.junit.Assert.assertEquals
 
 import scala.collection.JavaConverters._

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

@@ -3,11 +3,8 @@ package dotty.tools.languageserver.util.actions
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
-import org.eclipse.lsp4j._
 import org.junit.Assert.{assertEquals, assertNull, assertTrue}
 
-import PositionContext._
-
 /**
  * An action requesting for the info shown when `range` is hovered.
  * This action corresponds to the `textDocument/hover` method of the Language Server Protocol.

language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.scala

@@ -5,7 +5,7 @@ import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
 import org.eclipse.lsp4j._
 
-import PositionContext._
+import PositionContext.PosCtx
 
 /** Used to mark positions in the code */
 class CodeMarker(val name: String) extends Embedded {

language-server/test/dotty/tools/languageserver/util/server/TestServer.scala

@@ -6,9 +6,7 @@ import java.nio.file.Path
 import java.util
 
 import dotty.tools.languageserver.DottyLanguageServer
-import org.eclipse.lsp4j._
-
-import scala.collection.JavaConverters._
+import org.eclipse.lsp4j.{ DidOpenTextDocumentParams, InitializeParams, InitializeResult, TextDocumentItem}
 
 class TestServer(testFolder: Path) {