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

KotlinDebuggerCaches: fix INRE

Browse Source 
#EA-219472 Fixed
This commit is contained in:
Dmitry Gridin
2019-12-04 15:41:59 +07:00
parent 3f500c6e92
commit 898308c7ba
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt
+10 -6
View File
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.idea.debugger.BytecodeDebugInfo
import org.jetbrains.kotlin.idea.debugger.createWeakBytecodeDebugInfoStorage import org.jetbrains.kotlin.idea.debugger.createWeakBytecodeDebugInfoStorage
import org.jetbrains.kotlin.idea.debugger.evaluate.compilation.CompiledDataDescriptor import org.jetbrains.kotlin.idea.debugger.evaluate.compilation.CompiledDataDescriptor
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.idea.util.runReadActionInSmartMode
import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -158,7 +159,8 @@ class KotlinDebuggerCaches(project: Project) {
} }
fun getOrCreateTypeMapper(psiElement: PsiElement): KotlinTypeMapper { fun getOrCreateTypeMapper(psiElement: PsiElement): KotlinTypeMapper {
val cache = getInstance(runReadAction { psiElement.project }) val project = runReadAction { psiElement.project }
val cache = getInstance(project)
val file = runReadAction { psiElement.containingFile as KtFile } val file = runReadAction { psiElement.containingFile as KtFile }
val isInLibrary = runReadAction { LibraryUtil.findLibraryEntry(file.virtualFile, file.project) } != null val isInLibrary = runReadAction { LibraryUtil.findLibraryEntry(file.virtualFile, file.project) } != null
@@ -170,11 +172,13 @@ class KotlinDebuggerCaches(project: Project) {
val cachedValue = typeMappersCache[key] val cachedValue = typeMappersCache[key]
if (cachedValue != null) return cachedValue if (cachedValue != null) return cachedValue
val newValue = if (!isInLibrary) { val newValue = project.runReadActionInSmartMode {
createTypeMapperForSourceFile(file) if (!isInLibrary) {
} else { createTypeMapperForSourceFile(file)
val element = getElementToCreateTypeMapperForLibraryFile(psiElement) } else {
createTypeMapperForLibraryFile(element, file) val element = getElementToCreateTypeMapperForLibraryFile(psiElement)
createTypeMapperForLibraryFile(element, file)
}
} }
typeMappersCache[key] = newValue typeMappersCache[key] = newValue