diff --git a/idea/idea-completion/testData/basic/common/CoroutineContext.kt b/idea/idea-completion/testData/basic/common/CoroutineContext.kt deleted file mode 100644 index 22ae15e79fc..00000000000 --- a/idea/idea-completion/testData/basic/common/CoroutineContext.kt +++ /dev/null @@ -1,8 +0,0 @@ -suspend fun foo() { - corou -} - -// LANGUAGE_VERSION: 1.2 -// EXIST_JAVA_ONLY: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"} -// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"} -// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental.intrinsics)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"} diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java index 251aa029197..c207cdfd050 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java @@ -91,11 +91,6 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes runTest("idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt"); } - @TestMetadata("CoroutineContext.kt") - public void testCoroutineContext() throws Exception { - runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt"); - } - @TestMetadata("CoroutineContextReleaseCoroutines.kt") public void testCoroutineContextReleaseCoroutines() throws Exception { runTest("idea/idea-completion/testData/basic/common/CoroutineContextReleaseCoroutines.kt"); diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index c0bba3230c9..02139c86e48 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java @@ -91,11 +91,6 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT runTest("idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt"); } - @TestMetadata("CoroutineContext.kt") - public void testCoroutineContext() throws Exception { - runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt"); - } - @TestMetadata("CoroutineContextReleaseCoroutines.kt") public void testCoroutineContextReleaseCoroutines() throws Exception { runTest("idea/idea-completion/testData/basic/common/CoroutineContextReleaseCoroutines.kt"); diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java index c1891fbeb7f..b19cfc5d471 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/HighLevelJvmBasicCompletionTestGenerated.java @@ -91,11 +91,6 @@ public class HighLevelJvmBasicCompletionTestGenerated extends AbstractHighLevelJ runTest("idea/idea-completion/testData/basic/common/ConsiderExtensionType.kt"); } - @TestMetadata("CoroutineContext.kt") - public void testCoroutineContext() throws Exception { - runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt"); - } - @TestMetadata("CoroutineContextReleaseCoroutines.kt") public void testCoroutineContextReleaseCoroutines() throws Exception { runTest("idea/idea-completion/testData/basic/common/CoroutineContextReleaseCoroutines.kt"); diff --git a/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt b/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt index 89d498d6b4a..3811c4d1044 100644 --- a/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt +++ b/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt @@ -1,10 +1,10 @@ // "Make block type suspend" "true" // WITH_RUNTIME -import kotlin.coroutines.experimental.suspendCoroutine -import kotlin.coroutines.experimental.createCoroutine +import kotlin.coroutines.suspendCoroutine +import kotlin.coroutines.createCoroutine suspend fun suspending(): T { val block: () -> T = { null!! } return suspendCoroutine { block.createCoroutine(it) } -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt.after b/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt.after index f9831d9518e..1f7d33114c7 100644 --- a/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt.after +++ b/idea/testData/quickfix/modifiers/suspend/createCoroutine.kt.after @@ -1,10 +1,10 @@ // "Make block type suspend" "true" // WITH_RUNTIME -import kotlin.coroutines.experimental.suspendCoroutine -import kotlin.coroutines.experimental.createCoroutine +import kotlin.coroutines.suspendCoroutine +import kotlin.coroutines.createCoroutine suspend fun suspending(): T { val block: suspend () -> T = { null!! } return suspendCoroutine { block.createCoroutine(it) } -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt b/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt index 9649cc97386..00e0187ba25 100644 --- a/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt +++ b/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt @@ -1,7 +1,7 @@ // "Make block type suspend" "true" // WITH_RUNTIME -import kotlin.coroutines.experimental.suspendCoroutine -import kotlin.coroutines.experimental.startCoroutine +import kotlin.coroutines.suspendCoroutine +import kotlin.coroutines.startCoroutine -suspend fun suspending(block: () -> T): T = suspendCoroutine { block.startCoroutine(it) } \ No newline at end of file +suspend fun suspending(block: () -> T): T = suspendCoroutine { block.startCoroutine(it) } diff --git a/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt.after b/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt.after index f4d34393b5b..2581e9f9b4d 100644 --- a/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt.after +++ b/idea/testData/quickfix/modifiers/suspend/startCoroutine.kt.after @@ -1,7 +1,7 @@ // "Make block type suspend" "true" // WITH_RUNTIME -import kotlin.coroutines.experimental.suspendCoroutine -import kotlin.coroutines.experimental.startCoroutine +import kotlin.coroutines.suspendCoroutine +import kotlin.coroutines.startCoroutine -suspend fun suspending(block: suspend () -> T): T = suspendCoroutine { block.startCoroutine(it) } \ No newline at end of file +suspend fun suspending(block: suspend () -> T): T = suspendCoroutine { block.startCoroutine(it) } diff --git a/idea/testData/quickfix/obsoleteCoroutines/.inspection b/idea/testData/quickfix/obsoleteCoroutines/.inspection deleted file mode 100644 index 6c77dc329c6..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/.inspection +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.inspections.migration.ObsoleteExperimentalCoroutinesInspection diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt deleted file mode 100644 index 8a49bbd668d..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt +++ /dev/null @@ -1,9 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Using 'buildIterator(noinline suspend SequenceScope.() -> Unit): Iterator' is an error. Use 'iterator { }' function instead. -// WITH_RUNTIME -import kotlin.coroutines.experimental.buildIterator - -fun main(args: Array) { - val lazySeq = buildIterator { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after b/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after deleted file mode 100644 index bb4bc63b157..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt.after +++ /dev/null @@ -1,8 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Using 'buildIterator(noinline suspend SequenceScope.() -> Unit): Iterator' is an error. Use 'iterator { }' function instead. -// WITH_RUNTIME - -fun main(args: Array) { - val lazySeq = buildIterator { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt b/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt deleted file mode 100644 index cb62eadb5dc..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt +++ /dev/null @@ -1,10 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// WITH_RUNTIME -package some - -import kotlin.coroutines.experimental.buildSequence - -fun main(args: Array) { - val lazySeq = buildSequence { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt.after b/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt.after deleted file mode 100644 index 899ed402b8c..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// WITH_RUNTIME -package some - -import kotlin.coroutines.experimental.buildSequence - -fun main(args: Array) { - val lazySeq = sequence { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt b/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt deleted file mode 100644 index 6c0269e1924..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt +++ /dev/null @@ -1,8 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Unresolved reference: buildSequence -import kotlin.coroutines.experimental.buildSequence - -fun main(args: Array) { - val lazySeq = buildSequence { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt.after b/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt.after deleted file mode 100644 index d1b2117b0eb..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Unresolved reference: buildSequence - -fun main(args: Array) { - val lazySeq = buildSequence { - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt b/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt deleted file mode 100644 index ed16d288749..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt +++ /dev/null @@ -1,16 +0,0 @@ -// "Fix experimental coroutines usages in the project" "true" -// WITH_RUNTIME -package migrate - -import kotlin.coroutines.experimental.buildIterator -import kotlin.coroutines.experimental.buildSequence - -fun main(args: Array) { - val one = buildSequence { - yield(1) - } - - val two = buildIterator { - yield(1) - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt.after b/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt.after deleted file mode 100644 index 12a0b3c2d70..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt.after +++ /dev/null @@ -1,13 +0,0 @@ -// "Fix experimental coroutines usages in the project" "true" -// WITH_RUNTIME -package migrate - -fun main(args: Array) { - val one = sequence { - yield(1) - } - - val two = iterator { - yield(1) - } -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/resume.kt b/idea/testData/quickfix/obsoleteCoroutines/resume.kt deleted file mode 100644 index 4ef619567ae..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/resume.kt +++ /dev/null @@ -1,9 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// SHOULD_BE_AVAILABLE_AFTER_EXECUTION -// WITH_RUNTIME - -import kotlin.coroutines.experimental.Continuation - -fun test(con: Continuation) { - con.resume(12) -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/resume.kt.after b/idea/testData/quickfix/obsoleteCoroutines/resume.kt.after deleted file mode 100644 index e411fc5e81e..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/resume.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// SHOULD_BE_AVAILABLE_AFTER_EXECUTION -// WITH_RUNTIME - -import kotlin.coroutines.experimental.Continuation -import kotlin.coroutines.resume - -fun test(con: Continuation) { - con.resume(12) -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt b/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt deleted file mode 100644 index a0b8595520b..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt +++ /dev/null @@ -1,9 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// SHOULD_BE_AVAILABLE_AFTER_EXECUTION -// WITH_RUNTIME - -import kotlin.coroutines.experimental.Continuation - -fun test(con: Continuation) { - con.resumeWithException(RuntimeException("Haha")) -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt.after b/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt.after deleted file mode 100644 index 6bcf645c5a2..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// SHOULD_BE_AVAILABLE_AFTER_EXECUTION -// WITH_RUNTIME - -import kotlin.coroutines.experimental.Continuation -import kotlin.coroutines.resumeWithException - -fun test(con: Continuation) { - con.resumeWithException(RuntimeException("Haha")) -} \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/starImport.kt b/idea/testData/quickfix/obsoleteCoroutines/starImport.kt deleted file mode 100644 index f4ff70f4d78..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/starImport.kt +++ /dev/null @@ -1,3 +0,0 @@ -// "Fix experimental coroutines usage" "true" - -import kotlin.coroutines.experimental.* \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/starImport.kt.after b/idea/testData/quickfix/obsoleteCoroutines/starImport.kt.after deleted file mode 100644 index ef621f3800c..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/starImport.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -// "Fix experimental coroutines usage" "true" - -import kotlin.coroutines.* \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt b/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt deleted file mode 100644 index 74450e5e68f..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt +++ /dev/null @@ -1,4 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Unresolved reference: kotlinx - -import kotlinx.coroutines.experimental.delay \ No newline at end of file diff --git a/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt.after b/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt.after deleted file mode 100644 index 3af1ea94b1d..00000000000 --- a/idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt.after +++ /dev/null @@ -1,4 +0,0 @@ -// "Fix experimental coroutines usage" "true" -// ERROR: Unresolved reference: kotlinx - -import kotlinx.coroutines.delay \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index a4d1154e619..085c463d4df 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -3560,19 +3560,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes } } - @TestMetadata("idea/testData/quickfix/obsoleteCoroutines") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ObsoleteCoroutines extends AbstractQuickFixMultiFileTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTestWithExtraFile, this, testDataFilePath); - } - - public void testAllFilesPresentInObsoleteCoroutines() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/quickfix/obsoleteCoroutines"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), null, true); - } - } - @TestMetadata("idea/testData/quickfix/obsoleteKotlinJsPackages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index a19d3bdbe5e..938eea025e3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -9960,59 +9960,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } } - @TestMetadata("idea/testData/quickfix/obsoleteCoroutines") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ObsoleteCoroutines extends AbstractQuickFixTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInObsoleteCoroutines() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/quickfix/obsoleteCoroutines"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), null, true); - } - - @TestMetadata("buildIteratorImport.kt") - public void testBuildIteratorImport() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/buildIteratorImport.kt"); - } - - @TestMetadata("buildSequence.kt") - public void testBuildSequence() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/buildSequence.kt"); - } - - @TestMetadata("buildSequenceImport.kt") - public void testBuildSequenceImport() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/buildSequenceImport.kt"); - } - - @TestMetadata("inProjectFix.kt") - public void testInProjectFix() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/inProjectFix.kt"); - } - - @TestMetadata("resume.kt") - public void testResume() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/resume.kt"); - } - - @TestMetadata("resumeWithException.kt") - public void testResumeWithException() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/resumeWithException.kt"); - } - - @TestMetadata("starImport.kt") - public void testStarImport() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/starImport.kt"); - } - - @TestMetadata("unresolvedKotlinxImport.kt") - public void testUnresolvedKotlinxImport() throws Exception { - runTest("idea/testData/quickfix/obsoleteCoroutines/unresolvedKotlinxImport.kt"); - } - } - @TestMetadata("idea/testData/quickfix/obsoleteKotlinJsPackages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)