Skip to content

feat(amazonq): initialize flare lsp on project start #5366

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
merged 3 commits into from
Feb 13, 2025
Merged

feat(amazonq): initialize flare lsp on project start #5366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c33a740
feat(amazonq): initialize flare lsp on project start
rli Feb 12, 2025
9256837
passthroguh project
rli Feb 12, 2025
05429e4
Merge remote-tracking branch 'origin/feature/q-lsp' into rli/lsp-start
rli Feb 13, 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
2 changes: 2 additions & 0 deletions ...ty/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
import software.aws.toolkits.jetbrains.core.gettingstarted.emitUserState
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
Expand Down Expand Up @@ -52,6 +53,7 @@ class AmazonQStartupActivity : ProjectActivity {
CodeWhispererExplorerActionManager.getInstance().setIsFirstRestartAfterQInstall(false)
}
}
AmazonQLspService.getInstance(project)
startLsp(project)
if (runOnce.get()) return
emitUserState(project)
Expand Down
35 changes: 31 additions & 4 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.intellij.openapi.Disposable
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.Key
import com.intellij.util.io.await
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -48,6 +49,7 @@ import java.net.URI
import java.nio.charset.StandardCharsets
import java.time.Duration
import java.util.concurrent.Future

// https://github.com/redhat-developer/lsp4ij/blob/main/src/main/java/com/redhat/devtools/lsp4ij/server/LSPProcessListener.java
// JB impl and redhat both use a wrapper to handle input buffering issue
internal class LSPProcessListener : ProcessListener {
Expand Down Expand Up @@ -83,6 +85,32 @@ internal class LSPProcessListener : ProcessListener {

@Service(Service.Level.PROJECT)
class AmazonQLspService(private val project: Project, private val cs: CoroutineScope) : Disposable {
private var instance: AmazonQServerInstance? = null

init {
cs.launch {
// manage lifecycle RAII-like so we can restart at arbitrary time
// and suppress IDE error if server fails to start
try {
instance = AmazonQServerInstance(project, cs).also {
Disposer.register(this@AmazonQLspService, it)
}
} catch (e: Exception) {
LOG.warn(e) { "Failed to start LSP server" }
}
}
}

override fun dispose() {
}

companion object {
private val LOG = getLogger<AmazonQLspService>()
fun getInstance(project: Project) = project.service<AmazonQLspService>()
}
}

private class AmazonQServerInstance(private val project: Project, private val cs: CoroutineScope) : Disposable {
private val launcher: Launcher<AmazonQLanguageServer>

private val languageServer: AmazonQLanguageServer
Expand Down Expand Up @@ -180,10 +208,10 @@ class AmazonQLspService(private val project: Project, private val cs: CoroutineS

cs.launch {
val initializeResult = try {
withTimeout(Duration.ofSeconds(30)) {
withTimeout(Duration.ofSeconds(10)) {
languageServer.initialize(createInitializeParams()).await()
}
} catch (e: TimeoutCancellationException) {
} catch (_: TimeoutCancellationException) {
LOG.warn { "LSP initialization timed out" }
null
}
Expand Down Expand Up @@ -213,7 +241,6 @@ class AmazonQLspService(private val project: Project, private val cs: CoroutineS
}

companion object {
private val LOG = getLogger<AmazonQLspService>()
fun getInstance(project: Project) = project.service<AmazonQLspService>()
private val LOG = getLogger<AmazonQServerInstance>()
}
}
Loading