MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
GitOrigin-RevId: f506a673037f67634235969729ea6ad099a99c55
This commit is contained in:
Alexey Kudravtsev
2019-12-23 14:25:07 +03:00
committed by intellij-monorepo-bot
parent 5edb243cc3
commit 3e2e941004
7 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-indexing-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java
View File

@@ -83,7 +83,7 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
}
@Override
public boolean processAllClassNames(@NotNull Processor<String> processor) {
public boolean processAllClassNames(@NotNull Processor<? super String> processor) {
CommonProcessors.UniqueProcessor<String> uniqueProcessor = new CommonProcessors.UniqueProcessor<>(processor);
for (PsiShortNamesCache cache : myCaches) {
if (!cache.processAllClassNames(uniqueProcessor)) {
@@ -94,7 +94,7 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
}
@Override
public boolean processAllClassNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllClassNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
for (PsiShortNamesCache cache : myCaches) {
if (!cache.processAllClassNames(processor, scope, filter)) {
return false;
@@ -104,7 +104,7 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
}
@Override
public boolean processAllMethodNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllMethodNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
for (PsiShortNamesCache cache : myCaches) {
if (!cache.processAllMethodNames(processor, scope, filter)) {
return false;
@@ -114,7 +114,7 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
}
@Override
public boolean processAllFieldNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllFieldNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
for (PsiShortNamesCache cache : myCaches) {
if (!cache.processAllFieldNames(processor, scope, filter)) {
return false;

8
java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java
View File

@@ -106,22 +106,22 @@ public class PsiShortNamesCacheImpl extends PsiShortNamesCache {
}
@Override
public boolean processAllClassNames(@NotNull Processor<String> processor) {
public boolean processAllClassNames(@NotNull Processor<? super String> processor) {
return JavaShortClassNameIndex.getInstance().processAllKeys(myProject, processor);
}
@Override
public boolean processAllClassNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllClassNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
return StubIndex.getInstance().processAllKeys(JavaStubIndexKeys.CLASS_SHORT_NAMES, processor, scope, filter);
}
@Override
public boolean processAllMethodNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllMethodNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
return StubIndex.getInstance().processAllKeys(JavaStubIndexKeys.METHODS, processor, scope, filter);
}
@Override
public boolean processAllFieldNames(@NotNull Processor<String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
public boolean processAllFieldNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
return StubIndex.getInstance().processAllKeys(JavaStubIndexKeys.FIELDS, processor, scope, filter);
}

13
java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java
View File

@@ -10,7 +10,6 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
@@ -69,10 +68,10 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
return processClassesByNames(parameters.getProject(), scope, sorted, processor);
}
public static boolean processClassesByNames(Project project,
final GlobalSearchScope scope,
Collection<String> names,
Processor<? super PsiClass> processor) {
public static boolean processClassesByNames(@NotNull Project project,
@NotNull GlobalSearchScope scope,
@NotNull Collection<String> names,
@NotNull Processor<? super PsiClass> processor) {
final PsiShortNamesCache cache = PsiShortNamesCache.getInstance(project);
for (final String name : names) {
ProgressIndicatorProvider.checkCanceled();
@@ -86,8 +85,8 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
return true;
}
public static boolean processClassNames(final Project project, final GlobalSearchScope scope, final Processor<? super String> processor) {
boolean success = DumbService.getInstance(project).runReadActionInSmartMode((Computable<Boolean>)() ->
public static boolean processClassNames(@NotNull Project project, @NotNull GlobalSearchScope scope, @NotNull Processor<? super String> processor) {
boolean success = DumbService.getInstance(project).runReadActionInSmartMode(() ->
PsiShortNamesCache.getInstance(project).processAllClassNames(s -> {
ProgressManager.checkCanceled();
return processor.process(s);