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

Debugger: Add stepping tests for function breakpoints

Browse Source
This commit is contained in:
Yan Zhulanow
2019-07-15 16:48:20 +09:00
parent 023baf6233
commit b1f132d750
7 changed files with 189 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFunctionBreakpoint.java
+16 -1
View File
@@ -53,9 +53,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.java.debugger.breakpoints.properties.JavaMethodBreakpointProperties;
import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
import org.jetbrains.kotlin.asJava.classes.KtLightClass;
import org.jetbrains.kotlin.psi.KtClass;
import org.jetbrains.kotlin.psi.KtClassOrObject;
import org.jetbrains.kotlin.psi.KtDeclaration;
import org.jetbrains.kotlin.psi.KtPrimaryConstructor;
import org.jetbrains.org.objectweb.asm.Label;
import org.jetbrains.org.objectweb.asm.MethodVisitor;
import org.jetbrains.org.objectweb.asm.Opcodes;
@@ -570,7 +572,20 @@ public class KotlinFunctionBreakpoint extends BreakpointWithHighlighter<JavaMeth
KtDeclaration declaration = PositionUtil.getPsiElementAt(project, KtDeclaration.class, sourcePosition);
if (declaration instanceof KtClass) {
declaration = ((KtClass) declaration).getPrimaryConstructor();
KtPrimaryConstructor constructor = ((KtClass) declaration).getPrimaryConstructor();
if (constructor != null) {
declaration = constructor;
} else {
KtLightClass lightClass = LightClassUtilsKt.toLightClass((KtClassOrObject) declaration);
if (lightClass != null) {
PsiMethod[] constructors = lightClass.getConstructors();
if (constructors.length > 0) {
return constructors[0];
}
}
return null;
}
}
if (declaration == null) {
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/LineBreakpointExpressionVisitor.kt
+2 -2
View File
@@ -171,10 +171,10 @@ class LineBreakpointExpressionVisitor private constructor(
return Lines.EMPTY
}
val startOffset = this.startOffset
val startOffset = maxOf(this.startOffset, this.textOffset)
val endOffset = this.endOffset
if (startOffset < 0 || endOffset < 0) {
if (startOffset < 0 || endOffset < 0 || startOffset > endOffset) {
return Lines.EMPTY
}