From 60e4efac465f4a8afb3dc6bf9d2f11f1b415cc29 Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 15:37:37 +0200 Subject: [PATCH 1/6] Fix deprecated call --- .../kotlin/com/mituuz/fuzzier/grep/backend/FuzzierGrep.kt | 4 ++-- .../mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/mituuz/fuzzier/grep/backend/FuzzierGrep.kt b/src/main/kotlin/com/mituuz/fuzzier/grep/backend/FuzzierGrep.kt index ea4154ab..0b6d8dfc 100644 --- a/src/main/kotlin/com/mituuz/fuzzier/grep/backend/FuzzierGrep.kt +++ b/src/main/kotlin/com/mituuz/fuzzier/grep/backend/FuzzierGrep.kt @@ -24,7 +24,7 @@ package com.mituuz.fuzzier.grep.backend -import com.intellij.openapi.application.ReadAction +import com.intellij.openapi.application.readAction import com.intellij.openapi.components.service import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project @@ -136,7 +136,7 @@ object FuzzierGrep : BackendStrategy { val firstCompleteWord = searchMatcher.extractFirstCompleteWord(searchString) if (firstCompleteWord != null) { - ReadAction.run { + readAction { val helper = PsiSearchHelper.getInstance(project) helper.processAllFilesWithWord( firstCompleteWord, diff --git a/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt b/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt index 9239ea38..a258a930 100644 --- a/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt +++ b/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt @@ -24,7 +24,7 @@ package com.mituuz.fuzzier.intellij.iteration -import com.intellij.openapi.application.ReadAction +import com.intellij.openapi.application.runReadAction import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ProjectFileIndex @@ -40,9 +40,9 @@ class OpenTabsCollector : IterationFileCollector { val fileEditorManager = FileEditorManager.getInstance(project) val projectFileIndex = ProjectFileIndex.getInstance(project) - ReadAction.run { + runReadAction { for (vf in fileEditorManager.openFiles) { - if (!shouldContinue()) return@run + if (!shouldContinue()) return@runReadAction if (fileFilter(vf)) { val module = projectFileIndex.getModuleForFile(vf) val moduleName = module?.name ?: "" From 2a1162b07633c8f5905fcd703f2a0681c7f1c3fa Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 15:47:45 +0200 Subject: [PATCH 2/6] Update dependencies --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 467dfb4c..2ea5f51e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -junit5 = "6.0.1" +junit5 = "6.0.3" junit4 = "4.13.2" kotlin = "2.2.21" intellijPlatform = "2.11.0" -kover = "0.9.3" +kover = "0.9.7" communityVersion = "2025.1" -mockk = "1.14.6" +mockk = "1.14.9" [libraries] junit5Api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } From db59d28929fa985e260b420715b6ae5662f14537 Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 15:50:38 +0200 Subject: [PATCH 3/6] Increment version and add change notes --- build.gradle.kts | 8 +++++++- changelog.md | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 92b5c0fb..7ed38623 100644 --- a/build.gradle.kts +++ b/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.2.0" +val currentVersion = "2.2.1" val myGroup = "com.mituuz" version = currentVersion group = myGroup @@ -39,6 +39,12 @@ intellijPlatform { changeNotes = """

Version $currentVersion

+
    +
  • + Update dependencies +
    • +
+

Version 2.2.0

  • Implement Fuzzy File Search (Open Tabs) action diff --git a/changelog.md b/changelog.md index 3cd051b9..6377392e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## Version 2.2.1 + +- Update dependencies + ## Version 2.2.0 - Implement Fuzzy File Search (Open Tabs) action From fa0fd958f6ef343aa4d1fa60df2380c504263b84 Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 15:55:42 +0200 Subject: [PATCH 4/6] Update gradle --- gradle/wrapper/gradle-wrapper.properties | 26 +++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bad7c246..491eeb56 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,30 @@ +# +# MIT License +# +# Copyright (c) 2025 Mitja Leino +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 0beeae63ac3aaa6c97dda2642ee169bd46c79c95 Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 15:57:18 +0200 Subject: [PATCH 5/6] Remove license from gradle properties --- gradle/wrapper/gradle-wrapper.properties | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 491eeb56..37f78a6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,27 +1,3 @@ -# -# MIT License -# -# Copyright (c) 2025 Mitja Leino -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip From 50aacaf89e0375d534bfe5e1f6f42c33c461b069 Mon Sep 17 00:00:00 2001 From: Mitja Date: Sun, 1 Mar 2026 16:01:07 +0200 Subject: [PATCH 6/6] Fix deprecated call --- .../mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt | 4 ++-- .../fuzzier/intellij/iteration/OpenTabsCollectorTest.kt | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt b/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt index a258a930..7f120013 100644 --- a/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt +++ b/src/main/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollector.kt @@ -24,7 +24,7 @@ package com.mituuz.fuzzier.intellij.iteration -import com.intellij.openapi.application.runReadAction +import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ProjectFileIndex @@ -40,7 +40,7 @@ class OpenTabsCollector : IterationFileCollector { val fileEditorManager = FileEditorManager.getInstance(project) val projectFileIndex = ProjectFileIndex.getInstance(project) - runReadAction { + ApplicationManager.getApplication().runReadAction { for (vf in fileEditorManager.openFiles) { if (!shouldContinue()) return@runReadAction if (fileFilter(vf)) { diff --git a/src/test/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollectorTest.kt b/src/test/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollectorTest.kt index 38bff3cf..b98c75ca 100644 --- a/src/test/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollectorTest.kt +++ b/src/test/kotlin/com/mituuz/fuzzier/intellij/iteration/OpenTabsCollectorTest.kt @@ -24,6 +24,7 @@ package com.mituuz.fuzzier.intellij.iteration +import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.runReadAction import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.testFramework.TestApplicationManager @@ -62,7 +63,7 @@ class OpenTabsCollectorTest { val file2 = fixture.findFileInTempDir("src/file2.txt") runInEdtAndWait { - runReadAction { + ApplicationManager.getApplication().runReadAction { fileEditorManager.openFile(file1, true) fileEditorManager.openFile(file2, true) } @@ -85,7 +86,7 @@ class OpenTabsCollectorTest { val file2 = fixture.findFileInTempDir("src/file2.txt") runInEdtAndWait { - runReadAction { + ApplicationManager.getApplication().runReadAction { fileEditorManager.openFile(file1, true) fileEditorManager.openFile(file2, true) } @@ -105,7 +106,7 @@ class OpenTabsCollectorTest { val file2 = fixture.findFileInTempDir("src/file2.txt") runInEdtAndWait { - runReadAction { + ApplicationManager.getApplication().runReadAction { fileEditorManager.openFile(file1, true) fileEditorManager.openFile(file2, true) }