Skip to content

Commit 67bd41c

Browse files
authored
fix(amazonq): move window/showMessage log output to idea.log (#5708)
1 parent 85cdbd6 commit 67bd41c

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.intellij.diff.DiffContentFactory
77
import com.intellij.diff.DiffManager
88
import com.intellij.diff.DiffManagerEx
99
import com.intellij.diff.requests.SimpleDiffRequest
10-
import com.intellij.notification.NotificationType
1110
import com.intellij.openapi.application.ApplicationManager
1211
import com.intellij.openapi.fileChooser.FileChooserFactory
1312
import com.intellij.openapi.fileChooser.FileSaverDescriptor
@@ -25,8 +24,10 @@ import org.eclipse.lsp4j.PublishDiagnosticsParams
2524
import org.eclipse.lsp4j.ShowDocumentParams
2625
import org.eclipse.lsp4j.ShowDocumentResult
2726
import org.eclipse.lsp4j.ShowMessageRequestParams
27+
import org.slf4j.event.Level
2828
import software.aws.toolkits.core.utils.error
2929
import software.aws.toolkits.core.utils.getLogger
30+
import software.aws.toolkits.core.utils.info
3031
import software.aws.toolkits.core.utils.warn
3132
import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
3233
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
@@ -70,11 +71,19 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
7071

7172
override fun showMessage(messageParams: MessageParams) {
7273
val type = when (messageParams.type) {
73-
MessageType.Error -> NotificationType.ERROR
74-
MessageType.Warning -> NotificationType.WARNING
75-
MessageType.Info, MessageType.Log -> NotificationType.INFORMATION
74+
MessageType.Error -> Level.ERROR
75+
MessageType.Warning -> Level.WARN
76+
MessageType.Info, MessageType.Log -> Level.INFO
7677
}
77-
println("$type: ${messageParams.message}")
78+
79+
if (type == Level.ERROR &&
80+
messageParams.message.lineSequence().firstOrNull()?.contains("NOTE: The AWS SDK for JavaScript (v2) is in maintenance mode.") == true
81+
) {
82+
LOG.info { "Suppressed Flare AWS JS SDK v2 EoL error message" }
83+
return
84+
}
85+
86+
LOG.atLevel(type).log(messageParams.message)
7887
}
7988

8089
override fun showMessageRequest(requestParams: ShowMessageRequestParams): CompletableFuture<MessageActionItem?>? {

0 commit comments

Comments
 (0)