From c56a72d442f330dafc61d4f8d32f34e2faef8dd7 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 21 Nov 2016 19:34:54 +0100 Subject: [PATCH] Retrieve virtual file for PsiFile via FileViewProvider, which always has a non-null vFile (EA-89047 - assert: LightClassDataProvider.getRepresentativeVirtualFile) --- .../jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt index 298e7e0c3eb..dd9bd54ba17 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt @@ -51,7 +51,6 @@ import org.jetbrains.kotlin.psi.KtScript import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics -import org.jetbrains.kotlin.utils.sure abstract class LightClassDataProvider( private val project: Project @@ -145,7 +144,7 @@ abstract class LightClassDataProvider( } private fun getRepresentativeVirtualFile(files: Collection): VirtualFile { - return files.firstOrNull()?.virtualFile.sure { "No virtual file for " + files.iterator().next() } + return files.first().viewProvider.virtualFile } private fun logErrorWithOSInfo(cause: Throwable?, fqName: FqName, virtualFile: VirtualFile?) {