Skip to content

Suspend tmp creation in IO #45

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

Merged
rochala merged 2 commits into from
May 20, 2025
Merged

Suspend tmp creation in IO #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba6c4d
Suspend tmp creation in IO
rochala May 17, 2025
4ee92e2
Use fs2 to create temp directory
kubukoz May 18, 2025
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: 13 additions & 5 deletions sls/src/org/scala/abusers/sls/ServerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import cats.effect.kernel.Deferred
import cats.effect.kernel.Resource
import cats.effect.IO
import cats.syntax.all.*
import fs2.io.file.Files
import fs2.io.file.Path
import fs2.io.process.ProcessBuilder
import fs2.text
import jsonrpclib.fs2.FS2Channel
Expand All @@ -18,6 +20,7 @@ import org.scala.abusers.pc.IOCancelTokens
import org.scala.abusers.pc.PresentationCompilerDTOInterop.*
import org.scala.abusers.pc.PresentationCompilerProvider
import org.scala.abusers.sls.LspNioConverter.asNio
import util.chaining.*

import java.util.concurrent.CompletableFuture
import scala.concurrent.duration.*
Expand All @@ -26,7 +29,6 @@ import scala.jdk.OptionConverters.*
import scala.meta.pc.InlayHintsParams
import scala.meta.pc.OffsetParams
import scala.meta.pc.PresentationCompiler

class ServerImpl(
textDocumentSync: DocumentSyncManager,
pcProvider: PresentationCompilerProvider,
Expand Down Expand Up @@ -176,9 +178,7 @@ class ServerImpl(
)

private def connectWithBloop(back: Communicate[IO], steward: ResourceSupervisor[IO]): IO[BuildServer] = {
val temp = os.temp.dir(prefix = "sls") // TODO Investigate possible clashes during reconnection
val socketFile = temp / s"bloop.socket"
val bspProcess = ProcessBuilder("bloop", "bsp", "--socket", socketFile.toNIO.toString())
def bspProcess(socketFile: os.Path) = ProcessBuilder("bloop", "bsp", "--socket", socketFile.toNIO.toString())
.spawn[IO]
.flatMap { bspSocketProc =>
IO.deferred[Unit].toResource.flatMap { started =>
Expand Down Expand Up @@ -207,7 +207,15 @@ class ServerImpl(
.as(socketFile)

val bspClientRes = for {
socketPath <- bspProcess
temp <- Files[IO]
.tempDirectory(
dir = None,
prefix = "sls",
permissions = None,
)
.map(_.toNioPath.pipe(os.Path(_))) // TODO Investigate possible clashes during reconnection
socketFile = temp / "bloop.socket"
socketPath <- bspProcess(socketFile)
_ <- Resource.eval(IO.sleep(1.seconds) *> logMessage(back, s"Looking for socket at $socketPath"))
channel <- FS2Channel
.resource[IO]()
Expand Down