KTL-3015 implement Kotlin LSP proxy for completions #878

S-furi · 2025-10-01T15:10:06Z

This PR introduces a new way of performing completions requests leveraging Kotlin-lsp. Two approaches are included:

RESTful on api/compiler/lsp/complete;
WebSocket approach.

Currently completions with this approach supports only the latest Kotlin version, but future developments include the support of such feature by using a dedicated client and workspace for each Kotlin version supported by the kotlin-compiler-server.
Moreover, the support for different platforms than Kotlin/JVM is strictly bound to what Kotlin-lsp supports, namely only Kotlin/JVM projects as of today.

common/src/main/kotlin/model/Completion.kt

completions/src/test/resources/lsp/lsp-users-projects-root-test/settings.gradle.kts

src/main/kotlin/com/compiler/server/configuration/WebSocketConfig.kt

src/main/kotlin/com/compiler/server/controllers/CompilerRestController.kt

src/main/kotlin/com/compiler/server/controllers/LspCompletionWebSocketHandler.kt

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

src/main/kotlin/com/compiler/server/controllers/LspCompletionWebSocketHandler.kt

S-furi · 2025-10-08T14:45:23Z

@dkrasnoff With recent commits I've made some changes that have probably changed the references to the request changes above. In short, I've

Resolved conflicts kotlin-community/dev base branch
Moved completion logic into a new springboot application module
LSP-based completions now leverage WebFlux
- Both REST endpoint (marked as suspendable) and WebSocket Implementation.
Moved LSP related files from project root to its corresponding resources folder (conversation reference)
Applied suggested refactors

I remain available for any eventual question.

completions/src/test/kotlin/AbstractCompletionTest.kt

completions/src/test/resources/lsp/lsp-users-projects-root-test/settings.gradle.kts

completions/build.gradle.kts

completions/src/main/kotlin/completions/controllers/ws/LspCompletionWebSocketHandler.kt

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

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

completions/src/main/kotlin/completions/model/Project.kt

completions/src/test/kotlin/ImportTest.kt

completions/build.gradle.kts

completions/src/main/kotlin/completions/controllers/ws/LspCompletionWebSocketHandler.kt

S-furi · 2025-10-16T13:06:11Z

@dkrasnoff I don't remember if we've already discussed this, but should I move also Completion defined in common subproject into the new completions subproject?

completions/src/test/kotlin/ImportTest.kt

Containerized intellij-lsp uses a dynamic port, we need to provide a way to make spring aware of this `through `LspIntegrationTest`.

now we can set the lsp remote workspace path (vital for containerized environments) through spring's application config. Moreover, a single workspace is now being used (i.e. no distinction between test and prod workspace).

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

completions/src/main/kotlin/completions/util/serializationUtil.kt

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

Implement lsp-based completions leveraging Kotlin-lsp through a WebFlux proxy capable of accepting POST requests and WebSocket requests.

S-furi self-assigned this Oct 1, 2025

S-furi requested a review from dkrasnoff as a code owner October 1, 2025 15:10

dkrasnoff reviewed Oct 7, 2025

View reviewed changes

src/main/kotlin/com/compiler/server/controllers/LspCompletionWebSocketHandler.kt Outdated Show resolved Hide resolved

src/main/kotlin/com/compiler/server/controllers/LspCompletionWebSocketHandler.kt Outdated Show resolved Hide resolved

S-furi force-pushed the exp/isolated-documents branch 2 times, most recently from d1fd552 to 7731e29 Compare October 8, 2025 14:35

S-furi force-pushed the exp/isolated-documents branch 5 times, most recently from 95cc73a to c4c51ad Compare October 14, 2025 09:50

dkrasnoff reviewed Oct 15, 2025

View reviewed changes

S-furi force-pushed the exp/isolated-documents branch from aa74429 to ff47e3a Compare October 16, 2025 11:26

dkrasnoff reviewed Oct 16, 2025

View reviewed changes

completions/src/test/kotlin/ImportTest.kt Outdated Show resolved Hide resolved

completions/build.gradle.kts Outdated Show resolved Hide resolved

completions/src/main/kotlin/completions/controllers/ws/LspCompletionWebSocketHandler.kt Outdated Show resolved Hide resolved

S-furi force-pushed the exp/isolated-documents branch from 0b4bc80 to 0180d35 Compare October 16, 2025 12:59

S-furi force-pushed the exp/isolated-documents branch 2 times, most recently from c24863c to 5ea84b9 Compare October 17, 2025 07:11

S-furi commented Oct 17, 2025

View reviewed changes

completions/src/test/kotlin/ImportTest.kt Outdated Show resolved Hide resolved

S-furi force-pushed the exp/isolated-documents branch 5 times, most recently from b4b537e to 7129757 Compare October 20, 2025 12:45

S-furi added 4 commits October 21, 2025 09:02

feat: implement LSP-based completions

c9cc370

chore: remove unnecessary gradle files for lsp projects roots

33933bb

chore: use version catalog for springboot deps

a6dca44

refactor: bring public function above private ones

14beab1

S-furi added 12 commits October 27, 2025 15:04

chore: reorder completion parsing logic

6cdad72

chore: move jackson's extension in proper package

da52ece

chore: move Icon in enums package

7c02e5e

refactor: remove package declaration in build file

ab4ef01

chore: link YT issue to todo

f77e871

chore: forward kotlin-lsp ports when running docker compose

ae108d9

feat: use spring's docker compose support for kotlin-lsp

3114371

chore: pass LspConfig to clients

3bb3a82

chore: use local spring profile for running with local compose

be1136a

chore: try use websites-team intellij-lsp docker image

3c22338

fix: make tests use lsp configuration taken from compose

6ff3f95

Containerized intellij-lsp uses a dynamic port, we need to provide a way to make spring aware of this `through `LspIntegrationTest`.

chore: use websites-team registry intellij-lsp docker image

aaa9ee3

S-furi force-pushed the exp/isolated-documents branch from 3e050fc to aaa9ee3 Compare October 28, 2025 09:44

S-furi added 7 commits October 28, 2025 10:53

chore: increase lsp-connection timeout in containerized environments

bfc4a9e

fix: fix typo in application-local config

88e51fb

refactor: distinguish between springdoc versions (webmvc or webflux)

7583164

chore: set up springdoc for completions subproject

ab77dd8

fix: use single project root workspace as remote for lsp

825c065

now we can set the lsp remote workspace path (vital for containerized environments) through spring's application config. Moreover, a single workspace is now being used (i.e. no distinction between test and prod workspace).

fix: do not start spring docker compose with prod config

529d1b8

chore: use single compose file for lsp

abd08d9

dkrasnoff reviewed Oct 29, 2025

View reviewed changes

completions/src/main/kotlin/completions/configuration/lsp/LspProperties.kt Show resolved Hide resolved

completions/src/main/kotlin/completions/util/serializationUtil.kt Outdated Show resolved Hide resolved

refactor: rename jackson extensions

5a8ee28

dkrasnoff reviewed Oct 29, 2025

View reviewed changes

completions/src/main/resources/application-local.yml Show resolved Hide resolved

S-furi added 4 commits October 29, 2025 11:07

chore: add additional config to spring docker compose configuration

f104477

chore: harden connection manager inFlight request avoidance logic

5d5be2d

fix: guard against possible null data (e.g. when in dumb mode)

099d5ab

chore: se kotlin-lsp tagged version

c62ad8d

dkrasnoff approved these changes Oct 31, 2025

View reviewed changes

S-furi merged commit 19f0348 into JetBrains:kotlin-community/dev Oct 31, 2025
1 check passed

dkrasnoff pushed a commit that referenced this pull request Nov 3, 2025

KTL-3015 implement Kotlin LSP proxy for completions (#878)

c3c4ac1

Implement lsp-based completions leveraging Kotlin-lsp through a WebFlux proxy capable of accepting POST requests and WebSocket requests.

KTL-3015 implement Kotlin LSP proxy for completions #878

KTL-3015 implement Kotlin LSP proxy for completions #878

Uh oh!

Conversation

S-furi commented Oct 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

S-furi commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

S-furi commented Oct 16, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

S-furi commented Oct 8, 2025 •

edited

Loading