more lsp4j-free

Author: kubukoz

modules/language-support/src/test/scala/playground/language/DiagnosticProviderTests.scala

@@ -95,13 +95,13 @@ object DiagnosticProviderTests extends SimpleIOSuite {
   )
 
   pureTest("empty file - no diagnostics") {
-    assertNoDiff(provider.getDiagnostics("test.smithyql", ""), Nil)
+    assertNoDiff(provider.getDiagnostics(""), Nil)
   }
 
   pureTest("file doesn't parse at all") {
     val input = "horrendous <parsing mistake>"
     assertNoDiff(
-      provider.getDiagnostics("test.smithyql", input),
+      provider.getDiagnostics(input),
       List(
         CompilationError(
           err = CompilationErrorDetails.ParseError(expectationString = "{"),
@@ -117,7 +117,7 @@ object DiagnosticProviderTests extends SimpleIOSuite {
     val input = "AnyOp {}"
 
     assertNoDiff(
-      provider.getDiagnostics("test.smithyql", input),
+      provider.getDiagnostics(input),
       List(
         CompilationError(
           err = CompilationErrorDetails.AmbiguousService(
@@ -138,8 +138,7 @@ object DiagnosticProviderTests extends SimpleIOSuite {
 
     assertNoDiff(
       provider.getDiagnostics(
-        "test.smithyql",
-        input,
+        input
       ),
       List(
         CompilationError.error(
@@ -165,7 +164,7 @@ object DiagnosticProviderTests extends SimpleIOSuite {
         |noop#NoRunnerService.Noop {}""".stripMargin
 
     assertNoDiff(
-      provider.getDiagnostics("test.smithyql", input),
+      provider.getDiagnostics(input),
       List(
         CompilationError.info(
           err = CompilationErrorDetails.UnsupportedProtocols(
@@ -184,7 +183,7 @@ object DiagnosticProviderTests extends SimpleIOSuite {
       """playground.std#Random.NextUUID {}
         |playground.std#Clock.CurrentTimestamp {}""".stripMargin
 
-    assertNoDiff(provider.getDiagnostics("test.smithyql", input), Nil)
+    assertNoDiff(provider.getDiagnostics(input), Nil)
   }
 
 }

modules/lsp/src/main/scala/playground/lsp/LanguageServer.scala

@@ -24,12 +24,14 @@ import playground.language
 import playground.language.CodeLensProvider
 import playground.language.CommandProvider
 import playground.language.CommandResultReporter
+import playground.language.CompletionItem
 import playground.language.CompletionProvider
 import playground.language.DiagnosticProvider
 import playground.language.DocumentSymbolProvider
 import playground.language.Feedback
 import playground.language.FormattingProvider
 import playground.language.TextDocumentProvider
+import playground.language.TextEdit
 import playground.language.Uri
 import playground.lsp.buildinfo.BuildInfo
 import playground.smithyql.Position
@@ -64,12 +66,12 @@ trait LanguageServer[F[_]] {
 
   def formatting(
     documentUri: Uri
-  ): F[List[lsp4j.TextEdit]]
+  ): F[List[LSPTextEdit]]
 
   def completion(
     documentUri: Uri,
     position: LSPPosition,
-  ): F[Either[List[lsp4j.CompletionItem], lsp4j.CompletionList]]
+  ): F[List[LSPCompletionItem]]
 
   def diagnostic(
     documentUri: Uri
@@ -203,14 +205,15 @@ object LanguageServer {
 
       def formatting(
         documentUri: Uri
-      ): F[List[lsp4j.TextEdit]] = TextDocumentProvider[F].get(documentUri).flatMap { doc =>
-        formattingProvider(documentUri).map(_.map(converters.toLSP.textEdit(_, LocationMap(doc))))
+      ): F[List[LSPTextEdit]] = TextDocumentProvider[F].get(documentUri).flatMap { doc =>
+        val map = LocationMap(doc)
+        formattingProvider(documentUri).map(_.map(LSPTextEdit(_, map)))
       }
 
       def completion(
         documentUri: Uri,
         position: LSPPosition,
-      ): F[Either[List[lsp4j.CompletionItem], lsp4j.CompletionList]] = TextDocumentManager[F]
+      ): F[List[LSPCompletionItem]] = TextDocumentManager[F]
         .get(documentUri)
         .map { documentText =>
           val map = LocationMap(documentText)
@@ -220,9 +223,8 @@ object LanguageServer {
               documentText,
               position.unwrap(map),
             )
-            .map(converters.toLSP.completionItem(map, _))
+            .map(LSPCompletionItem(_, map))
         }
-        .map(Left(_))
 
       def diagnostic(
         documentUri: Uri
@@ -355,6 +357,9 @@ case class InitializeResult(
   serverInfo: ServerInfo,
 )
 
+case class LSPCompletionItem(item: CompletionItem, map: LocationMap)
+case class LSPTextEdit(textEdit: TextEdit, map: LocationMap)
+
 case class LSPPosition(line: Int, character: Int) {
 
   def unwrap(map: LocationMap): Position = Position(map.toOffset(line, character).getOrElse(-1))

modules/lsp/src/main/scala/playground/lsp/PlaygroundLanguageServerAdapter.scala

@@ -134,7 +134,9 @@ final class PlaygroundLanguageServerAdapter[F[_]: Sync](
       .formatting(
         documentUri = converters.fromLSP.uri(params.getTextDocument)
       )
-      .map(_.asJava)
+      .map { edits =>
+        edits.map(converters.toLSP.textEdit).asJava
+      }
   )
 
   @JsonRequest("textDocument/completion")
@@ -150,10 +152,9 @@ final class PlaygroundLanguageServerAdapter[F[_]: Sync](
           position = converters.fromLSP.position(params.getPosition),
         )
         .map {
-          _.leftMap(_.asJava).fold(
-            messages.Either.forLeft(_),
-            messages.Either.forRight(_),
-          )
+          _.map(converters.toLSP.completionItem)
+            .asJava
+            .pipe(messages.Either.forLeft(_))
         }
     )
 

modules/lsp/src/main/scala/playground/lsp/converters.scala

@@ -43,6 +43,7 @@ object converters {
         case MessageType.Info    => lsp4j.MessageType.Info
       }
 
+    @deprecated("should be private")
     def documentSymbol(
       map: LocationMap,
       sym: DocumentSymbol,
@@ -64,7 +65,12 @@ object converters {
         case SymbolKind.Package  => lsp4j.SymbolKind.Package
       }
 
-    def completionItem(
+    def completionItem(item: LSPCompletionItem): lsp4j.CompletionItem = completionItem(
+      item.map,
+      item.item,
+    )
+
+    private def completionItem(
       map: LocationMap,
       item: CompletionItem,
     ): lsp4j.CompletionItem = {
@@ -128,7 +134,9 @@ object converters {
         .tap(_.setSortText(item.sortText.orNull))
     }
 
-    def textEdit(
+    def textEdit(edit: LSPTextEdit): lsp4j.TextEdit = textEdit(edit.textEdit, edit.map)
+
+    private def textEdit(
       edit: TextEdit,
       map: LocationMap,
     ): lsp4j.TextEdit =
@@ -143,6 +151,7 @@ object converters {
           new lsp4j.TextEdit(r, what)
       }
 
+    @deprecated("should be private")
     def diagnostic(
       map: LocationMap,
       diag: CompilationError,
@@ -167,6 +176,7 @@ object converters {
         )
       )
 
+    @deprecated("should be private")
     def codeLens(
       map: LocationMap,
       lens: CodeLens,
@@ -180,14 +190,12 @@ object converters {
         )
       )
 
-    @deprecated
-    def range(
+    private def range(
       map: LocationMap,
       coreRange: SourceRange,
     ): lsp4j.Range = new lsp4j.Range(position(map, coreRange.start), position(map, coreRange.end))
 
-    @deprecated
-    def position(
+    private def position(
       map: LocationMap,
       pos: Position,
     ): lsp4j.Position = {
@@ -208,14 +216,6 @@ object converters {
     def uri(wf: WorkspaceFolder)
       : playground.language.Uri = playground.language.Uri.fromUriString(wf.getUri())
 
-    @deprecated
-    def position(
-      map: LocationMap,
-      pos: lsp4j.Position,
-    ): Position = Position(
-      map.toOffset(pos.getLine(), pos.getCharacter()).getOrElse(-1)
-    )
-
     def position(pos: lsp4j.Position): LSPPosition = LSPPosition(pos.getLine(), pos.getCharacter())
 
   }

modules/lsp/src/test/scala/playground/lsp/LanguageServerIntegrationTestSharedServer.scala

@@ -40,18 +40,16 @@ object LanguageServerIntegrationTestSharedServer
         documentUri = Uri.fromPath(f.workspaceDir.toPath / "empty.smithyql"),
         position = LSPPosition(0, 0),
       )
-      .map {
-        case Left(e) =>
-          assert.same(
-            e.map(_.getLabel()),
-            List(
-              "NextUUID",
-              "GetWeather",
-              "Noop",
-              "CurrentTimestamp",
-            ),
-          )
-        case Right(v) => failure(s"Right was found, but Left was expected: $v")
+      .map { e =>
+        assert.same(
+          e.map(_.item.label),
+          List(
+            "NextUUID",
+            "GetWeather",
+            "Noop",
+            "CurrentTimestamp",
+          ),
+        )
       }
   }