From a1f4a4572a1e78f69f73f26506b897ff3827ed61 Mon Sep 17 00:00:00 2001 From: Matthew Gharrity Date: Fri, 16 Aug 2019 15:06:35 -0700 Subject: [PATCH] Check cancelation in KotlinJavaPsiFacade.findPackage() This may help with some UI freezes caused by KT-33394, although it does not fix the underlying performance problem. --- .../org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java index 410b05cea1d..519a262bf75 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java @@ -228,6 +228,8 @@ public class KotlinJavaPsiFacade { } public PsiPackage findPackage(@NotNull String qualifiedName, GlobalSearchScope searchScope) { + ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); + PackageCache cache = SoftReference.dereference(packageCache); if (cache == null) { packageCache = new SoftReference<>(cache = new PackageCache());