From d1a29df581e08d33cded79e3a0e23e1394c93e29 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Wed, 4 Mar 2020 10:00:30 +0100
Subject: [PATCH] Revert "Added AllowNullableArrayArgsInMain (1.4+) language
 setting"

#KT-35965 Fixed
---
 .../src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt     | 4 +---
 .../org/jetbrains/kotlin/config/LanguageVersionSettings.kt    | 1 -
 .../MainInTest/module/src/mainNullableArgsInArray_after.kt    | 3 +--
 .../MainInTest/module/src/mainNullableArgsInArray_before.kt   | 1 -
 .../module/src/mainNullableArgsNullableArray_after.kt         | 3 +--
 .../module/src/mainNullableArgsNullableArray_before.kt        | 1 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt
index 11c4cad27f8..b10a03c598c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt
@@ -125,9 +125,7 @@ class MainFunctionDetector {
             if (typeArguments.size != 1) return false
 
             val typeArgument = typeArguments[0].type
-            if (!(languageVersionSettings.supportsFeature(LanguageFeature.AllowNullableArrayArgsInMain) &&
-                        KotlinBuiltIns.isStringOrNullableString(typeArgument) || KotlinBuiltIns.isString(typeArgument))
-            ) {
+            if (!KotlinBuiltIns.isString(typeArgument)) {
                 return false
             }
             if (typeArguments[0].projectionKind === Variance.IN_VARIANCE) {
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
index 42d506960b7..4a4de7b5118 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -110,7 +110,6 @@ enum class LanguageFeature(
     MixedNamedArgumentsInTheirOwnPosition(KOTLIN_1_4),
     ProhibitTailrecOnVirtualMember(KOTLIN_1_4, kind = BUG_FIX),
     ProperComputationOrderOfTailrecDefaultParameters(KOTLIN_1_4),
-    AllowNullableArrayArgsInMain(KOTLIN_1_4),
     TrailingCommas(KOTLIN_1_4),
     ProhibitProtectedCallFromInline(KOTLIN_1_4, kind = BUG_FIX),
     ProperFinally(KOTLIN_1_4, kind = BUG_FIX),
diff --git a/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_after.kt b/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_after.kt
index f0458600782..cce3ce42453 100644
--- a/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_after.kt
+++ b/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_after.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: +AllowNullableArrayArgsInMain
 
-fun main(args: Array<String?>) { // yes
+fun main(args: Array<String?>) { // no
 }
diff --git a/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_before.kt b/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_before.kt
index 2cf45e39048..cce3ce42453 100644
--- a/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_before.kt
+++ b/idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_before.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -AllowNullableArrayArgsInMain
 
 fun main(args: Array<String?>) { // no
 }
diff --git a/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_after.kt b/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_after.kt
index fdf27192b53..b49507fbedb 100644
--- a/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_after.kt
+++ b/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_after.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: +AllowNullableArrayArgsInMain
 
-fun main(args: Array<String?>?) { // yes
+fun main(args: Array<String?>?) { // no
 }
diff --git a/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_before.kt b/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_before.kt
index a3cddd4f1ef..b49507fbedb 100644
--- a/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_before.kt
+++ b/idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_before.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -AllowNullableArrayArgsInMain
 
 fun main(args: Array<String?>?) { // no
 }