From 63d0d04c7e86d71dbd93b867d359ecfd974d7bb7 Mon Sep 17 00:00:00 2001 From: Tatiana Elfimova Date: Mon, 12 May 2025 15:50:33 +0200 Subject: [PATCH] Revert "ABT-37 Adjust experiment conditions" This reverts commit 5d55b37b309d8adf8f3f497ee2deb9285e94f1f0. GitOrigin-RevId: 31b6efa16fae02f22b0f114ecbadc227d6373aa5 --- .../com/intellij/java/navigation/ChooseByNameTest.java | 2 +- .../ide/util/gotoByName/FuzzyFileSearchExperimentOption.kt | 6 +++--- platform/util/resources/misc/registry.properties | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.java b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.java index 66c0b8b7f0ae..70b47e34113d 100644 --- a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.java +++ b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.java @@ -34,7 +34,7 @@ import java.util.*; @SuppressWarnings("NewClassNamingConvention") public class ChooseByNameTest extends LightJavaCodeInsightFixtureTestCase { - private static final RegistryValue fuzzySearchRegistryValue = Registry.get("search.everywhere.fuzzy.file.search.test"); + private static final RegistryValue fuzzySearchRegistryValue = Registry.get("search.everywhere.fuzzy.file.search.enabled"); private static final boolean initialFuzzySearchRegistryValue = fuzzySearchRegistryValue.asBoolean(); public static Test suite() { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FuzzyFileSearchExperimentOption.kt b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FuzzyFileSearchExperimentOption.kt index 69c9bf1b207d..774c2d230b98 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FuzzyFileSearchExperimentOption.kt +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FuzzyFileSearchExperimentOption.kt @@ -26,8 +26,8 @@ internal class FuzzyFileSearchExperimentOption : ABExperimentOption { companion object { @JvmStatic val isFuzzyFileSearchEnabled: Boolean - get() = `is`("search.everywhere.fuzzy.file.search.test", false) || - (`is`("search.everywhere.fuzzy.file.search.enabled", false) && - (ABExperiment.getABExperimentInstance().isExperimentOptionEnabled(FuzzyFileSearchExperimentOption::class.java) || PlatformUtils.isRider())) + get() = (PlatformUtils.isRider() && `is`("search.everywhere.fuzzy.file.search.enabled", false)) || + `is`("search.everywhere.fuzzy.file.search.enabled", false) || + ABExperiment.getABExperimentInstance().isExperimentOptionEnabled(FuzzyFileSearchExperimentOption::class.java) } } \ No newline at end of file diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 2ba91088fac1..468a82a52051 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1588,15 +1588,12 @@ string.value.max.number.of.strings.description=Limit for number of different str search.everywhere.pattern.checking=true search.everywhere.pattern.checking.description=Avoid searching classes and symbols if pattern contains only one dot -search.everywhere.fuzzy.file.search.enabled=true +search.everywhere.fuzzy.file.search.enabled=false search.everywhere.fuzzy.file.search.enabled.description=Enable fuzzy file search search.everywhere.fuzzy.class.search.enabled=false search.everywhere.fuzzy.class.search.enabled.description=Enable fuzzy class search -search.everywhere.fuzzy.file.search.test=false -search.everywhere.fuzzy.file.search.test.description=Enable fuzzy file search for testing - custom.folding.max.lookup.depth=50 custom.folding.max.lookup.depth.description=Max lookup depth for custom folding comments in a PSI tree.