From 045336899021985c66c65f8fc31bed6eccc4255c Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 24 Jul 2015 13:45:47 +0300 Subject: [PATCH] Better main function recognition and tests fix vararg main --- .../src/org/jetbrains/kotlin/idea/MainFunctionDetector.java | 2 +- .../run/MainInTest/module/src/mainInPackageVarianceOut.kt | 2 +- idea/testData/run/MainInTest/module/src/varargMain.kt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 idea/testData/run/MainInTest/module/src/varargMain.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java index 52e2b74ff2a..a3344971f25 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java @@ -84,7 +84,7 @@ public class MainFunctionDetector { if (!KotlinBuiltIns.isString(typeArgument)) { return false; } - if (typeArguments.get(0).getProjectionKind() != Variance.INVARIANT) { + if (typeArguments.get(0).getProjectionKind() == Variance.IN_VARIANCE) { return false; } diff --git a/idea/testData/run/MainInTest/module/src/mainInPackageVarianceOut.kt b/idea/testData/run/MainInTest/module/src/mainInPackageVarianceOut.kt index 07b47be2695..b429e9d5e17 100644 --- a/idea/testData/run/MainInTest/module/src/mainInPackageVarianceOut.kt +++ b/idea/testData/run/MainInTest/module/src/mainInPackageVarianceOut.kt @@ -1,5 +1,5 @@ package pkg5 fun main(args: Array) { - // no + // yes } diff --git a/idea/testData/run/MainInTest/module/src/varargMain.kt b/idea/testData/run/MainInTest/module/src/varargMain.kt new file mode 100644 index 00000000000..2e0b0f91f79 --- /dev/null +++ b/idea/testData/run/MainInTest/module/src/varargMain.kt @@ -0,0 +1,5 @@ +package varargMain + +fun main(vararg args: String) { + // yes +} \ No newline at end of file