merge conflicts resolved

manodnyab · manodnyab · commit 3a46078a5dfd · 2025-04-29T17:57:01.000-07:00
diff --git a/.changes/3.69.json b/.changes/3.69.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-28",
+  "version" : "3.69",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for 2024.1.x IDEs"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for Gateway 2024.3"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-31222d0f-5ff2-4495-9bf2-e354eabc82c7.json b/.changes/next-release/bugfix-31222d0f-5ff2-4495-9bf2-e354eabc82c7.json
diff --git a/.changes/next-release/bugfix-7c7e1720-545f-4b5e-8d21-511f40fabf38.json b/.changes/next-release/bugfix-7c7e1720-545f-4b5e-8d21-511f40fabf38.json
diff --git a/.changes/next-release/bugfix-a7fedb6e-13ab-4d6a-a9ea-293b3f533bad.json b/.changes/next-release/bugfix-a7fedb6e-13ab-4d6a-a9ea-293b3f533bad.json
diff --git a/.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json b/.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json
diff --git a/.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json b/.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.69_ (2025-04-28)
+- **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
+- **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments
+- **(Bug Fix)** Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt
+- **(Removal)** Removed support for 2024.1.x IDEs
+- **(Removal)** Removed support for Gateway 2024.3
+
 # _3.68_ (2025-04-23)
 - **(Feature)** Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat
 - **(Feature)** Amazon Q /test: Remove unsupported message for non-java python languages
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.69-SNAPSHOT
+toolkitVersion=3.70-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(project(":plugin-amazonq:codewhisperer"))
     implementation(project(":plugin-amazonq:mynah-ui"))
     implementation(project(":plugin-amazonq:shared"))
+    implementation(libs.bundles.jackson)
     implementation(libs.lsp4j)
 
     testImplementation(project(":plugin-core"))
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -1,6 +1,6 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
+@file:Suppress("BannedImports")
 package software.aws.toolkits.jetbrains.services.amazonq.webview
 
 import com.fasterxml.jackson.databind.JsonNode
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt
@@ -22,6 +22,7 @@ import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntime
 import software.amazon.awssdk.services.codewhispererstreaming.CodeWhispererStreamingAsyncClientBuilder
 import software.aws.toolkits.core.ToolkitClientCustomizer
 import software.aws.toolkits.core.utils.tryOrNull
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QDefaultServiceConfig
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QEndpoints
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.net.Proxy
@@ -42,7 +43,7 @@ class CodeWhispererEndpointCustomizer : ToolkitClientCustomizer {
         if (builder is CodeWhispererRuntimeClientBuilder || builder is CodeWhispererStreamingAsyncClientBuilder) {
             val endpoint = tryOrNull { QEndpoints.getQEndpointWithRegion(regionId) }
                 ?.let { URI.create(it) }
-                ?: URI.create(QEndpoints.Q_DEFAULT_SERVICE_CONFIG.ENDPOINT)
+                ?: URI.create(QDefaultServiceConfig.ENDPOINT)
             builder
                 .endpointOverride(endpoint)
                 .region(Region.of(regionId))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QEndpointsTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QEndpointsTest.kt
@@ -4,15 +4,18 @@
 package software.aws.toolkits.jetbrains.services.codewhisperer
 
 import com.intellij.testFramework.ApplicationExtension
-import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.api.extension.RegisterExtension
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QDefaultServiceConfig
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QEndpoints
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionEndpoint
 import software.aws.toolkits.jetbrains.utils.rules.RegistryExtension
+import software.aws.toolkits.jetbrains.utils.satisfiesKt
 
 @ExtendWith(ApplicationExtension::class)
-class QEndpointsTest : BasePlatformTestCase() {
+class QEndpointsTest {
 
     @JvmField
     @RegisterExtension
@@ -30,12 +33,28 @@ class QEndpointsTest : BasePlatformTestCase() {
         registryExtension.setValue("amazon.q.endpoints.json", testJson)
 
         val parsed = QEndpoints.listRegionEndpoints()
-        assertEquals(2, parsed.size)
+        assertThat(parsed).hasSize(2)
+            .satisfiesKt { endpoints ->
+                assertThat(endpoints).satisfiesExactlyInAnyOrder(
+                    { assertThat(it).isEqualTo(QRegionEndpoint("us-east-1", "https://codewhisperer.us-east-1.amazonaws.com/")) },
+                    { assertThat(it).isEqualTo(QRegionEndpoint("eu-central-1", "https://rts.prod-eu-central-1.codewhisperer.ai.aws.dev/")) },
+                )
+            }
+    }
 
-        val iad = parsed.first { it.region == "us-east-1" }
-        assertEquals("https://codewhisperer.us-east-1.amazonaws.com/", iad.endpoint)
+    @Test
+    fun `uses default entries if blank`() {
+        registryExtension.setValue("amazon.q.endpoints.json", "")
 
-        val fra = parsed.first { it.region == "eu-central-1" }
-        assertEquals("https://rts.prod-eu-central-1.codewhisperer.ai.aws.dev/", fra.endpoint)
+        assertThat(QEndpoints.listRegionEndpoints()).isEqualTo(QDefaultServiceConfig.ENDPOINT_MAP.toEndpointList())
     }
+
+    @Test
+    fun `uses default entries if invalid`() {
+        registryExtension.setValue("amazon.q.endpoints.json", "asdfadfkajdklf32.4;'2l4;234l23.424';1l1!!@#!")
+
+        assertThat(QEndpoints.listRegionEndpoints()).isEqualTo(QDefaultServiceConfig.ENDPOINT_MAP.toEndpointList())
+    }
+
+    private fun Map<String, String>.toEndpointList() = map { (region, endpoint) -> QRegionEndpoint(region, endpoint) }
 }
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
@@ -4,15 +4,22 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 import com.intellij.notification.NotificationType
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFileManager
 import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
 import org.eclipse.lsp4j.ConfigurationParams
 import org.eclipse.lsp4j.MessageActionItem
 import org.eclipse.lsp4j.MessageParams
 import org.eclipse.lsp4j.MessageType
 import org.eclipse.lsp4j.ProgressParams
 import org.eclipse.lsp4j.PublishDiagnosticsParams
+import org.eclipse.lsp4j.ShowDocumentParams
+import org.eclipse.lsp4j.ShowDocumentResult
 import org.eclipse.lsp4j.ShowMessageRequestParams
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
@@ -56,6 +63,30 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         showMessage(message)
     }
 
+    override fun showDocument(params: ShowDocumentParams?): CompletableFuture<ShowDocumentResult> {
+        try {
+            if (params == null || params.uri.isNullOrEmpty()) {
+                return CompletableFuture.completedFuture(ShowDocumentResult(false))
+            }
+
+            ApplicationManager.getApplication().invokeLater {
+                try {
+                    val virtualFile = VirtualFileManager.getInstance().findFileByUrl(params.uri)
+                        ?: throw IllegalArgumentException("Cannot find file: ${params.uri}")
+
+                    FileEditorManager.getInstance(project).openFile(virtualFile, true)
+                } catch (e: Exception) {
+                    LOG.warn { "Failed to show document: ${params.uri}" }
+                }
+            }
+
+            return CompletableFuture.completedFuture(ShowDocumentResult(true))
+        } catch (e: Exception) {
+            LOG.warn { "Error showing document" }
+            return CompletableFuture.completedFuture(ShowDocumentResult(false))
+        }
+    }
+
     override fun getConnectionMetadata(): CompletableFuture<ConnectionMetadata> =
         CompletableFuture.supplyAsync {
             val connection = ToolkitConnectionManager.getInstance(project)
@@ -132,4 +163,8 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
             error("Cannot handle partial chat")
         }
     }
+
+    companion object {
+        private val LOG = getLogger<AmazonQLanguageClientImpl>()
+    }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
@@ -15,7 +15,7 @@ class AwsServerCapabilitiesProvider {
         this.serverCapabilities = serverCapabilities
     }
 
-    fun getChatOptions() =  DEFAULT_CHAT_OPTIONS
+    fun getChatOptions() =  serverCapabilities?.chatOptions ?: DEFAULT_CHAT_OPTIONS
 
     companion object {
         fun getInstance(project: Project) = project.service<AwsServerCapabilitiesProvider>()
@@ -44,7 +44,7 @@ data class AwsServerCapabilities(
 data class ChatOptions(
     val quickActions: QuickActions,
     val history: Boolean,
-    val export: Boolean
+    val export: Boolean,
 )
 
 data class QuickActions(
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatPrompt.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatPrompt.kt
@@ -3,6 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
+import com.fasterxml.jackson.annotation.JsonProperty
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.Command
+
 data class ChatPrompt(
     val prompt: String,
     val escapedPrompt: String,
@@ -17,10 +20,17 @@ data class SendChatPromptRequest(
 data class MidChatPrompt(
     val prompt: InnerChatPrompt,
     val tabId: String,
+    val context: List<Command>?,
 )
 
 data class InnerChatPrompt(
     val prompt: String,
     val escapedPrompt: String,
-    val context: List<String>? = null,
+    val context: List<Command>? = null,
+    val options: InnerChatOptions?,
+)
+
+data class InnerChatOptions(
+    @JsonProperty("pair-programmer-mode")
+    val pairProgrammingMode: String,
 )
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QEndpoints.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QEndpoints.kt
@@ -8,23 +8,29 @@ import com.intellij.openapi.util.registry.Registry
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 
-object QEndpoints {
-    private val LOG = getLogger<QRegionEndpoint>()
-    data class QRegionEndpoint(val region: String, val endpoint: String)
+data class QRegionEndpoint(val region: String, val endpoint: String)
 
-    object Q_DEFAULT_SERVICE_CONFIG {
-        const val REGION = "us-east-1"
-        const val ENDPOINT = "https://codewhisperer.us-east-1.amazonaws.com/"
-    }
+object QDefaultServiceConfig {
+    const val REGION = "us-east-1"
+    const val ENDPOINT = "https://codewhisperer.us-east-1.amazonaws.com/"
+
+    val ENDPOINT_MAP = mapOf(
+        "us-east-1" to "https://q.us-east-1.amazonaws.com/",
+        "eu-central-1" to "https://q.eu-central-1.amazonaws.com/"
+    )
+}
+
+object QEndpoints {
+    private val LOG = getLogger<QEndpoints>()
 
     private fun parseEndpoints(): Map<String, String> {
-        val rawJson = Registry.get("amazon.q.endpoints.json").asString().takeIf { it.isNotBlank() } ?: return emptyMap()
+        val rawJson = Registry.get("amazon.q.endpoints.json").asString().takeIf { it.isNotBlank() } ?: return QDefaultServiceConfig.ENDPOINT_MAP
         return try {
             val regionList: List<QRegionEndpoint> = jacksonObjectMapper().readValue(rawJson)
             regionList.associate { it.region to it.endpoint }
         } catch (e: Exception) {
             LOG.warn(e) { "Failed to parse amazon.q.endpoints.json: $rawJson" }
-            emptyMap()
+            QDefaultServiceConfig.ENDPOINT_MAP
         }
     }
 
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt
@@ -188,7 +188,7 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
         }
 
         val settings = conn.getConnectionSettings()
-        val awsRegion = AwsRegionProvider.getInstance()[QEndpoints.Q_DEFAULT_SERVICE_CONFIG.REGION] ?: error("unknown region from Q default service config")
+        val awsRegion = AwsRegionProvider.getInstance()[QDefaultServiceConfig.REGION] ?: error("unknown region from Q default service config")
 
         // TODO: different window should be able to select different profile
         return activeProfile(project)?.let { profile ->
diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
@@ -87,8 +87,7 @@
         <registryKey key="amazon.q.endpoint" description="Endpoint to use for Amazon Q"
                      defaultValue="" restartRequired="true"/>
         <registryKey key="amazon.q.endpoints.json" description="List of region-endpoint pairs in JSON array form"
-                     defaultValue="[{&quot;region&quot;:&quot;us-east-1&quot;,&quot;endpoint&quot;:&quot;https://q.us-east-1.amazonaws.com/&quot;},
-                   {&quot;region&quot;:&quot;eu-central-1&quot;,&quot;endpoint&quot;:&quot;https://q.eu-central-1.amazonaws.com/&quot;}]"
+                     defaultValue=""
                      restartRequired="true"/>
         <registryKey key="inline.completion.rem.dev.use.rhizome" description="Defined by IntelliJ. Used for Amazon Q to display suggestions on remote."
                      defaultValue="false" restartRequired="true"/>
