From 002bca2f019567d299bad016b3c36b6edb32217a Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 26 Jun 2015 11:29:56 +0300 Subject: [PATCH] Fix compilation --- .../kotlin/idea/debugger/AbstractKotlinSteppingTest.kt | 4 ++-- .../jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt | 4 ---- .../debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt index ca491a4df8a..897163a5f8c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt @@ -55,7 +55,7 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() { File(path).readLines().forEach { when { - it.startsWith("// STEP_INTO") -> repeat("// STEP_INTO: ") { stepInto() } + it.startsWith("// STEP_INTO") -> repeat("// STEP_INTO: ") { stepInto(this) } it.startsWith("// STEP_OUT") -> repeat("// STEP_OUT: ") { stepOut() } it.startsWith("// SMART_STEP_INTO") -> repeat("// SMART_STEP_INTO: ") { smartStepInto() } it.startsWith("// RESUME") -> repeat("// RESUME: ") { resume(this) } @@ -75,7 +75,7 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() { for (i in 1..(getPrefixedInt(fileText, "// $command: ") ?: 1)) { doOnBreakpoint { when(command) { - "STEP_INTO" -> stepInto() + "STEP_INTO" -> stepInto(this) "STEP_OUT" -> stepOut() "SMART_STEP_INTO" -> smartStepInto() } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index 88eccc6dafd..1b16d323ada 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt @@ -117,10 +117,6 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() { } } - protected fun SuspendContextImpl.stepInto() { - this.stepInto(false, null) - } - protected var evaluationContext: EvaluationContextImpl by Delegates.notNull() protected var debuggerContext: DebuggerContextImpl by Delegates.notNull() diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index bc35fd78481..2a3dc421c34 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -110,7 +110,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB val count = InTextDirectivesUtils.getPrefixedInt(fileText, "// STEP_INTO: ") ?: 0 if (count > 0) { for (i in 1..count) { - doOnBreakpoint { stepInto() } + doOnBreakpoint { this@AbstractKotlinEvaluateExpressionTest.stepInto(this) } } }