azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[resolution] KotlinJavaPsiFacade: replace explicit EMPTY_SCOPE check with more general

Browse Source 
Someone can request search for `LocalSearchScope.EMPTY` and we can
catch this case

^KT-62892
This commit is contained in:
Dmitrii Gridin
2024-01-03 20:15:35 +01:00
committed by Space Team
parent 37ccf5d4f3
commit 3fcf5c47c2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
+7 -5
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.impl.file.PsiPackageImpl;
import com.intellij.psi.impl.file.impl.JavaFileManager; import com.intellij.psi.impl.file.impl.JavaFileManager;
import com.intellij.psi.impl.light.LightModifierList; import com.intellij.psi.impl.light.LightModifierList;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiModificationTracker; import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.CommonProcessors; import com.intellij.util.CommonProcessors;
import com.intellij.util.ConcurrencyUtil; import com.intellij.util.ConcurrencyUtil;
@@ -156,7 +157,7 @@ public class KotlinJavaPsiFacade implements Disposable {
@Nullable @Nullable
public JavaClass findClass(@NotNull JavaClassFinder.Request request, @NotNull GlobalSearchScope scope) { public JavaClass findClass(@NotNull JavaClassFinder.Request request, @NotNull GlobalSearchScope scope) {
if (scope == GlobalSearchScope.EMPTY_SCOPE) return null; if (SearchScope.isEmptyScope(scope)) return null;
// We hope this method is being called often enough to cancel daemon processes smoothly // We hope this method is being called often enough to cancel daemon processes smoothly
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
@@ -194,7 +195,7 @@ public class KotlinJavaPsiFacade implements Disposable {
@NotNull @NotNull
public List<JavaClass> findClasses(@NotNull JavaClassFinder.Request request, @NotNull GlobalSearchScope scope) { public List<JavaClass> findClasses(@NotNull JavaClassFinder.Request request, @NotNull GlobalSearchScope scope) {
if (scope == GlobalSearchScope.EMPTY_SCOPE) return Collections.emptyList(); if (SearchScope.isEmptyScope(scope)) return Collections.emptyList();
// We hope this method is being called often enough to cancel daemon processes smoothly // We hope this method is being called often enough to cancel daemon processes smoothly
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
@@ -242,7 +243,7 @@ public class KotlinJavaPsiFacade implements Disposable {
*/ */
@Nullable @Nullable
public Set<String> knownClassNamesInPackage(@NotNull FqName packageFqName, @NotNull GlobalSearchScope scope) { public Set<String> knownClassNamesInPackage(@NotNull FqName packageFqName, @NotNull GlobalSearchScope scope) {
if (scope == GlobalSearchScope.EMPTY_SCOPE) return Collections.emptySet(); if (SearchScope.isEmptyScope(scope)) return Collections.emptySet();
KotlinPsiElementFinderWrapper[] finders = finders(); KotlinPsiElementFinderWrapper[] finders = finders();
@@ -329,8 +330,9 @@ public class KotlinJavaPsiFacade implements Disposable {
return javaFileManager; return javaFileManager;
} }
public PsiPackage findPackage(@NotNull String qualifiedName, GlobalSearchScope searchScope) { @Nullable
if (searchScope == GlobalSearchScope.EMPTY_SCOPE) return null; public PsiPackage findPackage(@NotNull String qualifiedName, @NotNull GlobalSearchScope searchScope) {
if (SearchScope.isEmptyScope(searchScope)) return null;
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
if (certainlyDoesNotExist(qualifiedName, searchScope)) return null; if (certainlyDoesNotExist(qualifiedName, searchScope)) return null;