From dac90369697ea2ac21a05802b3751147dea790aa Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 25 May 2018 19:52:14 +0300 Subject: [PATCH] Remove `reload(PsiFile?)` usage from KotlinFieldBreakpoint --- .../breakpoints/KotlinFieldBreakpoint.kt | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt index 80aa5b59040..cc55a9b55f8 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt @@ -96,25 +96,24 @@ class KotlinFieldBreakpoint( return null } - override fun reload(psiFile: PsiFile?) { - val property = getProperty(sourcePosition) - if (property != null) { - setFieldName(property.name!!) + override fun reload() { + super.reload() - if (property is KtProperty && property.isTopLevel) { - properties.myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingKtFile()).fileClassFqName.asString() - } - else { - val ktClass: KtClassOrObject? = PsiTreeUtil.getParentOfType(property, KtClassOrObject::class.java) - if (ktClass is KtClassOrObject) { - val fqName = ktClass.fqName - if (fqName != null) { - properties.myClassName = fqName.asString() - } + val property = getProperty(sourcePosition) ?: return + setFieldName(property.name!!) + + if (property is KtProperty && property.isTopLevel) { + properties.myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingKtFile()).fileClassFqName.asString() + } else { + val ktClass: KtClassOrObject? = PsiTreeUtil.getParentOfType(property, KtClassOrObject::class.java) + if (ktClass is KtClassOrObject) { + val fqName = ktClass.fqName + if (fqName != null) { + properties.myClassName = fqName.asString() } } - isInstanceFiltersEnabled = false } + isInstanceFiltersEnabled = false } override fun createRequestForPreparedClass(debugProcess: DebugProcessImpl?, refType: ReferenceType?) {