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

Fix compilation

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-06-26 11:29:56 +03:00
committed by Nikolay Krasko
parent fed264580d
commit 002bca2f01
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt
+2 -2
View File
@@ -55,7 +55,7 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() {
File(path).readLines().forEach { File(path).readLines().forEach {
when { 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("// STEP_OUT") -> repeat("// STEP_OUT: ") { stepOut() }
it.startsWith("// SMART_STEP_INTO") -> repeat("// SMART_STEP_INTO: ") { smartStepInto() } it.startsWith("// SMART_STEP_INTO") -> repeat("// SMART_STEP_INTO: ") { smartStepInto() }
it.startsWith("// RESUME") -> repeat("// RESUME: ") { resume(this) } it.startsWith("// RESUME") -> repeat("// RESUME: ") { resume(this) }
@@ -75,7 +75,7 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() {
for (i in 1..(getPrefixedInt(fileText, "// $command: ") ?: 1)) { for (i in 1..(getPrefixedInt(fileText, "// $command: ") ?: 1)) {
doOnBreakpoint { doOnBreakpoint {
when(command) { when(command) {
"STEP_INTO" -> stepInto() "STEP_INTO" -> stepInto(this)
"STEP_OUT" -> stepOut() "STEP_OUT" -> stepOut()
"SMART_STEP_INTO" -> smartStepInto() "SMART_STEP_INTO" -> smartStepInto()
} }
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
-4
View File
@@ -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 evaluationContext: EvaluationContextImpl by Delegates.notNull()
protected var debuggerContext: DebuggerContextImpl by Delegates.notNull() protected var debuggerContext: DebuggerContextImpl by Delegates.notNull()
idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+1 -1
View File
@@ -110,7 +110,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB
val count = InTextDirectivesUtils.getPrefixedInt(fileText, "// STEP_INTO: ") ?: 0 val count = InTextDirectivesUtils.getPrefixedInt(fileText, "// STEP_INTO: ") ?: 0
if (count > 0) { if (count > 0) {
for (i in 1..count) { for (i in 1..count) {
doOnBreakpoint { stepInto() } doOnBreakpoint { this@AbstractKotlinEvaluateExpressionTest.stepInto(this) }
} }
} }