From 1d5144b168b3974be9d6bae70a85297ad84415e4 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 26 Jan 2017 19:51:49 +0300 Subject: [PATCH] Move coroutine-related diagnostic tests to run them with stdlib It's necessary because all coroutine related declarations (Continuation, etc) are now in the stdlib --- .../coroutines/noDefaultCoroutineImports.txt | 4 - .../coroutines/callableReferences.kt | 0 .../coroutines/callableReferences.txt | 0 .../coroutines/coroutinesDisabled.kt | 0 .../coroutines/coroutinesDisabled.txt | 0 .../coroutinesEnabledWithWarning.kt | 0 .../coroutinesEnabledWithWarning.txt | 0 .../coroutines/illegalSuspendCalls.kt | 0 .../coroutines/illegalSuspendCalls.txt | 0 .../coroutines/inference/correctMember.kt | 0 .../coroutines/inference/correctMember.txt | 0 .../coroutines/inference/extensionPriority.kt | 0 .../inference/extensionPriority.txt | 0 .../coroutines/inference/extensionSuspend.kt | 0 .../coroutines/inference/extensionSuspend.txt | 0 .../coroutines/inference/incorrectCalls.kt | 0 .../coroutines/inference/incorrectCalls.txt | 0 .../inference/recursiveGenerators.kt | 0 .../inference/recursiveGenerators.txt | 0 .../inference/recursiveGenerators2.kt | 0 .../inference/recursiveGenerators2.txt | 0 .../inference/returnTypeInference.kt | 0 .../inference/returnTypeInference.txt | 0 .../inference/returnTypeInference2.kt | 0 .../inference/returnTypeInference2.txt | 0 .../coroutines/inference/simpleGenerator.kt | 0 .../coroutines/inference/simpleGenerator.txt | 0 .../coroutines/inference/typeFromReceiver.kt | 0 .../coroutines/inference/typeFromReceiver.txt | 0 .../coroutines/inference/withParameter.kt | 0 .../coroutines/inference/withParameter.txt | 0 .../inference/withUninferredParameter.kt | 0 .../inference/withUninferredParameter.txt | 0 .../irrelevantSuspendDeclarations.kt | 0 .../irrelevantSuspendDeclarations.txt | 0 .../coroutines/lambdaExpectedType.kt | 0 .../coroutines/lambdaExpectedType.txt | 0 .../coroutines/mixingSuspendability.kt | 0 .../coroutines/mixingSuspendability.txt | 0 .../coroutines/noDefaultCoroutineImports.kt | 0 .../coroutines/noDefaultCoroutineImports.txt | 4 + .../coroutines/nonLocalSuspension.kt | 0 .../coroutines/nonLocalSuspension.txt | 0 .../restrictSuspension/allMembersAllowed.kt | 2 +- .../restrictSuspension/allMembersAllowed.txt | 2 +- .../restrictSuspension/extensions.kt | 0 .../restrictSuspension/extensions.txt | 2 +- .../restrictSuspension/notRelatedFun.kt | 0 .../restrictSuspension/notRelatedFun.txt | 2 +- .../restrictSuspension/sameInstance.kt | 0 .../restrictSuspension/sameInstance.txt | 2 +- .../restrictSuspension/simpleForbidden.kt | 0 .../restrictSuspension/simpleForbidden.txt | 2 +- .../coroutines/suspendApplicability.kt | 0 .../coroutines/suspendApplicability.txt | 2 +- .../suspendConflictsWithNoSuspend.kt | 0 .../suspendConflictsWithNoSuspend.txt | 0 .../coroutines/suspendCoroutineOrReturn.kt | 0 .../coroutines/suspendCoroutineOrReturn.txt | 0 .../coroutines/suspendExternalFunctions.kt | 0 .../coroutines/suspendExternalFunctions.txt | 0 .../functionVsSuspendFunction.kt | 0 .../functionVsSuspendFunction.txt | 0 .../suspendFunctionType/inference1.kt | 0 .../suspendFunctionType/inference1.txt | 0 .../suspendFunctionType/inference2.kt | 0 .../suspendFunctionType/inference2.txt | 0 .../suspendFunctionType/inference3.kt | 0 .../suspendFunctionType/inference3.txt | 0 .../suspendFunctionType/inference4.kt | 0 .../suspendFunctionType/inference4.txt | 0 .../coroutines/suspendFunctionType/invoke.kt | 0 .../coroutines/suspendFunctionType/invoke.txt | 0 .../lambdaInOverriddenValInitializer.kt | 0 .../lambdaInOverriddenValInitializer.txt | 0 .../lambdaInValInitializer.kt | 0 .../lambdaInValInitializer.txt | 0 .../modifierApplicability.kt | 0 .../modifierApplicability.txt | 0 .../noInvokeForSuspendFunction.kt | 0 .../noInvokeForSuspendFunction.txt | 0 .../suspendFunctionType/noValueParameters.kt | 0 .../suspendFunctionType/noValueParameters.txt | 0 .../nullableSuspendFunction.kt | 0 .../nullableSuspendFunction.txt | 0 .../suspendFunctionNIsUnresolved.kt | 0 .../suspendFunctionNIsUnresolved.txt | 0 .../coroutines/suspendFunctions.kt | 0 .../coroutines/suspendFunctions.txt | 0 .../coroutines/suspendOverridability.kt | 2 +- .../coroutines/suspendOverridability.txt | 4 +- .../coroutines/tailCalls/forbidden.kt | 0 .../coroutines/tailCalls/forbidden.txt | 0 .../coroutines/tailCalls/localFunctions.kt | 0 .../coroutines/tailCalls/localFunctions.txt | 0 .../tailCalls/nothingTypedSuspendFunction.kt | 0 .../tailCalls/nothingTypedSuspendFunction.txt | 0 .../coroutines/tailCalls/recursive.kt | 0 .../coroutines/tailCalls/recursive.txt | 0 .../coroutines/tailCalls/tryCatch.kt | 0 .../coroutines/tailCalls/tryCatch.txt | 0 .../coroutines/tailCalls/valid.kt | 0 .../coroutines/tailCalls/valid.txt | 0 .../coroutines/tryCatchLambda.kt | 0 .../coroutines/tryCatchLambda.txt | 0 .../coroutines/unsupported.kt | 0 .../coroutines/unsupported.txt | 0 .../checkers/DiagnosticsTestGenerated.java | 363 ------------------ .../DiagnosticsTestWithStdLibGenerated.java | 363 ++++++++++++++++++ .../tinyApp/src/forTests/coroutines.kt | 8 +- 110 files changed, 381 insertions(+), 381 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.txt rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/callableReferences.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/callableReferences.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/coroutinesDisabled.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/coroutinesDisabled.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/coroutinesEnabledWithWarning.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/coroutinesEnabledWithWarning.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/illegalSuspendCalls.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/illegalSuspendCalls.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/correctMember.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/correctMember.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/extensionPriority.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/extensionPriority.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/extensionSuspend.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/extensionSuspend.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/incorrectCalls.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/incorrectCalls.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/recursiveGenerators.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/recursiveGenerators.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/recursiveGenerators2.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/recursiveGenerators2.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/returnTypeInference.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/returnTypeInference.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/returnTypeInference2.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/returnTypeInference2.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/simpleGenerator.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/simpleGenerator.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/typeFromReceiver.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/typeFromReceiver.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/withParameter.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/withParameter.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/withUninferredParameter.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/inference/withUninferredParameter.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/irrelevantSuspendDeclarations.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/irrelevantSuspendDeclarations.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/lambdaExpectedType.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/lambdaExpectedType.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/mixingSuspendability.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/mixingSuspendability.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/noDefaultCoroutineImports.kt (100%) create mode 100644 compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/nonLocalSuspension.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/nonLocalSuspension.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/allMembersAllowed.kt (97%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/allMembersAllowed.txt (95%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/extensions.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/extensions.txt (94%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/notRelatedFun.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/notRelatedFun.txt (93%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/sameInstance.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/sameInstance.txt (86%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/simpleForbidden.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/restrictSuspension/simpleForbidden.txt (85%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendApplicability.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendApplicability.txt (94%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendConflictsWithNoSuspend.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendConflictsWithNoSuspend.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendCoroutineOrReturn.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendCoroutineOrReturn.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendExternalFunctions.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendExternalFunctions.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/functionVsSuspendFunction.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/functionVsSuspendFunction.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference1.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference1.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference2.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference2.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference3.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference3.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference4.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/inference4.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/invoke.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/invoke.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/lambdaInValInitializer.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/lambdaInValInitializer.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/modifierApplicability.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/modifierApplicability.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/noInvokeForSuspendFunction.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/noValueParameters.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/noValueParameters.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/nullableSuspendFunction.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/nullableSuspendFunction.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctions.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendFunctions.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendOverridability.kt (87%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/suspendOverridability.txt (91%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/forbidden.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/forbidden.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/localFunctions.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/localFunctions.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/nothingTypedSuspendFunction.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/nothingTypedSuspendFunction.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/recursive.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/recursive.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/tryCatch.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/tryCatch.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/valid.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tailCalls/valid.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tryCatchLambda.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/tryCatchLambda.txt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/unsupported.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/coroutines/unsupported.txt (100%) diff --git a/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.txt b/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.txt deleted file mode 100644 index ecd5c30af16..00000000000 --- a/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.txt +++ /dev/null @@ -1,4 +0,0 @@ -package - -public fun test(/*0*/ c: [ERROR : Continuation]): kotlin.Unit -public fun test2(/*0*/ c: kotlin.coroutines.Continuation): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/coroutines/callableReferences.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReferences.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/callableReferences.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReferences.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/callableReferences.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReferences.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/callableReferences.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReferences.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/coroutinesDisabled.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/coroutinesDisabled.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/coroutinesDisabled.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/coroutinesDisabled.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/coroutinesEnabledWithWarning.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/coroutinesEnabledWithWarning.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/coroutinesEnabledWithWarning.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/coroutinesEnabledWithWarning.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/illegalSuspendCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCalls.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/illegalSuspendCalls.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCalls.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/illegalSuspendCalls.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCalls.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/illegalSuspendCalls.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCalls.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/correctMember.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/correctMember.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/correctMember.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/correctMember.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/extensionPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/extensionPriority.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/extensionPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/extensionPriority.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/extensionSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/extensionSuspend.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/extensionSuspend.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/extensionSuspend.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/incorrectCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/incorrectCalls.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/incorrectCalls.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/incorrectCalls.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators2.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators2.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators2.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference2.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference2.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference2.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/simpleGenerator.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/simpleGenerator.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/simpleGenerator.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/simpleGenerator.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/typeFromReceiver.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/typeFromReceiver.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/typeFromReceiver.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/typeFromReceiver.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/withParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/withParameter.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/withParameter.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/withParameter.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/withUninferredParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/withUninferredParameter.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/inference/withUninferredParameter.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/inference/withUninferredParameter.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/irrelevantSuspendDeclarations.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/irrelevantSuspendDeclarations.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/irrelevantSuspendDeclarations.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/irrelevantSuspendDeclarations.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/mixingSuspendability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/mixingSuspendability.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/mixingSuspendability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/mixingSuspendability.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt new file mode 100644 index 00000000000..0567130d814 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt @@ -0,0 +1,4 @@ +package + +public fun test(/*0*/ c: [ERROR : Continuation]): kotlin.Unit +public fun test2(/*0*/ c: kotlin.coroutines.experimental.Continuation): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonLocalSuspension.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/nonLocalSuspension.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonLocalSuspension.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/nonLocalSuspension.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt similarity index 97% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt index 9e32259494f..0c6a2a34296 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt @@ -5,7 +5,7 @@ interface SuperInterface { suspend fun String.superExtFun() {} } -@kotlin.coroutines.RestrictsSuspension +@kotlin.coroutines.experimental.RestrictsSuspension open class RestrictedController : SuperInterface { suspend fun memberFun() {} suspend fun String.memberExtFun() {} diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt similarity index 95% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt index 878ea579aff..6ec717121f7 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt @@ -5,7 +5,7 @@ public fun generate2(/*0*/ f: suspend RestrictedController.() -> kotlin.Unit): k public fun generate3(/*0*/ f: suspend SubClass.() -> kotlin.Unit): kotlin.Unit public fun kotlin.String.test(): kotlin.Unit -@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt similarity index 94% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt index 8140a0d9dba..2512aab6d8c 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt @@ -20,7 +20,7 @@ public final class A { public final suspend fun SuperInterface.memExtSuper(): kotlin.Unit } -@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt similarity index 93% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt index ea2894e4f21..8130b88e034 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt @@ -14,7 +14,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.coroutines.RestrictsSuspension public open class RestrictedController : SuperInterface { +@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt similarity index 86% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt index 38e0ff18dc7..08a056a217f 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt @@ -5,7 +5,7 @@ public fun test(): kotlin.Unit public suspend fun RestrictedController.extension(): kotlin.Unit public suspend fun RestrictedController.l(): kotlin.Unit -@kotlin.coroutines.RestrictsSuspension public final class RestrictedController { +@kotlin.coroutines.experimental.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt similarity index 85% rename from compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt index 7e1a2cfeee5..1818a3714c9 100644 --- a/compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt @@ -5,7 +5,7 @@ public suspend fun suspendFun(): kotlin.Unit public fun test(): kotlin.Unit public suspend fun kotlin.Any?.extFun(): kotlin.Unit -@kotlin.coroutines.RestrictsSuspension public final class RestrictedController { +@kotlin.coroutines.experimental.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt similarity index 94% rename from compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt index 105425acf6e..b32d5b9d67f 100644 --- a/compiler/testData/diagnostics/tests/coroutines/suspendApplicability.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt @@ -10,7 +10,7 @@ public final class Controller { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final inline suspend fun inlineFun(/*0*/ x: kotlin.Int): kotlin.Unit public final suspend fun noParameters(): kotlin.Unit - public final suspend fun oldConvention(/*0*/ x: kotlin.coroutines.Continuation): kotlin.Unit + public final suspend fun oldConvention(/*0*/ x: kotlin.coroutines.experimental.Continuation): kotlin.Unit public final suspend fun oneParameter(/*0*/ q: kotlin.Any): kotlin.Unit public final suspend fun returnsString(/*0*/ q: kotlin.Any): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendConflictsWithNoSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendConflictsWithNoSuspend.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendConflictsWithNoSuspend.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendConflictsWithNoSuspend.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/functionVsSuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/functionVsSuspendFunction.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/functionVsSuspendFunction.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/functionVsSuspendFunction.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/functionVsSuspendFunction.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/functionVsSuspendFunction.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/functionVsSuspendFunction.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/functionVsSuspendFunction.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference1.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference1.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference1.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference1.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference1.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference1.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference1.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference1.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference2.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference2.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference2.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference2.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference2.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference2.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference2.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference3.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference3.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference3.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference3.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference3.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference3.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference3.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference3.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference4.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference4.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference4.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference4.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference4.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference4.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference4.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference4.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/invoke.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/invoke.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/invoke.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/invoke.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/invoke.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/invoke.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/invoke.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/invoke.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInValInitializer.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInValInitializer.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInValInitializer.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInValInitializer.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInValInitializer.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInValInitializer.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInValInitializer.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInValInitializer.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noInvokeForSuspendFunction.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noInvokeForSuspendFunction.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noInvokeForSuspendFunction.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noInvokeForSuspendFunction.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noValueParameters.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noValueParameters.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noValueParameters.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noValueParameters.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noValueParameters.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noValueParameters.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noValueParameters.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noValueParameters.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/nullableSuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/nullableSuspendFunction.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/nullableSuspendFunction.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/nullableSuspendFunction.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/nullableSuspendFunction.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/nullableSuspendFunction.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/nullableSuspendFunction.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/nullableSuspendFunction.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendFunctions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/suspendFunctions.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendOverridability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt similarity index 87% rename from compiler/testData/diagnostics/tests/coroutines/suspendOverridability.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt index 760479e3e96..c5681b61af4 100644 --- a/compiler/testData/diagnostics/tests/coroutines/suspendOverridability.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt @@ -33,5 +33,5 @@ interface C : A { // FILE: J.java public interface J extends A { - Object foo(kotlin.coroutines.Continuation y); + Object foo(kotlin.coroutines.experimental.Continuation y); } diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendOverridability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt similarity index 91% rename from compiler/testData/diagnostics/tests/coroutines/suspendOverridability.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt index c3beb0e87a2..c3116c7b616 100644 --- a/compiler/testData/diagnostics/tests/coroutines/suspendOverridability.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt @@ -29,7 +29,7 @@ public final class D : J { public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open suspend override /*1*/ fun foo(): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ y: kotlin.coroutines.Continuation!): kotlin.Any! + public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ y: kotlin.coroutines.experimental.Continuation!): kotlin.Any! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -38,7 +38,7 @@ public interface J : A { public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract suspend override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit - public abstract fun foo(/*0*/ y: kotlin.coroutines.Continuation!): kotlin.Any! + public abstract fun foo(/*0*/ y: kotlin.coroutines.experimental.Continuation!): kotlin.Any! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/localFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/localFunctions.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/localFunctions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/localFunctions.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/recursive.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/recursive.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/recursive.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/recursive.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/recursive.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/recursive.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/recursive.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/recursive.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.txt diff --git a/compiler/testData/diagnostics/tests/coroutines/unsupported.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/unsupported.kt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt diff --git a/compiler/testData/diagnostics/tests/coroutines/unsupported.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.txt similarity index 100% rename from compiler/testData/diagnostics/tests/coroutines/unsupported.txt rename to compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.txt diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index 52dea448fc8..0b53ea874aa 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -4376,369 +4376,6 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { } } - @TestMetadata("compiler/testData/diagnostics/tests/coroutines") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Coroutines extends AbstractDiagnosticsTest { - public void testAllFilesPresentInCoroutines() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("callableReferences.kt") - public void testCallableReferences() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/callableReferences.kt"); - doTest(fileName); - } - - @TestMetadata("coroutinesDisabled.kt") - public void testCoroutinesDisabled() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/coroutinesDisabled.kt"); - doTest(fileName); - } - - @TestMetadata("coroutinesEnabledWithWarning.kt") - public void testCoroutinesEnabledWithWarning() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/coroutinesEnabledWithWarning.kt"); - doTest(fileName); - } - - @TestMetadata("illegalSuspendCalls.kt") - public void testIllegalSuspendCalls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/illegalSuspendCalls.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantSuspendDeclarations.kt") - public void testIrrelevantSuspendDeclarations() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/irrelevantSuspendDeclarations.kt"); - doTest(fileName); - } - - @TestMetadata("lambdaExpectedType.kt") - public void testLambdaExpectedType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/lambdaExpectedType.kt"); - doTest(fileName); - } - - @TestMetadata("mixingSuspendability.kt") - public void testMixingSuspendability() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/mixingSuspendability.kt"); - doTest(fileName); - } - - @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/noDefaultCoroutineImports.kt"); - doTest(fileName); - } - - @TestMetadata("nonLocalSuspension.kt") - public void testNonLocalSuspension() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/nonLocalSuspension.kt"); - doTest(fileName); - } - - @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendApplicability.kt"); - doTest(fileName); - } - - @TestMetadata("suspendConflictsWithNoSuspend.kt") - public void testSuspendConflictsWithNoSuspend() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendConflictsWithNoSuspend.kt"); - doTest(fileName); - } - - @TestMetadata("suspendCoroutineOrReturn.kt") - public void testSuspendCoroutineOrReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendCoroutineOrReturn.kt"); - doTest(fileName); - } - - @TestMetadata("suspendExternalFunctions.kt") - public void testSuspendExternalFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendExternalFunctions.kt"); - doTest(fileName); - } - - @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctions.kt"); - doTest(fileName); - } - - @TestMetadata("suspendOverridability.kt") - public void testSuspendOverridability() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendOverridability.kt"); - doTest(fileName); - } - - @TestMetadata("tryCatchLambda.kt") - public void testTryCatchLambda() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tryCatchLambda.kt"); - doTest(fileName); - } - - @TestMetadata("unsupported.kt") - public void testUnsupported() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/unsupported.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/diagnostics/tests/coroutines/inference") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractDiagnosticsTest { - public void testAllFilesPresentInInference() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/coroutines/inference"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("correctMember.kt") - public void testCorrectMember() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/correctMember.kt"); - doTest(fileName); - } - - @TestMetadata("extensionPriority.kt") - public void testExtensionPriority() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/extensionPriority.kt"); - doTest(fileName); - } - - @TestMetadata("extensionSuspend.kt") - public void testExtensionSuspend() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/extensionSuspend.kt"); - doTest(fileName); - } - - @TestMetadata("incorrectCalls.kt") - public void testIncorrectCalls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/incorrectCalls.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveGenerators.kt") - public void testRecursiveGenerators() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveGenerators2.kt") - public void testRecursiveGenerators2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/recursiveGenerators2.kt"); - doTest(fileName); - } - - @TestMetadata("returnTypeInference.kt") - public void testReturnTypeInference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference.kt"); - doTest(fileName); - } - - @TestMetadata("returnTypeInference2.kt") - public void testReturnTypeInference2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/returnTypeInference2.kt"); - doTest(fileName); - } - - @TestMetadata("simpleGenerator.kt") - public void testSimpleGenerator() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/simpleGenerator.kt"); - doTest(fileName); - } - - @TestMetadata("typeFromReceiver.kt") - public void testTypeFromReceiver() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/typeFromReceiver.kt"); - doTest(fileName); - } - - @TestMetadata("withParameter.kt") - public void testWithParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/withParameter.kt"); - doTest(fileName); - } - - @TestMetadata("withUninferredParameter.kt") - public void testWithUninferredParameter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/inference/withUninferredParameter.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class RestrictSuspension extends AbstractDiagnosticsTest { - public void testAllFilesPresentInRestrictSuspension() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/coroutines/restrictSuspension"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension/allMembersAllowed.kt"); - doTest(fileName); - } - - @TestMetadata("extensions.kt") - public void testExtensions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension/extensions.kt"); - doTest(fileName); - } - - @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension/notRelatedFun.kt"); - doTest(fileName); - } - - @TestMetadata("sameInstance.kt") - public void testSameInstance() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension/sameInstance.kt"); - doTest(fileName); - } - - @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/restrictSuspension/simpleForbidden.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class SuspendFunctionType extends AbstractDiagnosticsTest { - public void testAllFilesPresentInSuspendFunctionType() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("functionVsSuspendFunction.kt") - public void testFunctionVsSuspendFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/functionVsSuspendFunction.kt"); - doTest(fileName); - } - - @TestMetadata("inference1.kt") - public void testInference1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference1.kt"); - doTest(fileName); - } - - @TestMetadata("inference2.kt") - public void testInference2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference2.kt"); - doTest(fileName); - } - - @TestMetadata("inference3.kt") - public void testInference3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference3.kt"); - doTest(fileName); - } - - @TestMetadata("inference4.kt") - public void testInference4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/inference4.kt"); - doTest(fileName); - } - - @TestMetadata("invoke.kt") - public void testInvoke() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/invoke.kt"); - doTest(fileName); - } - - @TestMetadata("lambdaInOverriddenValInitializer.kt") - public void testLambdaInOverriddenValInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("lambdaInValInitializer.kt") - public void testLambdaInValInitializer() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/lambdaInValInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("modifierApplicability.kt") - public void testModifierApplicability() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.kt"); - doTest(fileName); - } - - @TestMetadata("noInvokeForSuspendFunction.kt") - public void testNoInvokeForSuspendFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt"); - doTest(fileName); - } - - @TestMetadata("noValueParameters.kt") - public void testNoValueParameters() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/noValueParameters.kt"); - doTest(fileName); - } - - @TestMetadata("nullableSuspendFunction.kt") - public void testNullableSuspendFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/nullableSuspendFunction.kt"); - doTest(fileName); - } - - @TestMetadata("suspendFunctionNIsUnresolved.kt") - public void testSuspendFunctionNIsUnresolved() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class TailCalls extends AbstractDiagnosticsTest { - public void testAllFilesPresentInTailCalls() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/coroutines/tailCalls"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("forbidden.kt") - public void testForbidden() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/forbidden.kt"); - doTest(fileName); - } - - @TestMetadata("localFunctions.kt") - public void testLocalFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/localFunctions.kt"); - doTest(fileName); - } - - @TestMetadata("nothingTypedSuspendFunction.kt") - public void testNothingTypedSuspendFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); - doTest(fileName); - } - - @TestMetadata("recursive.kt") - public void testRecursive() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/recursive.kt"); - doTest(fileName); - } - - @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/tryCatch.kt"); - doTest(fileName); - } - - @TestMetadata("valid.kt") - public void testValid() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/coroutines/tailCalls/valid.kt"); - doTest(fileName); - } - } - } - @TestMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index dd22ca3296c..a8f2e3167b8 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -705,6 +705,369 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Coroutines extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInCoroutines() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("callableReferences.kt") + public void testCallableReferences() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReferences.kt"); + doTest(fileName); + } + + @TestMetadata("coroutinesDisabled.kt") + public void testCoroutinesDisabled() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt"); + doTest(fileName); + } + + @TestMetadata("coroutinesEnabledWithWarning.kt") + public void testCoroutinesEnabledWithWarning() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt"); + doTest(fileName); + } + + @TestMetadata("illegalSuspendCalls.kt") + public void testIllegalSuspendCalls() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCalls.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantSuspendDeclarations.kt") + public void testIrrelevantSuspendDeclarations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/irrelevantSuspendDeclarations.kt"); + doTest(fileName); + } + + @TestMetadata("lambdaExpectedType.kt") + public void testLambdaExpectedType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt"); + doTest(fileName); + } + + @TestMetadata("mixingSuspendability.kt") + public void testMixingSuspendability() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.kt"); + doTest(fileName); + } + + @TestMetadata("noDefaultCoroutineImports.kt") + public void testNoDefaultCoroutineImports() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + doTest(fileName); + } + + @TestMetadata("nonLocalSuspension.kt") + public void testNonLocalSuspension() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/nonLocalSuspension.kt"); + doTest(fileName); + } + + @TestMetadata("suspendApplicability.kt") + public void testSuspendApplicability() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + doTest(fileName); + } + + @TestMetadata("suspendConflictsWithNoSuspend.kt") + public void testSuspendConflictsWithNoSuspend() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.kt"); + doTest(fileName); + } + + @TestMetadata("suspendCoroutineOrReturn.kt") + public void testSuspendCoroutineOrReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + doTest(fileName); + } + + @TestMetadata("suspendExternalFunctions.kt") + public void testSuspendExternalFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt"); + doTest(fileName); + } + + @TestMetadata("suspendFunctions.kt") + public void testSuspendFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + doTest(fileName); + } + + @TestMetadata("suspendOverridability.kt") + public void testSuspendOverridability() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt"); + doTest(fileName); + } + + @TestMetadata("tryCatchLambda.kt") + public void testTryCatchLambda() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt"); + doTest(fileName); + } + + @TestMetadata("unsupported.kt") + public void testUnsupported() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt"); + doTest(fileName); + } + + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Inference extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInInference() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("correctMember.kt") + public void testCorrectMember() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/correctMember.kt"); + doTest(fileName); + } + + @TestMetadata("extensionPriority.kt") + public void testExtensionPriority() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionPriority.kt"); + doTest(fileName); + } + + @TestMetadata("extensionSuspend.kt") + public void testExtensionSuspend() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionSuspend.kt"); + doTest(fileName); + } + + @TestMetadata("incorrectCalls.kt") + public void testIncorrectCalls() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveGenerators.kt") + public void testRecursiveGenerators() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveGenerators2.kt") + public void testRecursiveGenerators2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt"); + doTest(fileName); + } + + @TestMetadata("returnTypeInference.kt") + public void testReturnTypeInference() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference.kt"); + doTest(fileName); + } + + @TestMetadata("returnTypeInference2.kt") + public void testReturnTypeInference2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/returnTypeInference2.kt"); + doTest(fileName); + } + + @TestMetadata("simpleGenerator.kt") + public void testSimpleGenerator() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/simpleGenerator.kt"); + doTest(fileName); + } + + @TestMetadata("typeFromReceiver.kt") + public void testTypeFromReceiver() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/typeFromReceiver.kt"); + doTest(fileName); + } + + @TestMetadata("withParameter.kt") + public void testWithParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withParameter.kt"); + doTest(fileName); + } + + @TestMetadata("withUninferredParameter.kt") + public void testWithUninferredParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt"); + doTest(fileName); + } + } + + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class RestrictSuspension extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInRestrictSuspension() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("allMembersAllowed.kt") + public void testAllMembersAllowed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + doTest(fileName); + } + + @TestMetadata("extensions.kt") + public void testExtensions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + doTest(fileName); + } + + @TestMetadata("notRelatedFun.kt") + public void testNotRelatedFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + doTest(fileName); + } + + @TestMetadata("sameInstance.kt") + public void testSameInstance() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + doTest(fileName); + } + + @TestMetadata("simpleForbidden.kt") + public void testSimpleForbidden() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + doTest(fileName); + } + } + + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SuspendFunctionType extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInSuspendFunctionType() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("functionVsSuspendFunction.kt") + public void testFunctionVsSuspendFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/functionVsSuspendFunction.kt"); + doTest(fileName); + } + + @TestMetadata("inference1.kt") + public void testInference1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference1.kt"); + doTest(fileName); + } + + @TestMetadata("inference2.kt") + public void testInference2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference2.kt"); + doTest(fileName); + } + + @TestMetadata("inference3.kt") + public void testInference3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference3.kt"); + doTest(fileName); + } + + @TestMetadata("inference4.kt") + public void testInference4() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/inference4.kt"); + doTest(fileName); + } + + @TestMetadata("invoke.kt") + public void testInvoke() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/invoke.kt"); + doTest(fileName); + } + + @TestMetadata("lambdaInOverriddenValInitializer.kt") + public void testLambdaInOverriddenValInitializer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInOverriddenValInitializer.kt"); + doTest(fileName); + } + + @TestMetadata("lambdaInValInitializer.kt") + public void testLambdaInValInitializer() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/lambdaInValInitializer.kt"); + doTest(fileName); + } + + @TestMetadata("modifierApplicability.kt") + public void testModifierApplicability() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.kt"); + doTest(fileName); + } + + @TestMetadata("noInvokeForSuspendFunction.kt") + public void testNoInvokeForSuspendFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noInvokeForSuspendFunction.kt"); + doTest(fileName); + } + + @TestMetadata("noValueParameters.kt") + public void testNoValueParameters() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/noValueParameters.kt"); + doTest(fileName); + } + + @TestMetadata("nullableSuspendFunction.kt") + public void testNullableSuspendFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/nullableSuspendFunction.kt"); + doTest(fileName); + } + + @TestMetadata("suspendFunctionNIsUnresolved.kt") + public void testSuspendFunctionNIsUnresolved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionNIsUnresolved.kt"); + doTest(fileName); + } + } + + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TailCalls extends AbstractDiagnosticsTestWithStdLib { + public void testAllFilesPresentInTailCalls() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + } + + @TestMetadata("forbidden.kt") + public void testForbidden() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + doTest(fileName); + } + + @TestMetadata("localFunctions.kt") + public void testLocalFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/localFunctions.kt"); + doTest(fileName); + } + + @TestMetadata("nothingTypedSuspendFunction.kt") + public void testNothingTypedSuspendFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + doTest(fileName); + } + + @TestMetadata("recursive.kt") + public void testRecursive() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/recursive.kt"); + doTest(fileName); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + doTest(fileName); + } + + @TestMetadata("valid.kt") + public void testValid() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + doTest(fileName); + } + } + } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/testData/debugger/tinyApp/src/forTests/coroutines.kt b/idea/testData/debugger/tinyApp/src/forTests/coroutines.kt index 094c5ac48ec..db56ed1aa3d 100644 --- a/idea/testData/debugger/tinyApp/src/forTests/coroutines.kt +++ b/idea/testData/debugger/tinyApp/src/forTests/coroutines.kt @@ -1,9 +1,9 @@ package forTests -import kotlin.coroutines.Continuation -import kotlin.coroutines.CoroutineContext -import kotlin.coroutines.EmptyCoroutineContext -import kotlin.coroutines.startCoroutine +import kotlin.coroutines.experimental.Continuation +import kotlin.coroutines.experimental.CoroutineContext +import kotlin.coroutines.experimental.EmptyCoroutineContext +import kotlin.coroutines.experimental.startCoroutine open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation()