Skip to content

Fix cancellation #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix cancellation #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions sls/src/org/scala/abusers/sls/LSPCancelRequest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package org.scala.abusers.sls

import jsonrpclib.fs2.*
import jsonrpclib.CallId

private case class LSPCancelRequest(id: CallId)

object LSPCancelRequest {
import io.circe.Codec
given Codec[LSPCancelRequest] = Codec.derived[LSPCancelRequest]

val cancelTemplate: CancelTemplate = CancelTemplate
.make[LSPCancelRequest](
"$/cancelRequest",
_.id,
LSPCancelRequest(_)
)
}
5 changes: 1 addition & 4 deletions sls/src/org/scala/abusers/sls/SimpleLanguageServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import cats.effect.*
import cats.syntax.all.*
import jsonrpclib.fs2.*
import jsonrpclib.smithy4sinterop.ClientStub
import jsonrpclib.CallId
import org.scala.abusers.pc.IOCancelTokens
import org.scala.abusers.pc.PresentationCompilerProvider

Expand All @@ -27,14 +26,12 @@ object BuildServer {
object SimpleScalaServer extends IOApp.Simple {
import jsonrpclib.smithy4sinterop.ServerEndpoints

val cancelEndpoint = CancelTemplate.make[CallId]("$/cancel", identity, identity)

def run: IO[Unit] =
runResource.useForever

private def runResource =
for {
fs2Channel <- FS2Channel.resource[IO](cancelTemplate = cancelEndpoint.some)
fs2Channel <- FS2Channel.resource[IO](cancelTemplate = LSPCancelRequest.cancelTemplate.some)
client <- ClientStub(SlsLanguageClient, fs2Channel).liftTo[IO].toResource
serverImpl <- server(client)
serverEndpoints <- ServerEndpoints(serverImpl).liftTo[IO].toResource
Expand Down