Implement fuzzy search for open tabs only (#163)

* Implement fuzzy search for open tabs only

* Fix tests

* Update IntelliJ platform plugin

* Add tests for tab collector

* Add tests for base collector

Author: MituuZ

build.gradle.kts

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Use the same version and group for the jar and the plugin
-val currentVersion = "2.1.0"
+val currentVersion = "2.2.0"
 val myGroup = "com.mituuz"
 version = currentVersion
 group = myGroup
@@ -40,18 +40,12 @@ intellijPlatform {
         changeNotes = """
     <h2>Version $currentVersion</h2>
         <ul>
-            <li>Add a fallback solution for file path handling on Windows
+            <li>
+                Implement Fuzzy File Search (Open Tabs) action
                 <ul>
-                    <li>Thanks to <a href="https://github.com/s0ders">s0ders</a>!</li>
+                    <li><code>com.mituuz.fuzzier.search.FuzzierOpenTabs</code></li>
                 </ul>
             </li>
-            <li>Add a built-in Fuzzier grep backend
-                <ul>
-                    <li>Replaces <code>grep</code> and <code>findstr</code> fallback implementations</li>
-                    <li>Add setting to choose between Dynamic (uses <code>rg</code> if available, otherwise Fuzzier) and Fuzzier backends</li>
-                </ul>
-            </li>
-            <li>Migrate from <code>Timer</code> to coroutines for debouncing</li>
         </ul>
     """.trimIndent()
 

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 2.2.0
+
+- Implement Fuzzy File Search (Open Tabs) action
+  - `com.mituuz.fuzzier.search.FuzzierOpenTabs`
+
 ## Version 2.1.0
 
 - Add a fallback solution for file path handling on Windows

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 junit5 = "6.0.1"
 junit4 = "4.13.2"
 kotlin = "2.2.21"
-intellijPlatform = "2.10.5"
+intellijPlatform = "2.11.0"
 kover = "0.9.3"
 communityVersion = "2025.1"
 mockk = "1.14.6"

readme.md

@@ -54,13 +54,17 @@ List movement can be remapped from settings -> keymaps, but do not support chord
 
 - **Fuzzier** (`com.mituuz.fuzzier.search.Fuzzier`) - Search files using a fuzzy search
 - **FuzzierVCS** (`com.mituuz.fuzzier.search.FuzzierVCS`) - Search files using a fuzzy search on only VCS tracked files
+- **FuzzierOpenTabs** (`com.mituuz.fuzzier.search.FuzzierOpenTabs`) - Search files using a fuzzy search on currently
+  open tabs
 - **FuzzyMover** (`com.mituuz.fuzzier.operation.FuzzyMover`) - Move a file using a fuzzy search
 - **FuzzyGrep** (`com.mituuz.fuzzier.grep.FuzzyGrep`) - Case sensitive text search from project
 - **FuzzyGrepCI** (`com.mituuz.fuzzier.grep.FuzzyGrepCI`) - Case insensitive text search from project
 - **FuzzyGrepOpenTabs** (`com.mituuz.fuzzier.grep.FuzzyGrepOpenTabs`) - Case sensitive text search from open tabs
 - **FuzzyGrepOpenTabsCI** (`com.mituuz.fuzzier.grep.FuzzyGrepOpenTabsCI`) - Case insensitive text search from open tabs
-- **FuzzyGrepCurrentBuffer** (`com.mituuz.fuzzier.grep.FuzzyGrepCurrentBuffer`) - Case sensitive text search from current buffer
-- **FuzzyGrepCurrentBufferCI** (`com.mituuz.fuzzier.grep.FuzzyGrepCurrentBufferCI`) - Case insensitive text search from current buffer
+- **FuzzyGrepCurrentBuffer** (`com.mituuz.fuzzier.grep.FuzzyGrepCurrentBuffer`) - Case sensitive text search from
+  current buffer
+- **FuzzyGrepCurrentBufferCI** (`com.mituuz.fuzzier.grep.FuzzyGrepCurrentBufferCI`) - Case insensitive text search from
+  current buffer
 
 ## Documentation
 

src/main/kotlin/com/mituuz/fuzzier/actions/FuzzyAction.kt

@@ -24,6 +24,9 @@
 package com.mituuz.fuzzier.actions
 
 import com.intellij.icons.AllIcons
+import com.intellij.notification.Notification
+import com.intellij.notification.NotificationType
+import com.intellij.notification.Notifications
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Caret
@@ -57,6 +60,10 @@ import java.util.concurrent.ConcurrentHashMap
 import javax.swing.*
 
 abstract class FuzzyAction : AnAction() {
+    companion object {
+        const val FUZZIER_NOTIFICATION_GROUP: String = "Fuzzier Notification Group"
+    }
+
     lateinit var component: FuzzyComponent
     lateinit var popup: JBPopup
     private var originalDownHandler: EditorActionHandler? = null
@@ -71,6 +78,16 @@ abstract class FuzzyAction : AnAction() {
     protected open var currentUpdateListContentJob: Job? = null
     protected open var actionScope: CoroutineScope? = null
 
+    protected fun showNotification(
+        title: String, content: String, project: Project, type: NotificationType = NotificationType.ERROR
+    ) {
+        val grepNotification = Notification(
+            FUZZIER_NOTIFICATION_GROUP, title, content, type
+        )
+        Notifications.Bus.notify(grepNotification, project)
+    }
+
+
     protected fun getPopupProvider(): PopupProvider {
         return when (globalState.popupSizing) {
             FuzzierGlobalSettingsService.PopupSizing.AUTO_SIZE -> {

src/main/kotlin/com/mituuz/fuzzier/actions/filesystem/FilesystemAction.kt

@@ -26,14 +26,10 @@ package com.mituuz.fuzzier.actions.filesystem
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.rootManager
-import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.vfs.VirtualFile
 import com.mituuz.fuzzier.actions.FuzzyAction
 import com.mituuz.fuzzier.entities.*
-import com.mituuz.fuzzier.intellij.iteration.IntelliJIterationFileCollector
 import com.mituuz.fuzzier.intellij.iteration.IterationFileCollector
 import com.mituuz.fuzzier.util.FuzzierUtil
 import kotlinx.coroutines.*
@@ -43,11 +39,10 @@ import java.util.concurrent.ConcurrentHashMap
 import javax.swing.DefaultListModel
 
 abstract class FilesystemAction : FuzzyAction() {
-    private var collector: IterationFileCollector = IntelliJIterationFileCollector()
+    abstract fun createCollector(): IterationFileCollector
 
     abstract override fun runAction(
-        project: Project,
-        actionEvent: AnActionEvent
+        project: Project, actionEvent: AnActionEvent
     )
 
     abstract fun buildFileFilter(project: Project): (VirtualFile) -> Boolean
@@ -58,17 +53,9 @@ abstract class FilesystemAction : FuzzyAction() {
         val ctx = currentCoroutineContext()
         val job = ctx.job
 
-        val indexTargets = if (projectState.isProject) {
-            listOf(ProjectFileIndex.getInstance(project) to project.name)
-        } else {
-            val moduleManager = ModuleManager.getInstance(project)
-            moduleManager.modules.map { it.rootManager.fileIndex to it.name }
-        }
-
-        return collector.collectFiles(
-            targets = indexTargets,
-            shouldContinue = { job.isActive },
-            fileFilter = buildFileFilter(project)
+        val c: IterationFileCollector = createCollector()
+        return c.collectFiles(
+            project = project, shouldContinue = { job.isActive }, fileFilter = buildFileFilter(project)
         )
     }
 
@@ -99,9 +86,7 @@ abstract class FilesystemAction : FuzzyAction() {
         val processedFiles = ConcurrentHashMap.newKeySet<String>()
         val listLimit = fileListLimit
         val priorityQueue = PriorityQueue(
-            listLimit + 1,
-            compareBy<FuzzyMatchContainer> { it.getScore(prioritizeShorterDirPaths) }
-        )
+            listLimit + 1, compareBy<FuzzyMatchContainer> { it.getScore(prioritizeShorterDirPaths) })
 
         val queueLock = Any()
         var minimumScore: Int? = null
@@ -139,9 +124,7 @@ abstract class FilesystemAction : FuzzyAction() {
                 }
             }
 
-            fileEntries
-                .filter { processedFiles.add(it.path) }
-                .forEach { ch.send(it) }
+            fileEntries.filter { processedFiles.add(it.path) }.forEach { ch.send(it) }
             ch.close()
         }
 

src/main/kotlin/com/mituuz/fuzzier/components/TestBenchComponent.kt

@@ -28,11 +28,8 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
-import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
-import com.intellij.openapi.project.rootManager
-import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.EditorTextField
 import com.intellij.ui.components.JBScrollPane
@@ -41,7 +38,6 @@ import com.intellij.uiDesigner.core.GridConstraints
 import com.intellij.uiDesigner.core.GridLayoutManager
 import com.mituuz.fuzzier.entities.*
 import com.mituuz.fuzzier.intellij.iteration.IntelliJIterationFileCollector
-import com.mituuz.fuzzier.intellij.iteration.IterationFileCollector
 import com.mituuz.fuzzier.settings.FuzzierSettingsService
 import com.mituuz.fuzzier.util.FuzzierUtil
 import kotlinx.coroutines.*
@@ -68,7 +64,6 @@ class TestBenchComponent : JPanel(), Disposable {
     private lateinit var projectState: FuzzierSettingsService.State
     private var currentUpdateListContentJob: Job? = null
     private var actionScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-    private var collector: IterationFileCollector = IntelliJIterationFileCollector()
 
     fun fill(settingsComponent: FuzzierGlobalSettingsComponent) {
         val project = ProjectManager.getInstance().openProjects[0]
@@ -222,15 +217,9 @@ class TestBenchComponent : JPanel(), Disposable {
         val ctx = currentCoroutineContext()
         val job = ctx.job
 
-        val indexTargets = if (projectState.isProject) {
-            listOf(ProjectFileIndex.getInstance(project) to project.name)
-        } else {
-            val moduleManager = ModuleManager.getInstance(project)
-            moduleManager.modules.map { it.rootManager.fileIndex to it.name }
-        }
-
+        val collector = IntelliJIterationFileCollector(projectState)
         return collector.collectFiles(
-            targets = indexTargets, shouldContinue = { job.isActive }, fileFilter = buildFileFilter()
+            project = project, shouldContinue = { job.isActive }, fileFilter = buildFileFilter()
         )
     }
 

src/main/kotlin/com/mituuz/fuzzier/grep/FuzzyGrep.kt

@@ -24,9 +24,6 @@
 
 package com.mituuz.fuzzier.grep
 
-import com.intellij.notification.Notification
-import com.intellij.notification.NotificationType
-import com.intellij.notification.Notifications
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.EDT
@@ -59,10 +56,6 @@ import javax.swing.DefaultListModel
 import javax.swing.ListModel
 
 open class FuzzyGrep : FuzzyAction() {
-    companion object {
-        const val FUZZIER_NOTIFICATION_GROUP: String = "Fuzzier Notification Group"
-    }
-
     val isWindows = System.getProperty("os.name").lowercase().contains("win")
     private val backendResolver = BackendResolver(isWindows)
     private val commandRunner = CommandRunner()
@@ -129,15 +122,6 @@ open class FuzzyGrep : FuzzyAction() {
         }
     }
 
-    private fun showNotification(
-        title: String, content: String, project: Project, type: NotificationType = NotificationType.ERROR
-    ) {
-        val grepNotification = Notification(
-            FUZZIER_NOTIFICATION_GROUP, title, content, type
-        )
-        Notifications.Bus.notify(grepNotification, project)
-    }
-
     override fun onPopupClosed() {
         previewAlarm?.dispose()
         currentLaunchJob?.cancel()

src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/IntelliJIterationFileCollector.kt

@@ -24,17 +24,24 @@
 
 package com.mituuz.fuzzier.intellij.iteration
 
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.FileIndex
+import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.vfs.VirtualFile
 import com.mituuz.fuzzier.entities.IterationEntry
+import com.mituuz.fuzzier.settings.FuzzierSettingsService
 
-class IntelliJIterationFileCollector : IterationFileCollector {
+class IntelliJIterationFileCollector(val projectState: FuzzierSettingsService.State) : IterationFileCollector {
     override fun collectFiles(
-        targets: List<Pair<FileIndex, String>>,
+        project: Project,
         shouldContinue: () -> Boolean,
         fileFilter: (VirtualFile) -> Boolean
     ): List<IterationEntry> = buildList {
-        for ((fileIndex, moduleName) in targets) {
+        val targetIndexes = getTargetIndexes(project)
+
+        for ((fileIndex, moduleName) in targetIndexes) {
             fileIndex.iterateContent { vf ->
                 if (!shouldContinue()) return@iterateContent false
 
@@ -47,4 +54,13 @@ class IntelliJIterationFileCollector : IterationFileCollector {
             }
         }
     }
+
+    private fun getTargetIndexes(project: Project): List<Pair<FileIndex, String>> {
+        return if (projectState.isProject) {
+            listOf(ProjectFileIndex.getInstance(project) to project.name)
+        } else {
+            val moduleManager = ModuleManager.getInstance(project)
+            moduleManager.modules.map { it.rootManager.fileIndex to it.name }
+        }
+    }
 }

src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/IterationFileCollector.kt

@@ -24,13 +24,13 @@
 
 package com.mituuz.fuzzier.intellij.iteration
 
-import com.intellij.openapi.roots.FileIndex
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.mituuz.fuzzier.entities.IterationEntry
 
 interface IterationFileCollector {
     fun collectFiles(
-        targets: List<Pair<FileIndex, String>>,
+        project: Project,
         shouldContinue: () -> Boolean,
         fileFilter: (VirtualFile) -> Boolean,
     ): List<IterationEntry>