From c2ad0ed068adaef031fe5913e5df7c9a133b7cc7 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Fri, 9 May 2025 16:24:08 -0700 Subject: [PATCH 1/3] fix(amazonq): move window/showMessage log output to idea.log --- .../amazonq/lsp/AmazonQLanguageClientImpl.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt index 2ddb460dc09..a86df481dd2 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt @@ -7,7 +7,6 @@ import com.intellij.diff.DiffContentFactory import com.intellij.diff.DiffManager import com.intellij.diff.DiffManagerEx import com.intellij.diff.requests.SimpleDiffRequest -import com.intellij.notification.NotificationType import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.fileChooser.FileChooserFactory import com.intellij.openapi.fileChooser.FileSaverDescriptor @@ -25,8 +24,10 @@ import org.eclipse.lsp4j.PublishDiagnosticsParams import org.eclipse.lsp4j.ShowDocumentParams import org.eclipse.lsp4j.ShowDocumentResult import org.eclipse.lsp4j.ShowMessageRequestParams +import org.slf4j.event.Level import software.aws.toolkits.core.utils.error import software.aws.toolkits.core.utils.getLogger +import software.aws.toolkits.core.utils.info import software.aws.toolkits.core.utils.warn import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager @@ -70,11 +71,16 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC override fun showMessage(messageParams: MessageParams) { val type = when (messageParams.type) { - MessageType.Error -> NotificationType.ERROR - MessageType.Warning -> NotificationType.WARNING - MessageType.Info, MessageType.Log -> NotificationType.INFORMATION + MessageType.Error -> Level.ERROR + MessageType.Warning -> Level.WARN + MessageType.Info, MessageType.Log -> Level.INFO } - println("$type: ${messageParams.message}") + + if (type == Level.ERROR && messageParams.message.lineSequence().firstOrNull()?.contains("NOTE: The AWS SDK for JavaScript (v2) is in maintenance mode.") == true) { + LOG.info { "Suppressed Flare AWS JS SDK v2 EoL error message" } + } + + LOG.atLevel(type).log(messageParams.message) } override fun showMessageRequest(requestParams: ShowMessageRequestParams): CompletableFuture? { From 9b8b6345e01ab73e201c951c2276d0b3734e5e3b Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Fri, 9 May 2025 16:26:43 -0700 Subject: [PATCH 2/3] Update AmazonQLanguageClientImpl.kt --- .../jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt index a86df481dd2..4af8d4375cb 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt @@ -78,6 +78,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC if (type == Level.ERROR && messageParams.message.lineSequence().firstOrNull()?.contains("NOTE: The AWS SDK for JavaScript (v2) is in maintenance mode.") == true) { LOG.info { "Suppressed Flare AWS JS SDK v2 EoL error message" } + return } LOG.atLevel(type).log(messageParams.message) From 38169630a1170c4289b94c40fcd1761ca404b98b Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 12 May 2025 09:58:43 -0700 Subject: [PATCH 3/3] lint --- .../services/amazonq/lsp/AmazonQLanguageClientImpl.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt index 4af8d4375cb..1042a63bc47 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt @@ -76,7 +76,9 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC MessageType.Info, MessageType.Log -> Level.INFO } - if (type == Level.ERROR && messageParams.message.lineSequence().firstOrNull()?.contains("NOTE: The AWS SDK for JavaScript (v2) is in maintenance mode.") == true) { + if (type == Level.ERROR && + messageParams.message.lineSequence().firstOrNull()?.contains("NOTE: The AWS SDK for JavaScript (v2) is in maintenance mode.") == true + ) { LOG.info { "Suppressed Flare AWS JS SDK v2 EoL error message" } return }