Skip to content

fix(amazonq): remove pointless timeout on initialize #5687

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
Parent: feat(amazonq): Agentic coding experience
merged 3 commits into from
May 8, 2025
Merged

fix(amazonq): remove pointless timeout on initialize #5687

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00edfb5
fix(amazonq): remove pointless timeout on initialize
rli May 8, 2025
9df8caf
Merge branch 'feature/q-lsp-chat' into rli-patch-11
rli May 8, 2025
d253102
lint
rli May 8, 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
8 changes: 1 addition & 7 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 @@ -24,7 +24,6 @@
import com.intellij.util.io.await
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.async
import kotlinx.coroutines.future.asCompletableFuture
import kotlinx.coroutines.runBlocking
Expand Down Expand Up @@ -334,12 +333,7 @@
encryptionManager.writeInitializationPayload(launcherHandler.process.outputStream)

val initializeResult = try {
withTimeout(5.seconds) {
languageServer.initialize(createInitializeParams()).await()
}
} catch (_: TimeoutCancellationException) {
LOG.warn { "LSP initialization timed out" }
null
languageServer.initialize(createInitializeParams()).await()

Check warning on line 336 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt#L336 

Added line #L336 was not covered by tests
} catch (e: Exception) {
LOG.warn(e) { "LSP initialization failed" }
null
Expand Down
Loading