From 53cb559440852cffe7ba9fe09ae8761edd0bd90f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 15 Nov 2016 12:47:45 +0100 Subject: [PATCH] Fix exception on databinding-generated classes in AS 2.3 (https://ea.jetbrains.com/browser/ea_reports/1261189) --- .../kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt index 4cc61b1dded..469209f9219 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt @@ -28,7 +28,7 @@ abstract class VirtualFileKotlinClassFinder : JvmVirtualFileFinder { } override fun findKotlinClass(javaClass: JavaClass): KotlinJvmBinaryClass? { - var file = (javaClass as JavaClassImpl).psi.containingFile!!.virtualFile ?: return null + var file = (javaClass as JavaClassImpl).psi.containingFile?.virtualFile ?: return null if (javaClass.outerClass != null) { // For nested classes we get a file of the containing class, to get the actual class file for A.B.C, // we take the file for A, take its parent directory, then in this directory we look for A$B$C.class