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

Take read action instead of simply asserting it

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-23 19:22:12 +03:00
parent 24f79e4817
commit 5745a1624b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinBinaryClassCache.java
+9 -4
View File
@@ -20,6 +20,7 @@ import com.intellij.ide.highlighter.JavaClassFileType;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -48,7 +49,7 @@ public final class KotlinBinaryClassCache implements Disposable {
}; };
@Nullable @Nullable
public static KotlinJvmBinaryClass getKotlinBinaryClass(@NotNull VirtualFile file) { public static KotlinJvmBinaryClass getKotlinBinaryClass(@NotNull final VirtualFile file) {
if (file.getFileType() != JavaClassFileType.INSTANCE) return null; if (file.getFileType() != JavaClassFileType.INSTANCE) return null;
KotlinBinaryClassCache service = ServiceManager.getService(KotlinBinaryClassCache.class); KotlinBinaryClassCache service = ServiceManager.getService(KotlinBinaryClassCache.class);
@@ -58,10 +59,14 @@ public final class KotlinBinaryClassCache implements Disposable {
return requestCache.virtualFileKotlinClass; return requestCache.virtualFileKotlinClass;
} }
else { else {
ApplicationManager.getApplication().assertReadAccessAllowed(); VirtualFileKotlinClass aClass = ApplicationManager.getApplication().runReadAction(new Computable<VirtualFileKotlinClass>() {
@Override
public VirtualFileKotlinClass compute() {
//noinspection deprecation
return VirtualFileKotlinClass.OBJECT$.create(file);
}
});
//noinspection deprecation
VirtualFileKotlinClass aClass = VirtualFileKotlinClass.OBJECT$.create(file);
return requestCache.cache(file, aClass); return requestCache.cache(file, aClass);
} }
} }