azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Added AllowNullableArrayArgsInMain (1.4+) language setting"

Browse Source 
#KT-35965 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-03-04 10:00:30 +01:00
parent 0f7122a88a
commit d1a29df581
6 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.kt
+1 -3
View File
@@ -125,9 +125,7 @@ class MainFunctionDetector {
if (typeArguments.size != 1) return false if (typeArguments.size != 1) return false
val typeArgument = typeArguments[0].type val typeArgument = typeArguments[0].type
if (!(languageVersionSettings.supportsFeature(LanguageFeature.AllowNullableArrayArgsInMain) && if (!KotlinBuiltIns.isString(typeArgument)) {
KotlinBuiltIns.isStringOrNullableString(typeArgument) || KotlinBuiltIns.isString(typeArgument))
) {
return false return false
} }
if (typeArguments[0].projectionKind === Variance.IN_VARIANCE) { if (typeArguments[0].projectionKind === Variance.IN_VARIANCE) {
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
-1
View File
@@ -110,7 +110,6 @@ enum class LanguageFeature(
MixedNamedArgumentsInTheirOwnPosition(KOTLIN_1_4), MixedNamedArgumentsInTheirOwnPosition(KOTLIN_1_4),
ProhibitTailrecOnVirtualMember(KOTLIN_1_4, kind = BUG_FIX), ProhibitTailrecOnVirtualMember(KOTLIN_1_4, kind = BUG_FIX),
ProperComputationOrderOfTailrecDefaultParameters(KOTLIN_1_4), ProperComputationOrderOfTailrecDefaultParameters(KOTLIN_1_4),
AllowNullableArrayArgsInMain(KOTLIN_1_4),
TrailingCommas(KOTLIN_1_4), TrailingCommas(KOTLIN_1_4),
ProhibitProtectedCallFromInline(KOTLIN_1_4, kind = BUG_FIX), ProhibitProtectedCallFromInline(KOTLIN_1_4, kind = BUG_FIX),
ProperFinally(KOTLIN_1_4, kind = BUG_FIX), ProperFinally(KOTLIN_1_4, kind = BUG_FIX),
idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_after.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: +AllowNullableArrayArgsInMain
fun main(args: Array<String?>) { // yes fun main(args: Array<String?>) { // no
} }
idea/testData/run/MainInTest/module/src/mainNullableArgsInArray_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -AllowNullableArrayArgsInMain
fun main(args: Array<String?>) { // no fun main(args: Array<String?>) { // no
} }
idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_after.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: +AllowNullableArrayArgsInMain
fun main(args: Array<String?>?) { // yes fun main(args: Array<String?>?) { // no
} }
idea/testData/run/MainInTest/module/src/mainNullableArgsNullableArray_before.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// !LANGUAGE: -AllowNullableArrayArgsInMain
fun main(args: Array<String?>?) { // no fun main(args: Array<String?>?) { // no
} }