fix(amazonq): comments

Author: yzhangok

.changes/next-release/bugfix-7029c1d5-212c-48ac-9513-38f0beca8fa8.json

@@ -1,4 +1,4 @@
 {
   "type" : "bugfix",
-  "description" : "change to use withExtensionFilter to hide unallowed files when selecting image"
+  "description" : "Fix unsupported files being shown in file picker when selecting images for adding image context in Windows"
 }

plugins/amazonq/shared/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserCompatImpl.kt

@@ -0,0 +1,28 @@
+// 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
+
+/**
+ * FileChooserCompat implementation 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.
+ */
+internal class FileChooserCompatImpl : FileChooserCompat {
+    override fun applyExtensionFilter(
+        descriptor: FileChooserDescriptor,
+        filterName: String,
+        allowedExtensions: Set<String>
+    ): FileChooserDescriptor {
+        return descriptor.withFileFilter { virtualFile ->
+            if (virtualFile.isDirectory) {
+                true // Always allow directories for navigation
+            } else {
+                val extension = virtualFile.extension?.lowercase()
+                extension != null && allowedExtensions.contains(extension)
+            }
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileChooserCompatImpl.kt

@@ -0,0 +1,21 @@
+// 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
+
+/**
+ * FileChooserCompat implementation for IntelliJ Platform versions 2024.3+ (baseline >= 243).
+ * Uses withExtensionFilter method which provides both filtering functionality and visual
+ * filtering in the chooser dialog.
+ */
+internal class FileChooserCompatImpl : FileChooserCompat {
+    override fun applyExtensionFilter(
+        descriptor: FileChooserDescriptor,
+        filterName: String,
+        allowedExtensions: Set<String>
+    ): FileChooserDescriptor {
+        return descriptor.withExtensionFilter(filterName, *allowedExtensions.toTypedArray())
+    }
+}

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

@@ -9,7 +9,6 @@ import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.ide.BrowserUtil
 import com.intellij.notification.NotificationAction
 import com.intellij.notification.NotificationType
-import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
@@ -65,6 +64,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowO
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileChooserCompat
 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.codewhisperer.customization.CodeWhispererModelConfigurator
@@ -312,32 +312,8 @@ 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()
-                        if (isExtensionFilterSupported()) {
-                            // Use reflection to call withExtensionFilter which is only available in 2024.3+
-                            try {
-                                val method = this.javaClass.getMethod("withExtensionFilter", String::class.java, Array<String>::class.java)
-                                method.invoke(this, "Image", allowedExtensions.toTypedArray())
-                            } catch (e: Exception) {
-                                // Fallback to withFileFilter if reflection fails
-                                withFileFilter { virtualFile ->
-                                    if (virtualFile.isDirectory) {
-                                        true // Always allow directories for navigation
-                                    } else {
-                                        val extension = virtualFile.extension?.lowercase()
-                                        extension != null && allowedExtensions.contains(extension)
-                                    }
-                                }
-                            }
-                        } else {
-                            withFileFilter { virtualFile ->
-                                if (virtualFile.isDirectory) {
-                                    true // Always allow directories for navigation
-                                } else {
-                                    val extension = virtualFile.extension?.lowercase()
-                                    extension != null && allowedExtensions.contains(extension)
-                                }
-                            }
-                        }
+                        val fileChooserCompat = FileChooserCompat.getInstance()
+                        fileChooserCompat.applyExtensionFilter(this, "Images", allowedExtensions)
                     }
                 }
 
@@ -614,20 +590,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         }
     }
 
-    /**
-     * Checks if the current JetBrains IDE version supports the withExtensionFilter API.
-     *
-     * The withExtensionFilter method was introduced in IntelliJ Platform 2024.3 (baseline version 243).
-     * For older versions, we need to fall back to withFileFilter which provides similar functionality
-     * but with different UI behavior (files are not visually filtered in the file chooser dialog).
-     *
-     * @return true if the IDE version supports withExtensionFilter (2024.3+), false otherwise
-     */
-    private fun isExtensionFilterSupported(): Boolean {
-        val baselineVersion = ApplicationInfo.getInstance().build.baselineVersion
-        return baselineVersion >= 243 // 2024.3 or later
-    }
-
     companion object {
         val localHistoryPath = Paths.get(
             UserHomeDirectoryUtils.userHomeDirectory(),

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

@@ -0,0 +1,32 @@
+// 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
+
+/**
+ * Compatibility interface for handling file chooser extension filtering across different IntelliJ Platform versions.
+ * 
+ * The withExtensionFilter method was introduced in IntelliJ Platform 2024.3 (baseline version 243).
+ * For older versions, fall back to withFileFilter which provides similar functionality
+ */
+interface FileChooserCompat {
+    /**
+     * Applies file extension filtering to the given FileChooserDescriptor.
+     * 
+     * @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
+
+    companion object {
+        fun getInstance(): FileChooserCompat = FileChooserCompatImpl()
+    }
+}