Add more checkCanceled to PsiFacade.findClass
Relates to #KT-38012
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
package org.jetbrains.kotlin.resolve.jvm;
|
package org.jetbrains.kotlin.resolve.jvm;
|
||||||
|
|
||||||
import com.intellij.openapi.components.ServiceManager;
|
import com.intellij.openapi.components.ServiceManager;
|
||||||
|
import com.intellij.openapi.progress.ProgressManager;
|
||||||
import com.intellij.openapi.project.DumbAware;
|
import com.intellij.openapi.project.DumbAware;
|
||||||
import com.intellij.openapi.project.DumbService;
|
import com.intellij.openapi.project.DumbService;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
@@ -119,6 +120,7 @@ public class KotlinJavaPsiFacade {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (KotlinPsiElementFinderWrapper finder : finders()) {
|
for (KotlinPsiElementFinderWrapper finder : finders()) {
|
||||||
|
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
|
||||||
if (finder instanceof CliFinder) {
|
if (finder instanceof CliFinder) {
|
||||||
JavaClass aClass = ((CliFinder) finder).findClass(request, scope);
|
JavaClass aClass = ((CliFinder) finder).findClass(request, scope);
|
||||||
if (aClass != null) return aClass;
|
if (aClass != null) return aClass;
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.asJava.toLightClass
|
|||||||
import org.jetbrains.kotlin.load.java.JvmAbi
|
import org.jetbrains.kotlin.load.java.JvmAbi
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
import org.jetbrains.kotlin.name.isValidJavaFqName
|
import org.jetbrains.kotlin.name.isValidJavaFqName
|
||||||
|
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
|
||||||
import org.jetbrains.kotlin.psi.KtClass
|
import org.jetbrains.kotlin.psi.KtClass
|
||||||
import org.jetbrains.kotlin.psi.KtEnumEntry
|
import org.jetbrains.kotlin.psi.KtEnumEntry
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
@@ -86,6 +87,7 @@ class JavaElementFinder(
|
|||||||
if (qualifiedName.shortName().asString() != JvmAbi.DEFAULT_IMPLS_CLASS_NAME) return
|
if (qualifiedName.shortName().asString() != JvmAbi.DEFAULT_IMPLS_CLASS_NAME) return
|
||||||
|
|
||||||
for (classOrObject in kotlinAsJavaSupport.findClassOrObjectDeclarations(qualifiedName.parent(), scope)) {
|
for (classOrObject in kotlinAsJavaSupport.findClassOrObjectDeclarations(qualifiedName.parent(), scope)) {
|
||||||
|
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
|
||||||
//NOTE: can't filter out more interfaces right away because decompiled declarations do not have member bodies
|
//NOTE: can't filter out more interfaces right away because decompiled declarations do not have member bodies
|
||||||
if (classOrObject is KtClass && classOrObject.isInterface()) {
|
if (classOrObject is KtClass && classOrObject.isInterface()) {
|
||||||
val interfaceClass = classOrObject.toLightClass() ?: continue
|
val interfaceClass = classOrObject.toLightClass() ?: continue
|
||||||
|
|||||||
+2
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.core.script
|
package org.jetbrains.kotlin.idea.core.script
|
||||||
|
|
||||||
|
import com.intellij.openapi.progress.ProgressManager
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.roots.ProjectFileIndex
|
import com.intellij.openapi.roots.ProjectFileIndex
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
@@ -24,6 +25,7 @@ class KotlinScriptDependenciesClassFinder(
|
|||||||
override fun findClass(qualifiedName: String, scope: GlobalSearchScope): PsiClass? {
|
override fun findClass(qualifiedName: String, scope: GlobalSearchScope): PsiClass? {
|
||||||
tailrec fun findClassInner(parentQualifier: String, inners: List<String> = emptyList()): PsiClass? {
|
tailrec fun findClassInner(parentQualifier: String, inners: List<String> = emptyList()): PsiClass? {
|
||||||
if (parentQualifier.isEmpty()) return null
|
if (parentQualifier.isEmpty()) return null
|
||||||
|
ProgressManager.checkCanceled()
|
||||||
val parentClass = super.findClass(parentQualifier, scope)
|
val parentClass = super.findClass(parentQualifier, scope)
|
||||||
if (parentClass != null) {
|
if (parentClass != null) {
|
||||||
if (inners.isNotEmpty()) {
|
if (inners.isNotEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user