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

Remove reload(PsiFile?) usage from KotlinFieldBreakpoint

Browse Source
This commit is contained in:
Nikolay Krasko
2018-05-25 19:52:14 +03:00
parent 439e079c94
commit dac9036969
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
+5 -6
View File
@@ -96,15 +96,15 @@ class KotlinFieldBreakpoint(
return null return null
} }
override fun reload(psiFile: PsiFile?) { override fun reload() {
val property = getProperty(sourcePosition) super.reload()
if (property != null) {
val property = getProperty(sourcePosition) ?: return
setFieldName(property.name!!) setFieldName(property.name!!)
if (property is KtProperty && property.isTopLevel) { if (property is KtProperty && property.isTopLevel) {
properties.myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingKtFile()).fileClassFqName.asString() properties.myClassName = JvmFileClassUtil.getFileClassInfoNoResolve(property.getContainingKtFile()).fileClassFqName.asString()
} } else {
else {
val ktClass: KtClassOrObject? = PsiTreeUtil.getParentOfType(property, KtClassOrObject::class.java) val ktClass: KtClassOrObject? = PsiTreeUtil.getParentOfType(property, KtClassOrObject::class.java)
if (ktClass is KtClassOrObject) { if (ktClass is KtClassOrObject) {
val fqName = ktClass.fqName val fqName = ktClass.fqName
@@ -115,7 +115,6 @@ class KotlinFieldBreakpoint(
} }
isInstanceFiltersEnabled = false isInstanceFiltersEnabled = false
} }
}
override fun createRequestForPreparedClass(debugProcess: DebugProcessImpl?, refType: ReferenceType?) { override fun createRequestForPreparedClass(debugProcess: DebugProcessImpl?, refType: ReferenceType?) {
if (debugProcess == null || refType == null) return if (debugProcess == null || refType == null) return