feat(WorkspaceFileSearchPopup): redesign file search UI

Refactor file search popup to match IntelliJ IDEA style with improved navigation, keyboard shortcuts, and better user experience. Rename ModelSelectorsManager to InputSelectorsManager for consistency.

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/AutoDevInputSection.kt

@@ -29,19 +29,13 @@ class AutoDevInputSection(
     val disposable: Disposable?,
     showAgent: Boolean = true
 ) : BorderLayoutPanel() {
-
-    // Event dispatcher
     val editorListeners = EventDispatcher.create(AutoDevInputListener::class.java)
-
-    // Manager components
     private val inputControlsManager = InputControlsManager(project, disposable, editorListeners)
-    private val modelSelectorsManager = ModelSelectorsManager(project, showAgent)
+    private val inputSelectorsManager = InputSelectorsManager(project, showAgent)
     private val fileWorkspaceManager = FileWorkspaceManager(project, disposable)
 
-    // UI panels
     private val inputPanel = BorderLayoutPanel()
 
-    // Convenience accessors
     val focusableComponent: JComponent get() = inputControlsManager.getFocusableComponent()
 
     fun renderText(): String {
@@ -59,15 +53,11 @@ class AutoDevInputSection(
     }
 
     init {
-        // Initialize all managers
         inputControlsManager.initialize(this)
-        val leftPanel = modelSelectorsManager.initialize()
+        val leftPanel = inputSelectorsManager.initialize()
         val headerPanel = fileWorkspaceManager.initialize(inputControlsManager.input)
 
-        // Setup layout
         setupLayout(leftPanel, headerPanel)
-
-        // Setup listeners
         addListener(object : AutoDevInputListener {
             override fun editorAdded(editor: EditorEx) {
                 this@AutoDevInputSection.initEditor()
@@ -91,7 +81,7 @@ class AutoDevInputSection(
             inputControlsManager.input.minimumSize = Dimension(inputControlsManager.input.minimumSize.width, 64)
             layoutPanel.addToLeft(leftPanel)
         } else {
-            layoutPanel.addToLeft(modelSelectorsManager.modelSelector)
+            layoutPanel.addToLeft(inputSelectorsManager.modelSelector)
         }
 
         layoutPanel.addToCenter(horizontalGlue)
@@ -135,14 +125,14 @@ class AutoDevInputSection(
     }
 
     // Agent management methods
-    fun hasSelectedAgent(): Boolean = modelSelectorsManager.hasSelectedAgent()
+    fun hasSelectedAgent(): Boolean = inputSelectorsManager.hasSelectedAgent()
 
-    fun getSelectedAgent(): CustomAgentConfig = modelSelectorsManager.getSelectedAgent()
+    fun getSelectedAgent(): CustomAgentConfig = inputSelectorsManager.getSelectedAgent()
 
-    fun selectAgent(config: CustomAgentConfig) = modelSelectorsManager.selectAgent(config)
+    fun selectAgent(config: CustomAgentConfig) = inputSelectorsManager.selectAgent(config)
 
     fun resetAgent() {
-        modelSelectorsManager.resetAgent()
+        inputSelectorsManager.resetAgent()
         inputControlsManager.clearText()
         fileWorkspaceManager.clearWorkspace()
     }

core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/ModelSelectorsManager.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/InputSelectorsManager.kt

@@ -20,15 +20,13 @@ import javax.swing.JPanel
 /**
  * Manages model selector and agent selector components
  */
-class ModelSelectorsManager(
+class InputSelectorsManager(
     private val project: Project,
     private val showAgent: Boolean = true
 ) {
-    // Model selector
     lateinit var modelSelector: ComboBox<ModelItem>
         private set
 
-    // Agent selector
     private val defaultRag: CustomAgentConfig = CustomAgentConfig("<Select Custom Agent>", "Normal")
     lateinit var customAgentBox: ComboBox<CustomAgentConfig>
 

core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/WorkspaceFileSearchPopup.kt

@@ -3,38 +3,48 @@ package cc.unitmesh.devti.gui.chat.ui.file
 import cc.unitmesh.devti.util.canBeAdded
 import com.intellij.openapi.fileEditor.impl.EditorHistoryManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
+import com.intellij.openapi.ui.popup.JBPopupListener
+import com.intellij.openapi.ui.popup.LightweightWindowEvent
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.wm.IdeFocusManager
 import com.intellij.ui.JBColor
+import com.intellij.ui.SearchTextField
+import com.intellij.ui.SpeedSearchComparator
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBList
+import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.annotations.NotNull
 import java.awt.BorderLayout
 import java.awt.Component
 import java.awt.Dimension
 import java.awt.Point
+import java.awt.event.KeyAdapter
+import java.awt.event.KeyEvent
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
 import javax.swing.*
-import javax.swing.event.DocumentEvent
-import javax.swing.event.DocumentListener
 
 class WorkspaceFileSearchPopup(
     private val project: Project,
     private val onFilesSelected: (List<VirtualFile>) -> Unit
 ) {
     private var popup: JBPopup? = null
     private val fileListModel = DefaultListModel<FilePresentation>()
-    private val fileList = JBList(fileListModel)
-    private val searchField = JTextField()
+    private val fileList = JBList(fileListModel).apply {
+        cellRenderer = FileListCellRenderer()
+        selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION
+    }
+    private val searchField = SearchTextField()
     private val contentPanel = JPanel(BorderLayout())
     private val allProjectFiles = mutableListOf<FilePresentation>()
-    private val minPopupSize = Dimension(435, 300)
+    private val minPopupSize = Dimension(500, 400)
 
     init {
         loadProjectFiles()
@@ -43,15 +53,18 @@ class WorkspaceFileSearchPopup(
 
     private fun loadProjectFiles() {
         allProjectFiles.clear()
+        
+        // Add recent files with higher priority
         val fileList = EditorHistoryManager.getInstance(project).fileList
-        fileList.forEach { file ->
+        fileList.take(20).forEach { file ->
             if (file.canBeAdded(project)) {
                 val presentation = FilePresentation.from(project, file)
                 presentation.isRecentFile = true
                 allProjectFiles.add(presentation)
             }
         }
 
+        // Add all project files
         ProjectFileIndex.getInstance(project).iterateContent { file ->
             if (file.canBeAdded(project) &&
                 !ProjectFileIndex.getInstance(project).isUnderIgnored(file) &&
@@ -63,76 +76,125 @@ class WorkspaceFileSearchPopup(
             true
         }
 
-        updateFileList("")
+        filterFiles("")
     }
 
     private fun setupUI() {
-        searchField.document.addDocumentListener(object : DocumentListener {
-            override fun insertUpdate(e: DocumentEvent) = updateSearch()
-            override fun removeUpdate(e: DocumentEvent) = updateSearch()
-            override fun changedUpdate(e: DocumentEvent) = updateSearch()
-
-            private fun updateSearch() {
-                updateFileList(searchField.text)
+        // Configure search field
+        searchField.textEditor.addKeyListener(object : KeyAdapter() {
+            override fun keyReleased(e: KeyEvent) {
+                filterFiles(searchField.text.trim())
+                if (e.keyCode == KeyEvent.VK_DOWN && fileListModel.size > 0) {
+                    fileList.requestFocus()
+                    fileList.selectedIndex = 0
+                }
+            }
+        })
+        
+        // Configure file list
+        fileList.addKeyListener(object : KeyAdapter() {
+            override fun keyPressed(e: KeyEvent) {
+                when (e.keyCode) {
+                    KeyEvent.VK_ENTER -> {
+                        selectFiles()
+                        e.consume()
+                    }
+                    KeyEvent.VK_ESCAPE -> {
+                        popup?.cancel()
+                        e.consume()
+                    }
+                    KeyEvent.VK_UP -> {
+                        if (fileList.selectedIndex == 0) {
+                            searchField.requestFocus()
+                            e.consume()
+                        }
+                    }
+                }
             }
         })
 
-        fileList.cellRenderer = FileListCellRenderer()
         fileList.addMouseListener(object : MouseAdapter() {
             override fun mouseClicked(e: MouseEvent) {
                 if (e.clickCount == 2) {
-                    val selectedFiles = fileList.selectedValuesList.map { it.virtualFile }
-                    if (selectedFiles.isNotEmpty()) {
-                        onFilesSelected(selectedFiles)
-                        popup?.cancel()
-                    }
+                    selectFiles()
                 }
             }
         })
 
+        // Setup layout with proper borders and spacing
+        contentPanel.border = JBUI.Borders.empty()
         contentPanel.add(searchField, BorderLayout.NORTH)
-        contentPanel.add(JScrollPane(fileList), BorderLayout.CENTER)
+        contentPanel.add(JBScrollPane(fileList), BorderLayout.CENTER)
         contentPanel.preferredSize = minPopupSize
     }
 
-    private fun updateFileList(searchText: String) {
+    private fun filterFiles(query: String) {
         fileListModel.clear()
-
-        val filteredFiles = if (searchText.isBlank()) {
-            allProjectFiles
+        val filteredFiles = if (query.isBlank()) {
+            allProjectFiles.take(50) // Show first 50 files when no query
         } else {
-            allProjectFiles.filter { item ->
-                item.name.contains(searchText, ignoreCase = true) ||
-                        item.path.contains(searchText, ignoreCase = true)
-            }
+            allProjectFiles.filter { file ->
+                file.name.contains(query, ignoreCase = true) ||
+                file.path.contains(query, ignoreCase = true)
+            }.take(50)
+        }
+        
+        // Sort files: recent files first, then by name
+        val sortedFiles = filteredFiles.sortedWith(compareBy<FilePresentation> { !it.isRecentFile }.thenBy { it.name })
+        sortedFiles.forEach { fileListModel.addElement(it) }
+        
+        // Auto-select first item if available
+        if (fileListModel.size > 0) {
+            fileList.selectedIndex = 0
+        }
+    }
+    
+    private fun selectFiles() {
+        val selectedFiles = fileList.selectedValuesList.map { it.virtualFile }
+        if (selectedFiles.isNotEmpty()) {
+            onFilesSelected(selectedFiles)
+            popup?.cancel()
         }
-
-        filteredFiles.forEach { fileListModel.addElement(it) }
     }
 
     fun show(component: JComponent) {
         popup = JBPopupFactory.getInstance()
-            .createComponentPopupBuilder(contentPanel, searchField)
-            .setTitle("Search Files")
+            .createComponentPopupBuilder(contentPanel, searchField.textEditor)
+            .setTitle("Add Files to Workspace")
             .setMovable(true)
             .setResizable(true)
             .setRequestFocus(true)
             .setFocusable(true)
+            .setCancelOnClickOutside(true)
+            .setCancelOnOtherWindowOpen(true)
             .setMinSize(minPopupSize)
             .createPopup()
+            
+        popup?.addListener(object : JBPopupListener {
+            override fun onClosed(event: LightweightWindowEvent) {
+                // Clean up resources when popup is closed
+                allProjectFiles.clear()
+                fileListModel.clear()
+            }
+        })
 
-        val topOffset = (component.border?.getBorderInsets(component)?.top ?: 0)
-        val leftOffset = (component.border?.getBorderInsets(component)?.left ?: 0)
-
-        popup?.show(RelativePoint(component, Point(leftOffset, -minPopupSize.height + topOffset)))
+        // Show popup in best position
+//        popup?.showInBestPositionFor(component)
+        popup?.showInCenterOf(component)
+        
+        // Request focus for search field after popup is shown
+        SwingUtilities.invokeLater {
+            IdeFocusManager.findInstance().requestFocus(searchField.textEditor, false)
+        }
     }
 
-    class FileListCellRenderer() : ListCellRenderer<FilePresentation> {
+    private inner class FileListCellRenderer : ListCellRenderer<FilePresentation> {
         private val noBorderFocus = BorderFactory.createEmptyBorder(1, 1, 1, 1)
+        private val speedSearchComparator = SpeedSearchComparator(false)
 
         @NotNull
         override fun getListCellRendererComponent(
-            list: JList<out FilePresentation>?,
+            list: JList<out FilePresentation>,
             value: FilePresentation,
             index: Int,
             isSelected: Boolean,
@@ -161,11 +223,11 @@ class WorkspaceFileSearchPopup(
             mainPanel.add(infoPanel, BorderLayout.CENTER)
 
             if (isSelected) {
-                mainPanel.background = list?.selectionBackground
-                mainPanel.foreground = list?.selectionForeground
+                mainPanel.background = list.selectionBackground
+                mainPanel.foreground = list.selectionForeground
             } else {
-                mainPanel.background = list?.background
-                mainPanel.foreground = list?.foreground
+                mainPanel.background = list.background
+                mainPanel.foreground = list.foreground
             }
 
             mainPanel.border = if (cellHasFocus) {
@@ -177,4 +239,4 @@ class WorkspaceFileSearchPopup(
             return mainPanel
         }
     }
-}
+}