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

Fix bad cast on absent descriptor in field breakpoint (EA-101988)

Browse Source
This commit is contained in:
Nikolay Krasko
2017-07-31 16:42:26 +03:00
parent 45ec0e364a
commit 2ba89b9e68
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
+10 -5
View File
@@ -122,7 +122,7 @@ class KotlinFieldBreakpoint(
val property = getProperty(sourcePosition) ?: return val property = getProperty(sourcePosition) ?: return
breakpointType = computeBreakpointType(property) breakpointType = (computeBreakpointType(property) ?: return)
val vm = debugProcess.virtualMachineProxy val vm = debugProcess.virtualMachineProxy
try { try {
@@ -187,7 +187,7 @@ class KotlinFieldBreakpoint(
} }
} }
private fun computeBreakpointType(property: KtCallableDeclaration): BreakpointType { private fun computeBreakpointType(property: KtCallableDeclaration): BreakpointType? {
return runReadAction { return runReadAction {
val bindingContext = property.analyze() val bindingContext = property.analyze()
var descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property) var descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property)
@@ -195,11 +195,16 @@ class KotlinFieldBreakpoint(
descriptor = bindingContext.get(BindingContext.VALUE_PARAMETER_AS_PROPERTY, descriptor) descriptor = bindingContext.get(BindingContext.VALUE_PARAMETER_AS_PROPERTY, descriptor)
} }
if (bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor as PropertyDescriptor)!!) { if (descriptor != null) {
BreakpointType.FIELD if (bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor as PropertyDescriptor)!!) {
BreakpointType.FIELD
}
else {
BreakpointType.METHOD
}
} }
else { else {
BreakpointType.METHOD null
} }
} }
} }