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

Retrieve virtual file for PsiFile via FileViewProvider, which always has a non-null vFile (EA-89047 - assert: LightClassDataProvider.getRepresentativeVirtualFile)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-21 19:34:54 +01:00
parent 89313b3495
commit c56a72d442
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataProvider.kt
+1 -2
View File
@@ -51,7 +51,6 @@ import org.jetbrains.kotlin.psi.KtScript
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
import org.jetbrains.kotlin.utils.sure
abstract class LightClassDataProvider<T : WithFileStubAndExtraDiagnostics>( abstract class LightClassDataProvider<T : WithFileStubAndExtraDiagnostics>(
private val project: Project private val project: Project
@@ -145,7 +144,7 @@ abstract class LightClassDataProvider<T : WithFileStubAndExtraDiagnostics>(
} }
private fun getRepresentativeVirtualFile(files: Collection<KtFile>): VirtualFile { private fun getRepresentativeVirtualFile(files: Collection<KtFile>): 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?) { private fun logErrorWithOSInfo(cause: Throwable?, fqName: FqName, virtualFile: VirtualFile?) {