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

let find in path uses Trigram & IdIndex in dumb mode as is (IDEA-225580): follow IDEA-CR-54769

Browse Source 
GitOrigin-RevId: a86db80bcc9817826f035f44c0d1eef29f86d964
This commit is contained in:
Dmitry Batkovich
2019-11-13 11:35:50 +00:00
committed by intellij-monorepo-bot
parent 490dd8b2ac
commit ca5a323d7c
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultClassNavigationContributor.java
+1 -1
View File
@@ -116,6 +116,6 @@ public class DefaultClassNavigationContributor implements ChooseByNameContributo
@Override
public boolean isDumbAware() {
return FileBasedIndex.indexAccessDuringDumbModeEnabled();
return FileBasedIndex.isIndexAccessDuringDumbModeEnabled();
}
}
platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java
+1 -1
View File
@@ -220,7 +220,7 @@ public abstract class FileBasedIndex {
public static final boolean ourSnapshotMappingsEnabled = SystemProperties.getBooleanProperty("idea.index.snapshot.mappings.enabled", true);
@ApiStatus.Internal
public static boolean indexAccessDuringDumbModeEnabled() {
public static boolean isIndexAccessDuringDumbModeEnabled() {
return ApplicationManager.getApplication().isInternal() && !ourDisableIndexAccessDuringDumbMode;
}
private static final boolean ourDisableIndexAccessDuringDumbMode = SystemProperties.getBooleanProperty("idea.disable.index.access.during.dumb.mode", false);
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+3 -3
View File
@@ -1057,10 +1057,10 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
() -> FileBasedIndex.getInstance().processFilesContainingAllKeys(IdIndex.NAME, keys, scope, checker, processor);
Boolean[] result = {null};
if (FileBasedIndex.indexAccessDuringDumbModeEnabled()) {
ReadAction.run(() -> {
if (FileBasedIndex.isIndexAccessDuringDumbModeEnabled()) {
ReadAction.nonBlocking(() -> {
FileBasedIndex.getInstance().ignoreDumbMode(() -> result[0] = query.compute(), project);
});
}).executeSynchronously();
}
return result[0] != null ? result[0] : DumbService.getInstance(project).runReadActionInSmartMode(query);
}
platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
+1 -1
View File
@@ -401,7 +401,7 @@ class FindInProjectTask {
private Set<VirtualFile> getFilesForFastWordSearch() {
String stringToFind = myStringToFindInIndices;
if (stringToFind.isEmpty() || (DumbService.getInstance(myProject).isDumb() && !FileBasedIndex.indexAccessDuringDumbModeEnabled())) {
if (stringToFind.isEmpty() || (DumbService.getInstance(myProject).isDumb() && !FileBasedIndex.isIndexAccessDuringDumbModeEnabled())) {
return Collections.emptySet();
}
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+4 -1
View File
@@ -1193,7 +1193,10 @@ public final class FileBasedIndexImpl extends FileBasedIndex {
@Override
public void ignoreDumbMode(@NotNull Runnable runnable, @NotNull Project project) {
assert ApplicationManager.getApplication().isReadAccessAllowed();
if (DumbService.isDumb(project) && FileBasedIndex.indexAccessDuringDumbModeEnabled()) {
if (FileBasedIndex.isIndexAccessDuringDumbModeEnabled()) {
if (ourDumbModeIgnored.get() != null) {
throw new AssertionError("Nested index access in dumb mode");
}
ourDumbModeIgnored.set(Boolean.TRUE);
try {
runnable.run();