From 359d1145a03102dfd5991085bb40ff61df4b6d2b Mon Sep 17 00:00:00 2001 From: "Vitaliy.Bibaev" Date: Mon, 18 Sep 2017 19:48:08 +0300 Subject: [PATCH] Fix issue when break added into wrong code block --- .../intellij/debugger/streams/trace/dsl/ForLoopBody.kt | 2 +- .../streams/trace/dsl/impl/java/JavaForLoopBody.kt | 3 ++- .../streams/trace/dsl/impl/kotlin/KotlinForLoopBody.kt | 9 ++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/ForLoopBody.kt b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/ForLoopBody.kt index 264cb62f815b..08b62aa61bd0 100644 --- a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/ForLoopBody.kt +++ b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/ForLoopBody.kt @@ -20,5 +20,5 @@ package com.intellij.debugger.streams.trace.dsl */ interface ForLoopBody : CodeBlock { val loopVariable: Variable - fun breakIteration() + fun breakIteration(): Expression } \ No newline at end of file diff --git a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaForLoopBody.kt b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaForLoopBody.kt index 8f01c0a739a0..3cdb2a90bcba 100644 --- a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaForLoopBody.kt +++ b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/java/JavaForLoopBody.kt @@ -15,6 +15,7 @@ */ package com.intellij.debugger.streams.trace.dsl.impl.java +import com.intellij.debugger.streams.trace.dsl.Expression import com.intellij.debugger.streams.trace.dsl.ForLoopBody import com.intellij.debugger.streams.trace.dsl.StatementFactory import com.intellij.debugger.streams.trace.dsl.Variable @@ -29,5 +30,5 @@ class JavaForLoopBody(statementFactory: StatementFactory, override val loopVaria val BREAK = TextExpression("break") } - override fun breakIteration() = addStatement(BREAK) + override fun breakIteration(): Expression = BREAK } \ No newline at end of file diff --git a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/kotlin/KotlinForLoopBody.kt b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/kotlin/KotlinForLoopBody.kt index 8212b3cf03bd..2b3f2449e3f0 100644 --- a/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/kotlin/KotlinForLoopBody.kt +++ b/plugins/stream-debugger/src/main/java/com/intellij/debugger/streams/trace/dsl/impl/kotlin/KotlinForLoopBody.kt @@ -15,10 +15,7 @@ */ package com.intellij.debugger.streams.trace.dsl.impl.kotlin -import com.intellij.debugger.streams.trace.dsl.Dsl -import com.intellij.debugger.streams.trace.dsl.ForLoopBody -import com.intellij.debugger.streams.trace.dsl.StatementFactory -import com.intellij.debugger.streams.trace.dsl.Variable +import com.intellij.debugger.streams.trace.dsl.* import com.intellij.debugger.streams.trace.dsl.impl.TextExpression /** @@ -30,7 +27,5 @@ class KotlinForLoopBody(override val loopVariable: Variable, val BREAK = TextExpression("break") } - override fun breakIteration() { - addStatement(BREAK) - } + override fun breakIteration(): Expression = BREAK } \ No newline at end of file