fix(amazonq): also terminate lsp process on other failures (#5371)

rli · web-flow · commit 3a866a66a7d8 · 2025-02-12T17:56:06.000-08:00
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
@@ -214,11 +214,13 @@ private class AmazonQServerInstance(private val project: Project, private val cs
             } catch (_: TimeoutCancellationException) {
                 LOG.warn { "LSP initialization timed out" }
                 null
+            } catch (e: Exception) {
+                LOG.warn(e) { "LSP initialization failed" }
+                null
             }
 
             // then if this succeeds then we can allow the client to send requests
             if (initializeResult == null) {
-                LOG.warn { "LSP initialization failed" }
                 launcherHandler.destroyProcess()
             }
             languageServer.initialized(InitializedParams())

Original file line number	Diff line number	Diff line change
`@@ -214,11 +214,13 @@ private class AmazonQServerInstance(private val project: Project, private val cs`
`214`	`214`	`} catch (_: TimeoutCancellationException) {`
`215`	`215`	`LOG.warn { "LSP initialization timed out" }`
`216`	`216`	`null`
	`217`	`+ } catch (e: Exception) {`
	`218`	`+ LOG.warn(e) { "LSP initialization failed" }`
	`219`	`+ null`
`217`	`220`	`}`
`218`	`221`
`219`	`222`	`// then if this succeeds then we can allow the client to send requests`
`220`	`223`	`if (initializeResult == null) {`
`221`		`- LOG.warn { "LSP initialization failed" }`
`222`	`224`	`launcherHandler.destroyProcess()`
`223`	`225`	`}`
`224`	`226`	`languageServer.initialized(InitializedParams())`