diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694.kt b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694.kt index e24d37ed9a3..0f2ec3d03cc 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694.kt @@ -5,7 +5,6 @@ // COMMON_COROUTINES_TEST import helpers.* import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* enum class Foo(vararg expected: String) { A("start", "A", "end"), @@ -30,7 +29,7 @@ fun box(): String { } fun getSequence(a: Foo) = - buildSequence { + sequence { yield("start") when (a) { Foo.A -> { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine.kt index be5c0583dd8..dd88aef7ea1 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine.kt @@ -5,10 +5,9 @@ // COMMON_COROUTINES_TEST import helpers.* import COROUTINES_PACKAGE.* -import COROUTINES_PACKAGE.intrinsics.* val f = run { - buildSequence { + sequence { if (true) { yield("OK") } diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt index 1ed0b1ab69d..8aed5289cbd 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt @@ -1,10 +1,9 @@ // LANGUAGE_VERSION: 1.3 -import kotlin.coroutines.* import kotlin.sequences.* fun main(args: Array) { - val s = buildSequence { + val s = sequence { yield(1) val a = awaitSeq() println(a) // (1) @@ -12,7 +11,7 @@ fun main(args: Array) { println(s.toList()) } -suspend fun SequenceBuilder.awaitSeq(): Int = 42 +suspend fun SequenceScope.awaitSeq(): Int = 42 // 1 LOCALVARIABLE a I L18 L22 3 -// 1 LINENUMBER 10 L18 \ No newline at end of file +// 1 LINENUMBER 9 L18 \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/coroutines/primitivesCoertion.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/coroutines/primitivesCoertion.kt index 7bda643999b..2ae66f76dde 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/coroutines/primitivesCoertion.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/coroutines/primitivesCoertion.kt @@ -1,9 +1,9 @@ package primitivesCoertion -import kotlin.coroutines.* +import kotlin.sequences.* fun main(args: Array) { - val a = buildSequence { + val a = sequence { yield(1) val a = awaitSeq() //Breakpoint! @@ -12,7 +12,7 @@ fun main(args: Array) { println(a.toList()) } -suspend fun SequenceBuilder.awaitSeq(): Int = 42 +suspend fun SequenceScope.awaitSeq(): Int = 42 // EXPRESSION: a // RESULT: 42: I