MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJ-CR-204586 [java] IDEA-387223 ISE: NonBlockingReadActionImpl$Submission.attemptComputation via JavaFunctionalExpressionSearcher

Browse Source 
- add registry

GitOrigin-RevId: cbfb8c2b24246f63c1cefe5fe6b16c59f5af690f
This commit is contained in:
Mikhail Pyltsin
2026-05-21 13:09:56 +00:00
committed by intellij-monorepo-bot
parent 73a2906fd1
commit dcef269755
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-backend/resources/META-INF/RegistryKeys.xml
+2
View File
@@ -124,5 +124,7 @@
<!--used together with DeprecationInspection-->
<registryKey key="kotlin.deprecation.inspection.enabled" defaultValue="false"/>
<registryKey key="java.import.with.write.action" defaultValue="false" description="Whether to use WriteAction for import optimization"/>
<registryKey key="java.functional.expression.search.fail.fast.in.dumb.mode" defaultValue="true"
description="When true (default), JavaFunctionalExpressionSearcher throws IndexNotReadyException immediately in dumb mode instead of waiting for smart mode. When false, falls back to the legacy behavior of waiting for smart mode."/>
</extensions>
</idea-plugin>
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+9 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.LanguageLevelModuleExtension;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.JavaFeature;
import com.intellij.pom.java.LanguageLevel;
@@ -116,7 +117,8 @@ public final class JavaFunctionalExpressionSearcher extends QueryExecutorBase<Ps
private static @NotNull List<SamDescriptor> calcDescriptors(@NotNull Session session) {
PsiClass aClass = session.elementToSearch;
Project project = PsiUtilCore.getProjectInReadAction(aClass);
if (DumbService.isDumb(project)) {
boolean failFastInDumbMode = Registry.is("java.functional.expression.search.fail.fast.in.dumb.mode");
if (failFastInDumbMode && DumbService.isDumb(project)) {
// Fail fast instead of blocking the calling thread in ReadAction.nonBlocking(...).inSmartMode(...).executeSynchronously()
// which would freeze the search until indexes become ready.
// ExecutorsQuery handles IndexNotReadyException by skipping this executor, so the overall search keeps working
@@ -154,8 +156,12 @@ public final class JavaFunctionalExpressionSearcher extends QueryExecutorBase<Ps
}
return descriptors;
};
return ReadAction.nonBlocking(runnable)
.executeSynchronously();
if (!failFastInDumbMode) {
return ReadAction.nonBlocking(runnable).inSmartMode(project).executeSynchronously();
}
else {
return ReadAction.nonBlocking(runnable).executeSynchronously();
}
}
private static @NotNull Set<VirtualFile> getLikelyFiles(@NotNull List<? extends SamDescriptor> descriptors,