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

Do not try to create ExactJavaBreakpointVariant with null position (EA-107577)

Browse Source
This commit is contained in:
Nikolay Krasko
2017-09-25 15:53:47 +03:00
parent 8b1fbc9828
commit 98c50d3bfb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpointType.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class KotlinLineBreakpointType extends JavaLineBreakpointType {
} }
public class KotlinLambdaBreakpointVariant extends ExactJavaBreakpointVariant { public class KotlinLambdaBreakpointVariant extends ExactJavaBreakpointVariant {
public KotlinLambdaBreakpointVariant(XSourcePosition position, KtFunction function, Integer lambdaOrdinal) { public KotlinLambdaBreakpointVariant(@NotNull XSourcePosition position, @Nullable KtFunction function, Integer lambdaOrdinal) {
super(position, function, lambdaOrdinal); super(position, function, lambdaOrdinal);
} }
idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt
+5 -2
View File
@@ -106,8 +106,11 @@ fun computeVariants(
} }
lambdas.forEachIndexed { ordinal, lambda -> lambdas.forEachIndexed { ordinal, lambda ->
result.add(kotlinBreakpointType.KotlinLambdaBreakpointVariant( val positionImpl = XSourcePositionImpl.createByElement(lambda.bodyExpression)
XSourcePositionImpl.createByElement(lambda.bodyExpression), lambda, ordinal))
if (positionImpl != null) {
result.add(kotlinBreakpointType.KotlinLambdaBreakpointVariant(positionImpl, lambda, ordinal))
}
} }
val allBreakpoint = (kotlinBreakpointType as JavaLineBreakpointType).JavaBreakpointVariant(position) val allBreakpoint = (kotlinBreakpointType as JavaLineBreakpointType).JavaBreakpointVariant(position)