Merge branch 'main' into samgst/bump-252

samgst-amazon · web-flow · commit 78667131e880 · 2025-08-01T16:24:58.000-07:00
diff --git a/.changes/3.87.json b/.changes/3.87.json
@@ -0,0 +1,11 @@
+{
+  "date" : "2025-07-30",
+  "version" : "3.87",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "change to use promptStickyCard to for image verification notification"
+  }, {
+    "type" : "bugfix",
+    "description" : "Suppress IDE error when current editor context is not valid for Amazon Q"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-7029c1d5-212c-48ac-9513-38f0beca8fa8.json b/.changes/next-release/bugfix-7029c1d5-212c-48ac-9513-38f0beca8fa8.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix unsupported files being shown in file picker when selecting images for adding image context in Windows"
+}
diff --git a/.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json b/.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json
diff --git a/.changes/next-release/bugfix-846e7004-5426-4f6b-970f-2b9437314b98.json b/.changes/next-release/bugfix-846e7004-5426-4f6b-970f-2b9437314b98.json
diff --git a/.changes/next-release/bugfix-bf74f9c0-2d61-420d-854d-a5b0daa5861a.json b/.changes/next-release/bugfix-bf74f9c0-2d61-420d-854d-a5b0daa5861a.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix the issue that sometime images added via drag & drop are incorrectly routed to pinned context"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# _3.87_ (2025-07-30)
+- **(Bug Fix)** change to use promptStickyCard to for image verification notification
+- **(Bug Fix)** Suppress IDE error when current editor context is not valid for Amazon Q
+
 # _3.86_ (2025-07-16)
 - **(Bug Fix)** - Fixed "Insert to Cursor" button to correctly insert code blocks at the current cursor position in the active file
 
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.87-SNAPSHOT
+toolkitVersion=3.88-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -49,7 +49,9 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTrans
 import software.aws.toolkits.resources.message
 import java.awt.datatransfer.DataFlavor
 import java.awt.dnd.DropTarget
+import java.awt.dnd.DropTargetDragEvent
 import java.awt.dnd.DropTargetDropEvent
+import java.awt.dnd.DropTargetEvent
 import java.io.File
 import java.util.concurrent.CompletableFuture
 import javax.imageio.ImageIO.read
@@ -138,6 +140,15 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                             // As an alternative, enabling the native drag in JCEF,
                             // and let the native handling the drop event, and update the UI through JS bridge.
                             val dropTarget = object : DropTarget() {
+                                override fun dragEnter(dtde: DropTargetDragEvent) {
+                                    setDragAndDropOverlayVisible(browserInstance, true)
+                                }
+                                override fun dragOver(dtde: DropTargetDragEvent) {
+                                    setDragAndDropOverlayVisible(browserInstance, true)
+                                }
+                                override fun dragExit(dte: DropTargetEvent) {
+                                    setDragAndDropOverlayVisible(browserInstance, false)
+                                }
                                 override fun drop(dtde: DropTargetDropEvent) {
                                     try {
                                         dtde.acceptDrop(dtde.dropAction)
@@ -166,20 +177,16 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                                 validImages.subList(20, validImages.size).clear()
                                             }
 
+                                            executeJavaScript(browserInstance, "window.resetTopBarClicked()")
+
+                                            setDragAndDropOverlayVisible(browserInstance, false)
+
                                             val json = OBJECT_MAPPER.writeValueAsString(validImages)
-                                            browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
-                                                "window.handleNativeDrop('$json')",
-                                                browserInstance.jcefBrowser.cefBrowser.url,
-                                                0
-                                            )
+                                            executeJavaScript(browserInstance, "window.handleNativeDrop('$json')")
 
                                             if (errorMessages.isNotEmpty()) {
                                                 val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
-                                                browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
-                                                    "window.handleNativeNotify('$errorJson')",
-                                                    browserInstance.jcefBrowser.cefBrowser.url,
-                                                    0
-                                                )
+                                                executeJavaScript(browserInstance, "window.handleNativeNotify('$errorJson')")
                                             }
 
                                             dtde.dropComplete(true)
@@ -286,6 +293,22 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
         }
     }
 
+    private fun executeJavaScript(browserInstance: Browser, jsCommand: String) {
+        try {
+            browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
+                jsCommand,
+                browserInstance.jcefBrowser.cefBrowser.url,
+                0
+            )
+        } catch (e: Exception) {
+            LOG.error { "Failed to execute JavaScript: $jsCommand - ${e.message}" }
+        }
+    }
+
+    private fun setDragAndDropOverlayVisible(browserInstance: Browser, visible: Boolean) {
+        executeJavaScript(browserInstance, "window.setDragAndDropVisible('$visible')")
+    }
+
     private fun validateImageFile(file: File, allowedTypes: Set<String>, maxFileSize: Double, maxDimension: Int): String? {
         val fileName = file.name
         val ext = fileName.substringAfterLast('.', "").lowercase()
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -189,6 +189,15 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                             },
                         })
                     };
+                    
+                    window.setDragAndDropVisible = function(visibility) {
+                        const parsedVisibility = JSON.parse(visibility);
+                        qChat.setDragOverlayVisible(qChat.getSelectedTabId(), parsedVisibility)
+                    };
+                    
+                    window.resetTopBarClicked = function() {
+                        qChat.resetTopBarClicked(qChat.getSelectedTabId())
+                    };
                 }
             </script>        
         """.trimIndent()
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
@@ -44,10 +44,10 @@ class ThemeBrowserAdapter {
         append(CssVariable.TextColorLight, theme.emptyText)
         append(CssVariable.TextColorDisabled, theme.inactiveText)
 
-        append(CssVariable.Background, bg)
+        append(CssVariable.Background, theme.background)
         append(CssVariable.BackgroundAlt, altBg)
         append(CssVariable.CardBackground, bg)
-        append(CssVariable.CardBackgroundAlt, altBg)
+        append(CssVariable.CardBackgroundAlt, theme.editorBackground)
         append(CssVariable.BorderDefault, theme.border)
         append(CssVariable.BorderFocused, theme.inputBorderFocused)
         append(CssVariable.BorderUnfocused, theme.inputBorderUnfocused)
diff --git a/plugins/amazonq/shared/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserFilters.kt b/plugins/amazonq/shared/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserFilters.kt
@@ -0,0 +1,29 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
+
+import com.intellij.openapi.fileChooser.FileChooserDescriptor
+
+/**
+ * Applies file extension filtering to the given FileChooserDescriptor for IntelliJ Platform versions before 2024.3 (baseline < 243).
+ * Uses withFileFilter method which provides filtering functionality but doesn't visually filter
+ * files in the chooser dialog.
+ *
+ * @param descriptor The FileChooserDescriptor to apply filtering to
+ * @param filterName The display name for the filter (e.g., "Images") - unused in this version
+ * @param allowedExtensions Set of allowed file extensions (e.g., "jpg", "png")
+ * @return The modified FileChooserDescriptor
+ */
+fun applyExtensionFilter(
+    descriptor: FileChooserDescriptor,
+    @Suppress("UNUSED_PARAMETER") filterName: String,
+    allowedExtensions: Set<String>,
+): FileChooserDescriptor = descriptor.withFileFilter { virtualFile ->
+    if (virtualFile.isDirectory) {
+        true // Always allow directories for navigation
+    } else {
+        val extension = virtualFile.extension?.lowercase()
+        extension != null && allowedExtensions.contains(extension)
+    }
+}
diff --git a/plugins/amazonq/shared/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserFilters.kt b/plugins/amazonq/shared/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserFilters.kt
@@ -0,0 +1,22 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
+
+import com.intellij.openapi.fileChooser.FileChooserDescriptor
+
+/**
+ * Applies file extension filtering to the given FileChooserDescriptor for IntelliJ Platform versions 2024.3+ (baseline >= 243).
+ * Uses withExtensionFilter method which provides both filtering functionality and visual
+ * filtering in the chooser dialog.
+ *
+ * @param descriptor The FileChooserDescriptor to apply filtering to
+ * @param filterName The display name for the filter (e.g., "Images")
+ * @param allowedExtensions Set of allowed file extensions (e.g., "jpg", "png")
+ * @return The modified FileChooserDescriptor
+ */
+fun applyExtensionFilter(
+    descriptor: FileChooserDescriptor,
+    filterName: String,
+    allowedExtensions: Set<String>,
+): FileChooserDescriptor = descriptor.withExtensionFilter(filterName, *allowedExtensions.toTypedArray())
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
@@ -66,6 +66,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.TelemetryParsingUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.applyExtensionFilter
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
@@ -311,15 +312,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                     if (params.filters.isNotEmpty() && !params.canSelectFolders) {
                         // Create a combined list of all allowed extensions
                         val allowedExtensions = params.filters.values.flatten().toSet()
-
-                        withFileFilter { virtualFile ->
-                            if (virtualFile.isDirectory) {
-                                true // Always allow directories for navigation
-                            } else {
-                                val extension = virtualFile.extension?.lowercase()
-                                extension != null && allowedExtensions.contains(extension)
-                            }
-                        }
+                        applyExtensionFilter(this, "Images", allowedExtensions)
                     }
                 }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix unsupported files being shown in file picker when selecting images for adding image context in Windows"
 +}