use params to select different file descriptor

Author: zuoyaofu

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
+import com.google.gson.Gson
 import com.intellij.idea.AppMode
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.service
@@ -44,13 +45,11 @@ import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
 import software.aws.toolkits.resources.message
-import java.util.concurrent.CompletableFuture
-import javax.swing.JButton
+import java.awt.datatransfer.DataFlavor
 import java.awt.dnd.DropTarget
 import java.awt.dnd.DropTargetDropEvent
-import java.awt.datatransfer.DataFlavor
-import com.google.gson.Gson
-import java.util.Base64
+import java.util.concurrent.CompletableFuture
+import javax.swing.JButton
 
 class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Disposable {
     private val browser = CompletableFuture<Browser>()
@@ -133,7 +132,6 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                             // Add DropTarget to the browser component
                             val dropTarget = object : DropTarget() {
                                 override fun drop(dtde: DropTargetDropEvent) {
-
                                     try {
                                         dtde.acceptDrop(dtde.dropAction)
                                         val transferable = dtde.transferable
@@ -192,8 +190,6 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                                 validImages.subList(20, validImages.size).clear()
                                             }
 
-
-
                                             val json = Gson().toJson(validImages).replace("\\", "\\\\").replace("'", "\\'")
                                             browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
                                                 "window.handleNativeDrop('$json')",
@@ -207,7 +203,6 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                                 browserInstance.jcefBrowser.cefBrowser.url,
                                                 0
                                             )
-
                                         }
                                         dtde.dropComplete(true)
                                     } catch (e: Exception) {
@@ -216,7 +211,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                     }
                                 }
                             }
-                            
+
                             // Set DropTarget on the browser component and its children
                             browserInstance.component()?.let { component ->
                                 component.dropTarget = dropTarget

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

@@ -255,13 +255,68 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
     override fun showOpenFileDialog(params: ShowOpenFileDialogParams): CompletableFuture<LSPAny> {
         return CompletableFuture.supplyAsync(
             {
-                val descriptor = if (params.canSelectMany) {
-                    FileChooserDescriptorFactory.createMultipleFilesNoJarsDescriptor().apply {
-                        title = "Select Files"
-                        description = "Choose files to open"
+                // Handle the case where both canSelectFiles and canSelectFolders are false (should never be sent from flare)
+                if (!params.canSelectFiles && !params.canSelectFolders) {
+                    return@supplyAsync mapOf("uris" to emptyList<String>()) as LSPAny
+                }
+
+                val descriptor = when {
+                    params.canSelectFolders && params.canSelectFiles -> {
+                        if (params.canSelectMany) {
+                            FileChooserDescriptorFactory.createSingleFileOrFolderDescriptor()
+                        } else {
+                            FileChooserDescriptorFactory.createAllButJarContentsDescriptor()
+                        }
+                    }
+                    params.canSelectFolders -> {
+                        if (params.canSelectMany) {
+                            FileChooserDescriptorFactory.createMultipleFoldersDescriptor()
+                        } else {
+                            FileChooserDescriptorFactory.createSingleFolderDescriptor()
+                        }
+                    }
+                    else -> {
+                        if (params.canSelectMany) {
+                            FileChooserDescriptorFactory.createMultipleFilesNoJarsDescriptor()
+                        } else {
+                            FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
+                        }
+                    }
+                }.apply {
+                    withTitle(
+                        params.title ?: when {
+                            params.canSelectFolders && params.canSelectFiles -> "Select Files or Folders"
+                            params.canSelectFolders -> "Select Folders"
+                            else -> "Select Files"
+                        }
+                    )
+                    withDescription(
+                        when {
+                            params.canSelectFolders && params.canSelectFiles -> "Choose files or folders to open"
+                            params.canSelectFolders -> "Choose folders to open"
+                            else -> "Choose files to open"
+                        }
+                    )
+
+                    // Apply file filters if provided
+                    if (params.filters.isNotEmpty() && !params.canSelectFolders) {
+                        // Create a combined list of all allowed extensions
+                        val allowedExtensions = params.filters.values.flatten()
+                            .map { pattern ->
+                                // Convert patterns like "*.jpg" to "jpg"
+                                pattern.removePrefix("*.").lowercase()
+                            }
+                            .toSet()
+
+                        withFileFilter { virtualFile ->
+                            if (virtualFile.isDirectory) {
+                                true // Always allow directories for navigation
+                            } else {
+                                val extension = virtualFile.extension?.lowercase()
+                                extension != null && allowedExtensions.contains(extension)
+                            }
+                        }
                     }
-                } else {
-                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
                 }
 
                 val chosenFiles = FileChooser.chooseFiles(descriptor, project, null)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/showOpenFileDialogParams.kt

@@ -8,6 +8,5 @@ data class ShowOpenFileDialogParams(
     val canSelectFolders: Boolean = false,
     val canSelectMany: Boolean = false,
     val filters: Map<String, List<String>> = emptyMap(),
-    val defaultUri: String? = null,
     val title: String? = null,
 )