Update/kiama lsp

build.sbt

@@ -47,8 +47,7 @@ lazy val replDependencies = Seq(
 )
 
 lazy val lspDependencies = Seq(
-  "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.12.0",
-  "com.google.code.gson" % "gson" % "2.8.9"
+  "org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.23.1"
 )
 
 lazy val testingDependencies = Seq(
@@ -63,7 +62,8 @@ lazy val kiama: CrossProject = crossProject(JSPlatform, JVMPlatform).in(file("ki
     name := "kiama"
   )
   .jvmSettings(
-    libraryDependencies ++= (replDependencies ++ lspDependencies)
+    libraryDependencies ++= (replDependencies ++ lspDependencies ++ testingDependencies),
+    testFrameworks += new TestFramework("utest.runner.Framework")
   )
 
 lazy val root = project.in(file("effekt"))
@@ -116,6 +116,15 @@ lazy val effekt: CrossProject = crossProject(JSPlatform, JVMPlatform).in(file("e
 
     assembly / assemblyJarName := "effekt.jar",
 
+    // there is a conflict between the two transitive dependencies "gson:2.11.0"
+    // and "error_prone_annotations:2.27.0", so we need the merge strategy here for `sbt install`
+    assembly / assemblyMergeStrategy := {
+      case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.first
+      case x =>
+        val oldStrategy = (assembly / assemblyMergeStrategy).value
+        oldStrategy(x)
+    },
+
     // we use the lib folder as resource directory to include it in the JAR
     Compile / unmanagedResourceDirectories += (ThisBuild / baseDirectory).value / "libraries",
 

effekt/jvm/src/main/scala/effekt/Server.scala

@@ -5,11 +5,9 @@ import effekt.core.PrettyPrinter
 import effekt.source.{ FunDef, Hole, ModuleDecl, Tree }
 import effekt.util.{ PlainMessaging, getOrElseAborting }
 import effekt.util.messages.EffektError
-
-import kiama.util.{ Filenames, Position, Services, Source }
+import kiama.util.{ Filenames, Notebook, NotebookCell, Position, Services, Source }
 import kiama.output.PrettyPrinterTypes.Document
-
-import org.eclipse.lsp4j.{ Diagnostic, DocumentSymbol, SymbolKind, ExecuteCommandParams }
+import org.eclipse.lsp4j.{ Diagnostic, DocumentSymbol, ExecuteCommandParams, SymbolKind }
 
 /**
  * effekt.Intelligence <--- gathers information -- LSPServer --- provides LSP interface ---> kiama.Server
@@ -95,28 +93,6 @@ trait LSPServer extends kiama.util.Server[Tree, EffektConfig, EffektError] with
     info <- getHoleInfo(tree)(context)
   } yield info
 
-  // The implementation in kiama.Server does not support file sources
-  def toURI(filename: String): String = {
-    if (filename startsWith "file://")
-      filename
-    else
-      if (filename startsWith "./")
-        "file://" ++ Filenames.cwd() ++ "/" ++ Filenames.dropPrefix(filename, ".")
-      else
-        s"file://$filename"
-  }
-
-  override def locationOfNode(node: Tree): Location = {
-    (positions.getStart(node), positions.getFinish(node)) match {
-      case (start @ Some(st), finish @ Some(_)) =>
-        val s = convertPosition(start)
-        val f = convertPosition(finish)
-        new Location(toURI(st.source.name), new LSPRange(s, f))
-      case _ =>
-        null
-    }
-  }
-
   def positionToLocation(p: Position): Location = {
     val s = convertPosition(Some(p))
     new Location(p.source.name, new LSPRange(s, s))