Fix #276 : Sort files by name in attached/popup file list

devoxx · Sep 8, 2024 · 41a2434 · 41a2434
1 parent 8ff478e
commit 41a2434
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/com/devoxx/genie/service/FileListManager.java b/src/main/java/com/devoxx/genie/service/FileListManager.java
@@ -6,6 +6,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class FileListManager {
@@ -41,11 +42,12 @@ public void addFiles(@NotNull List<VirtualFile> newFiles) {
             }
         }
         if (!actuallyAddedFiles.isEmpty()) {
+            actuallyAddedFiles.sort(Comparator.comparing(VirtualFile::getName, String.CASE_INSENSITIVE_ORDER));
             notifyObserversOfBatchAdd(actuallyAddedFiles);
         }
     }
 
-    private void notifyObserversOfBatchAdd(List<VirtualFile> addedFiles) {
+    private void notifyObserversOfBatchAdd(@NotNull List<VirtualFile> addedFiles) {
         for (FileListObserver observer : observers) {
             observer.filesAdded(addedFiles);
         }

diff --git a/src/main/java/com/devoxx/genie/ui/panel/ActionButtonsPanel.java b/src/main/java/com/devoxx/genie/ui/panel/ActionButtonsPanel.java
@@ -34,6 +34,9 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 import static com.devoxx.genie.model.Constant.*;
 import static com.devoxx.genie.ui.util.DevoxxGenieIconsUtil.*;
@@ -157,9 +160,11 @@ private void createSearchButton(@NotNull JPanel panel,
      */
     private void selectFilesForPromptContext(ActionEvent e) {
         java.util.List<VirtualFile> openFiles = editorFileButtonManager.getOpenFiles();
+        List<VirtualFile> sortedFiles = new ArrayList<>(openFiles);
+        sortedFiles.sort(Comparator.comparing(VirtualFile::getName, String.CASE_INSENSITIVE_ORDER));
 
         JBPopup popup = JBPopupFactory.getInstance()
-            .createComponentPopupBuilder(FileSelectionPanelFactory.createPanel(project, openFiles), null)
+            .createComponentPopupBuilder(FileSelectionPanelFactory.createPanel(project, sortedFiles), null)
             .setTitle("Filter and Double-Click To Add To Prompt Context")
             .setRequestFocus(true)
             .setResizable(true)

diff --git a/src/main/java/com/devoxx/genie/ui/panel/FileSelectionPanelFactory.java b/src/main/java/com/devoxx/genie/ui/panel/FileSelectionPanelFactory.java
@@ -23,6 +23,7 @@
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -179,6 +180,8 @@ public void run(@NotNull ProgressIndicator indicator) {
                             }
                         }
                     }
+
+                    foundFiles.sort(Comparator.comparing(VirtualFile::getName, String.CASE_INSENSITIVE_ORDER));
                 });
             }
 

diff --git a/src/main/java/com/devoxx/genie/ui/panel/PromptContextFileListPanel.java b/src/main/java/com/devoxx/genie/ui/panel/PromptContextFileListPanel.java
@@ -26,7 +26,6 @@ public class PromptContextFileListPanel extends JPanel
     private final JBScrollPane filesScrollPane;
     private final JPanel filesPanel; // new panel for files
     private final Project project;
-    private final int MAX_VISIBLE_FILES = 3;
 
     public PromptContextFileListPanel(Project project) {
         this.project = project;
@@ -81,6 +80,7 @@ private void updateFilesPanelVisibility() {
             filesScrollPane.setPreferredSize(new Dimension(0, 0));
         } else {
             filesScrollPane.setVisible(true);
+            int MAX_VISIBLE_FILES = 3;
             int fileCount = Math.min(fileListManager.size(), MAX_VISIBLE_FILES);
             int heightPerFile = 30;
             int prefHeight = fileCount * heightPerFile;

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -40,6 +40,7 @@
             <LI>Feat #225 : Support for OpenRouter</LI>
             <LI>Fix #220 : Sort conversation history by date</LI>
             <LI>Fix #226 : Migrate to Langchain4J 0.34.0 and use new Gemini (with API_KEY) code</LI>
+            <LI>Fix #276 : Sort the files in the attachment popup</LI>
         </UL>
         <h2>V0.2.17</h2>
         <UL>

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-#Sun Sep 08 13:31:24 CEST 2024
+#Sun Sep 08 13:44:28 CEST 2024
 version=0.2.18