fix: use one and only one lsp-users-projects-root workspace

Make docker built image point to that instead of test one

Author: S-furi

completions/src/main/kotlin/completions/configuration/lsp/LspProperties.kt

@@ -11,4 +11,6 @@ data class LspProperties(
     val host: String,
     val port: Int,
     val reconnectionRetries: Int,
+    val remoteWorkspaceRoot: String = "/lsp/workspaces/lsp-users-projects-root",
+    val localWorkspaceRoot: String = "/lsp/workspaces/lsp-users-projects-root"
 )

completions/src/main/kotlin/completions/lsp/KotlinLspProxy.kt

@@ -113,7 +113,7 @@ class KotlinLspProxy(private val lspProperties: LspProperties) {
      * @param clientName the name of the client, defaults to "lsp-proxy"
      */
     suspend fun initializeClient(
-        workspacePath: String = lspRemoteWorkspaceRoot().path,
+        workspacePath: String = Path.of(lspProperties.remoteWorkspaceRoot).toUri().path,
         clientName: String = "kotlin-compiler-server"
     ) {
         if (!::lspClient.isInitialized) {
@@ -203,37 +203,8 @@ class KotlinLspProxy(private val lspProperties: LspProperties) {
         }
     }
 
-    /**
-     * [lspRemoteWorkspaceRoot] is the workspace that the LSP will point to, while
-     * [lspLocalWorkspaceRoot] is the local workspace that the LSP client is running on.
-     * They are usually the same if the LSP client is running on the same machine as the server,
-     * otherwise [lspRemoteWorkspaceRoot] will have to be set wrt to server's local workspace.
-     *
-     * Note that [lspRemoteWorkspaceRoot] is the most important one, since it will be used
-     * from the LSP analyzer to resolve the project's dependencies.
-     */
     companion object {
         private val logger = LoggerFactory.getLogger(KotlinLspProxy::class.java)
-
-        fun lspRemoteWorkspaceRoot(): URI =Path.of(
-            System.getProperty("LSP_REMOTE_WORKSPACE_ROOT")
-                ?: System.getenv("LSP_REMOTE_WORKSPACE_ROOT")
-                ?: defaultWorkspacePath()
-        ).toUri()
-
-        fun lspLocalWorkspaceRoot(): URI = Path.of(
-            System.getProperty("LSP_LOCAL_WORKSPACE_ROOT")
-                ?: System.getenv("LSP_LOCAL_WORKSPACE_ROOT")
-                ?: defaultWorkspacePath()
-        ).toUri()
-
-        private fun defaultWorkspacePath(): String =
-            System.getProperty("LSP_USERS_PROJECTS_ROOT")
-                ?: System.getProperty("LSP_USERS_PROJECTS_ROOT")
-                ?: run {
-                    KotlinLspProxy::class.java.getResource("/lsp-users-projects-root")?.path
-                        ?: error("Could not find default workspace path")
-                }
     }
 }
 

completions/src/main/resources/application-local.yml

@@ -4,6 +4,7 @@ lsp:
   host: ${LSP_HOST:localhost}
   port: ${LSP_PORT:9999}
   reconnection-retries: 10
+  remote-workspace-root: /workspaces/lsp-users-projects-root
 spring:
   docker:
     compose:

completions/src/main/resources/application.yml

@@ -4,6 +4,8 @@ lsp:
   host: {$LSP_HOST:localhost}
   port: ${LSP_PORT:9999}
   reconnection-retries: 10
+  remote-workspace-root: /workspaces/lsp-users-projects-root
+
 springdoc:
   swagger-ui:
     enabled: false

completions/src/main/resources/lsp-users-projects-root/build.gradle.kts

@@ -0,0 +1,22 @@
+FROM gradle:9-jdk-21-and-24
+
+ARG ZIP_VERSION
+ARG ZIP_ARCH
+ENV ZIP_VERSION=${ZIP_VERSION}
+ENV ZIP_ARCH=${ZIP_ARCH}
+
+RUN apt-get update && apt-get install -y curl zip unzip bash netcat-openbsd \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY workspaces /workspaces/
+WORKDIR /lsp
+
+COPY server/intellij-lsp-${ZIP_VERSION}-linux-${ZIP_ARCH}.zip ./intellij-lsp.zip
+
+RUN unzip intellij-lsp.zip \
+    && rm intellij-lsp.zip \
+    && chmod +x ./kotlin-lsp.sh
+
+EXPOSE 9999
+
+CMD ["./kotlin-lsp.sh", "--multi-client", "--isolated-documents", "--socket", "0.0.0.0:9999"]

completions/src/main/resources/lsp/Dockerfile

@@ -0,0 +1,11 @@
+plugins {
+    kotlin("jvm") version "2.2.20"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+}

completions/src/main/resources/lsp/workspaces/lsp-users-projects-root/build.gradle.kts

@@ -70,8 +70,8 @@ class LspClientTest : CompletionTest, LspIntegrationTest() {
     }
 
     companion object {
-        private val WORKSPACE_PATH = System.getProperty("LSP_REMOTE_WORKSPACE_ROOT") ?:
-            LspClientTest::class.java.getResource("/lsp/lsp-users-projects-root-test")?.path
+        private val WORKSPACE_PATH = System.getProperty("LSP_REMOTE_WORKSPACE_ROOT")
+            ?: LspClientTest::class.java.getResource("/lsp/workspaces/lsp-users-projects-root")?.path
             ?: error("Could not find LSP remote workspace root")
         private val LSP_HOST = System.getProperty("LSP_HOST") ?: "localhost"
         private val LSP_PORT = System.getProperty("LSP_PORT")?.toInt() ?: 9999