refactor(gui): move file-related UI components to a separate package

phodal · phodal · commit 5ea09be234df · 2025-04-03T22:11:06.000+08:00
- Create a new 'file' package for file-related UI components
- Move FilePresentation, FileSearchPopup, InputFileToolbar, RelatedFileListCellRenderer, and WorkspaceFilePanel to the new package- Update imports in AutoDevInputSection to use the new package
- Make some minor UI adjustments (e.g., button border size)
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/AutoDevInputSection.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/AutoDevInputSection.kt
@@ -4,6 +4,9 @@ import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.AutoDevIcons
 import cc.unitmesh.devti.agent.custom.model.CustomAgentConfig
 import cc.unitmesh.devti.agent.custom.model.CustomAgentState
+import cc.unitmesh.devti.gui.chat.ui.file.InputFileToolbar
+import cc.unitmesh.devti.gui.chat.ui.file.RelatedFileListCellRenderer
+import cc.unitmesh.devti.gui.chat.ui.file.WorkspaceFilePanel
 import cc.unitmesh.devti.gui.chat.ui.viewmodel.FileListViewModel
 import cc.unitmesh.devti.llms.tokenizer.Tokenizer
 import cc.unitmesh.devti.llms.tokenizer.TokenizerFactory
@@ -71,7 +74,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
     private val fileListViewModel = FileListViewModel(project)
     private val elementsList = JBList(fileListViewModel.getListModel())
     
-    private val workspacePanel: WorkspacePanel
+    private val workspaceFilePanel: WorkspaceFilePanel
 
     private val defaultRag: CustomAgentConfig = CustomAgentConfig("<Select Custom Agent>", "Normal")
     private var customAgent: ComboBox<CustomAgentConfig> = ComboBox(MutableCollectionComboBoxModel(listOf()))
@@ -88,7 +91,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
 
     var text: String
         get() {
-            val files = workspacePanel.getAllFilesFormat()
+            val files = workspaceFilePanel.getAllFilesFormat()
             return input.text + "\n" + files
         }
         set(text) {
@@ -98,7 +101,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
 
     init {
         input = AutoDevInput(project, listOf(), disposable, this)
-        workspacePanel = WorkspacePanel(project, input)
+        workspaceFilePanel = WorkspaceFilePanel(project)
 
         setupElementsList()
         val sendButtonPresentation = Presentation(AutoDevBundle.message("chat.panel.send"))
@@ -169,8 +172,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
         inputPanel.add(input, BorderLayout.CENTER)
         inputPanel.addToBottom(layoutPanel)
         
-        // Add workspace panel to the input panel
-        inputPanel.addToTop(workspacePanel)
+        inputPanel.addToTop(workspaceFilePanel)
 
         val scrollPane = JBScrollPane(elementsList)
         scrollPane.verticalScrollBarPolicy = JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED
@@ -255,7 +257,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
         val actionType = fileListViewModel.determineFileAction(wrapper, e.point, cellBounds)
         val actionPerformed = fileListViewModel.handleFileAction(wrapper, actionType) { vfile, relativePath ->
             if (relativePath != null) {
-                workspacePanel.addFileToWorkspace(vfile)
+                workspaceFilePanel.addFileToWorkspace(vfile)
                 ApplicationManager.getApplication().invokeLater {
                     if (!vfile.isValid) return@invokeLater
                     val psiFile = PsiManager.getInstance(project).findFile(vfile) ?: return@invokeLater
@@ -376,7 +378,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
 
         customAgent.selectedItem = defaultRag
         text = ""
-        workspacePanel.clear()
+        workspaceFilePanel.clear()
     }
 
     fun moveCursorToStart() {
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/FilePresentation.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/FilePresentation.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.gui.chat.ui
+package cc.unitmesh.devti.gui.chat.ui.file
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/FileSearchPopup.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/FileSearchPopup.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.gui.chat.ui
+package cc.unitmesh.devti.gui.chat.ui.file
 
 import cc.unitmesh.devti.util.canBeAdded
 import com.intellij.openapi.fileEditor.impl.EditorHistoryManager
@@ -143,7 +143,7 @@ class FileSearchPopup(
             infoPanel.isOpaque = false
 
             val fileLabel = JBLabel(value.name, value.icon, JBLabel.LEFT)
-            fileLabel.border = JBUI.Borders.emptyRight(8)
+            fileLabel.border = JBUI.Borders.emptyRight(4)
 
             val relativePath = value.presentablePath
             val pathLabel = JBLabel(" - $relativePath", JBLabel.LEFT)
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/InputFileToolbar.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/InputFileToolbar.kt
@@ -1,8 +1,10 @@
-package cc.unitmesh.devti.gui.chat.ui
+package cc.unitmesh.devti.gui.chat.ui.file
 
 import cc.unitmesh.devti.AutoDevBundle
+import cc.unitmesh.devti.gui.chat.ui.AutoDevInput
+import cc.unitmesh.devti.gui.chat.ui.AutoDevInputSection
+import cc.unitmesh.devti.gui.chat.ui.mediumFontFunction
 import cc.unitmesh.devti.gui.chat.ui.viewmodel.FileListViewModel
-import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.labels.LinkLabel
@@ -12,6 +14,7 @@ import javax.swing.Box
 import javax.swing.JToolBar
 import java.awt.Component
 import java.awt.Container
+import kotlin.collections.forEach
 
 object InputFileToolbar {
     fun createToolbar(project: Project, viewModel: FileListViewModel, input: AutoDevInput): JToolBar {
@@ -25,11 +28,11 @@ object InputFileToolbar {
 
         toolbar.add(Box.createHorizontalGlue())
 
-        val findWorkspacePanel: () -> WorkspacePanel? = lambda@{
+        val findWorkspaceFilePanel: () -> WorkspaceFilePanel? = lambda@{
             var component: Component? = input.parent
             while (component != null) {
                 if (component is AutoDevInputSection) {
-                    val workspace = component.findComponentOfType(WorkspacePanel::class.java)
+                    val workspace = component.findComponentOfType(WorkspaceFilePanel::class.java)
                     if (workspace != null) {
                         return@lambda workspace
                     }
@@ -43,7 +46,7 @@ object InputFileToolbar {
         val recentFiles = LinkLabel(AutoDevBundle.message("chat.panel.add.openFiles"), null) { _: LinkLabel<Unit>, _: Unit? ->
             val addedFiles = viewModel.addRecentlyOpenedFiles()
             
-            val workspace = findWorkspacePanel()
+            val workspace = findWorkspaceFilePanel()
             if (workspace != null) {
                 addedFiles.forEach { file ->
                     workspace.addFileToWorkspace(file.virtualFile)
@@ -66,7 +69,7 @@ object InputFileToolbar {
 
         val clearAll = LinkLabel(AutoDevBundle.message("chat.panel.clear.all"), null) { _: LinkLabel<Unit>, _: Unit? ->
             viewModel.clearAllFiles()
-            findWorkspacePanel()?.clear()
+            findWorkspaceFilePanel()?.clear()
         }
 
         clearAll.mediumFontFunction()
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/RelatedFileListCellRenderer.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/RelatedFileListCellRenderer.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.gui.chat.ui
+package cc.unitmesh.devti.gui.chat.ui.file
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/WorkspaceFilePanel.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/file/WorkspaceFilePanel.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.gui.chat.ui
+package cc.unitmesh.devti.gui.chat.ui.file
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.fileChooser.FileChooser
@@ -13,39 +13,37 @@ import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
 import javax.swing.*
 
-class WorkspacePanel(
-    private val project: Project,
-    private val input: AutoDevInput
-) : JPanel(BorderLayout()) {
+class WorkspaceFilePanel(private val project: Project) : JPanel(BorderLayout()) {
     private val workspaceFiles = mutableListOf<FilePresentation>()
     private val filesPanel = JPanel(WrapLayout(FlowLayout.LEFT, 2, 2))
-    
+
     init {
         border = JBUI.Borders.empty()
 
         filesPanel.isOpaque = false
         filesPanel.add(createAddButton())
-        
+
         add(filesPanel, BorderLayout.NORTH)
         isOpaque = false
     }
 
     private fun createAddButton(): JBLabel {
-        val addButton = JBLabel(AllIcons.General.Add)
-        addButton.cursor = Cursor(Cursor.HAND_CURSOR)
-        addButton.toolTipText = "Add files to workspace"
-        addButton.border = JBUI.Borders.empty(2, 4)
-        addButton.background = JBColor(0xEDF4FE, 0x313741)
-        addButton.isOpaque = true
-
-        addButton.addMouseListener(object : MouseAdapter() {
+        val button = JBLabel(AllIcons.General.Add)
+        button.cursor = Cursor(Cursor.HAND_CURSOR)
+        button.toolTipText = "Add files to workspace"
+        button.border = JBUI.Borders.empty(2)
+        button.background = JBColor(0xEDF4FE, 0x313741)
+        button.isOpaque = true
+
+        button.addMouseListener(object : MouseAdapter() {
             override fun mouseClicked(e: MouseEvent) {
-                showFileSearchPopup(this@WorkspacePanel)
+                showFileSearchPopup(this@WorkspaceFilePanel)
             }
         })
-        return addButton
+
+        return button
     }
-    
+
     private fun showFileSearchPopup(component: JComponent) {
         val popup = FileSearchPopup(project) { files ->
             for (file in files) {
@@ -54,52 +52,52 @@ class WorkspacePanel(
         }
         popup.show(component)
     }
-    
+
     private fun addFile() {
         val descriptor = FileChooserDescriptor(true, true, false, false, false, true)
             .withTitle("Select Files for Workspace")
             .withDescription("Choose files to add to your workspace")
-        
+
         FileChooser.chooseFiles(descriptor, project, null) { files ->
             for (file in files) {
                 addFileToWorkspace(file)
             }
         }
     }
-    
+
     fun addFileToWorkspace(file: VirtualFile) {
         val filePresentation = FilePresentation.from(project, file)
         if (workspaceFiles.none { it.virtualFile == file }) {
             workspaceFiles.add(filePresentation)
             updateFilesPanel()
         }
     }
-    
+
     private fun updateFilesPanel() {
         filesPanel.removeAll()
         filesPanel.add(createAddButton())
-        
+
         for (filePresentation in workspaceFiles) {
-            val fileLabel = FileItemPanel(project, filePresentation) { 
+            val fileLabel = FileItemPanel(project, filePresentation) {
                 removeFile(filePresentation)
             }
             filesPanel.add(fileLabel)
         }
-        
+
         filesPanel.revalidate()
         filesPanel.repaint()
     }
-    
+
     private fun removeFile(filePresentation: FilePresentation) {
         workspaceFiles.remove(filePresentation)
         updateFilesPanel()
     }
-    
+
     fun clear() {
         workspaceFiles.clear()
         updateFilesPanel()
     }
-    
+
     fun getAllFiles(): List<FilePresentation> {
         return workspaceFiles.toList()
     }
@@ -123,20 +121,20 @@ class FileItemPanel(
         )
         background = JBColor(0xEDF4FE, 0x313741)
         isOpaque = true
-        
+
         val fileLabel = JBLabel(filePresentation.name, filePresentation.icon, JBLabel.LEFT)
-        
+
         val removeLabel = JBLabel(AllIcons.Actions.Close)
         removeLabel.cursor = Cursor(Cursor.HAND_CURSOR)
         removeLabel.addMouseListener(object : MouseAdapter() {
             override fun mouseClicked(e: MouseEvent) {
                 onRemove()
             }
         })
-        
+
         add(fileLabel)
         add(removeLabel)
-        
+
         this.border = JBUI.Borders.empty(2)
     }
 }
@@ -179,7 +177,7 @@ class WrapLayout : FlowLayout {
         synchronized(target.treeLock) {
             // Each row must fit within the target container width
             var targetWidth = target.width
-            
+
             if (targetWidth == 0) {
                 targetWidth = Int.MAX_VALUE
             }
@@ -200,7 +198,7 @@ class WrapLayout : FlowLayout {
                 val m = target.getComponent(i)
                 if (m.isVisible) {
                     val d = if (preferred) m.preferredSize else m.minimumSize
-                    
+
                     // If this component doesn't fit in the current row, start a new row
                     if (rowWidth + d.width > maxWidth && rowWidth > 0) {
                         dim.width = maxWidth.coerceAtLeast(rowWidth)
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/viewmodel/FileListViewModel.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/viewmodel/FileListViewModel.kt
@@ -1,6 +1,6 @@
 package cc.unitmesh.devti.gui.chat.ui.viewmodel
 
-import cc.unitmesh.devti.gui.chat.ui.FilePresentation
+import cc.unitmesh.devti.gui.chat.ui.file.FilePresentation
 import cc.unitmesh.devti.util.isInProject
 import com.intellij.diff.editor.DiffVirtualFileBase
 import com.intellij.openapi.Disposable

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cc.unitmesh.devti.gui.chat.ui`
	`1`	`+package cc.unitmesh.devti.gui.chat.ui.file`
`2`	`2`
`3`	`3`	`import com.intellij.icons.AllIcons`
`4`	`4`	`import com.intellij.openapi.project.Project`