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

Rename LF: DefinitelyNotNullTypeParameters -> DefinitelyNonNullableTypes

Browse Source
This commit is contained in:
Denis.Zharkov
2021-08-11 17:40:03 +03:00
committed by teamcityserver
parent 0e7d51b04d
commit d91155558b
27 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+2 -2
View File
@@ -308,11 +308,11 @@ class TypeResolver(
}
}
if (!languageVersionSettings.supportsFeature(LanguageFeature.DefinitelyNotNullTypeParameters)) {
if (!languageVersionSettings.supportsFeature(LanguageFeature.DefinitelyNonNullableTypes)) {
c.trace.report(
UNSUPPORTED_FEATURE.on(
intersectionType,
LanguageFeature.DefinitelyNotNullTypeParameters to languageVersionSettings
LanguageFeature.DefinitelyNonNullableTypes to languageVersionSettings
)
)
return
compiler/resolution.common/src/org/jetbrains/kotlin/types/AbstractTypeApproximator.kt
+1 -1
View File
@@ -366,7 +366,7 @@ abstract class AbstractTypeApproximator(
return typeWithErasedNullability
}
return if (conf.definitelyNotNullType || languageVersionSettings.supportsFeature(LanguageFeature.DefinitelyNotNullTypeParameters)) {
return if (conf.definitelyNotNullType || languageVersionSettings.supportsFeature(LanguageFeature.DefinitelyNonNullableTypes)) {
approximatedOriginalType?.makeDefinitelyNotNullOrNotNull()
} else {
if (toSuper)
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+5 -5
View File
@@ -193,7 +193,7 @@ class DescriptorSerializer private constructor(
if (metDefinitelyNotNullType) {
builder.addVersionRequirement(
writeLanguageVersionRequirement(LanguageFeature.DefinitelyNotNullTypeParameters, versionRequirementTable)
writeLanguageVersionRequirement(LanguageFeature.DefinitelyNonNullableTypes, versionRequirementTable)
)
}
@@ -320,7 +320,7 @@ class DescriptorSerializer private constructor(
}
if (local.metDefinitelyNotNullType) {
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNotNullTypeParameters))
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNonNullableTypes))
}
}
@@ -407,7 +407,7 @@ class DescriptorSerializer private constructor(
}
if (local.metDefinitelyNotNullType) {
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNotNullTypeParameters))
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNonNullableTypes))
}
}
@@ -447,7 +447,7 @@ class DescriptorSerializer private constructor(
}
if (local.metDefinitelyNotNullType) {
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNotNullTypeParameters))
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.DefinitelyNonNullableTypes))
}
}
@@ -513,7 +513,7 @@ class DescriptorSerializer private constructor(
builder.addAllVersionRequirement(serializeVersionRequirements(descriptor))
if (local.metDefinitelyNotNullType) {
builder.addVersionRequirement(
writeLanguageVersionRequirement(LanguageFeature.DefinitelyNotNullTypeParameters, versionRequirementTable)
writeLanguageVersionRequirement(LanguageFeature.DefinitelyNonNullableTypes, versionRequirementTable)
)
}
}
compiler/testData/codegen/box/notNullAssertions/definitelyNotNullTypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// !LANGUAGE: +DefinitelyNonNullableTypes +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
compiler/testData/codegen/box/notNullAssertions/inFunctionWithExpressionBodyWithJavaGeneric.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +StrictJavaNullabilityAssertions +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated +DefinitelyNotNullTypeParameters
// !LANGUAGE: +StrictJavaNullabilityAssertions +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated +DefinitelyNonNullableTypes
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: JVM
// IGNORE_LIGHT_ANALYSIS
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> foo(x: T, y: T & Any) = x!!
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> foo(x: T, y: T & Any) = x!!
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/bareTypes.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun main(x: Collection<String>) {
if (x is List<!SYNTAX!><!> <!SYNTAX!><!SYNTAX!><!>& Any)<!> {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/bareTypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun main(x: Collection<String>) {
if (x is List<!SYNTAX!><!> <!SYNTAX!><!SYNTAX!><!>& Any)<!> {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/disabledFeature.fir.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// !LANGUAGE: -DefinitelyNotNullTypeParameters
// !LANGUAGE: -DefinitelyNonNullableTypes
fun <T> foo(x: T, y: T & Any): List<T & Any>? = null
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/disabledFeature.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// !LANGUAGE: -DefinitelyNotNullTypeParameters
// !LANGUAGE: -DefinitelyNonNullableTypes
fun <T> foo(x: T, y: <!UNSUPPORTED_FEATURE!>T & Any<!>): List<<!UNSUPPORTED_FEATURE!>T & Any<!>>? = null
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> toDefNotNull(s: T): T & Any = s!!
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> toDefNotNull(s: T): T & Any = s!!
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/isAsOperators.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FIR_IDENTICAL
// SKIP_TXT
// !LANGUAGE: -DefinitelyNotNullTypeParameters
// !LANGUAGE: -DefinitelyNonNullableTypes
fun Any.bar() {}
fun Boolean.baz() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/isAsOperatorsEnabled.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FIR_IDENTICAL
// SKIP_TXT
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun Any.bar() {}
fun Boolean.baz() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T : Any> foo(x: T & Any, y: List<String & Any> & Any) {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T : Any> foo(x: <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>T<!> & Any, y: <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>List<<!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>String<!> & Any><!> & Any) {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
interface A<T> {
fun foo(x: T): T
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
interface A<T> {
fun foo(x: T): T
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// !LANGUAGE: +DefinitelyNonNullableTypes +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// FILE: A.java
import org.jetbrains.annotations.*;
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// !LANGUAGE: +DefinitelyNonNullableTypes +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
// FILE: A.java
import org.jetbrains.annotations.*;
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/reifiedArguments.fir.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// SKIP_TXT
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
inline fun <reified T : Any> foo() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/reifiedArguments.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// SKIP_TXT
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
inline fun <reified T : Any> foo() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> foo(x: T, y: T & Any): T & Any = x ?: y
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
fun <T> foo(x: T, y: T & Any): T & Any = x ?: y
compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
// !LANGUAGE: +DefinitelyNotNullTypeParameters
// COMPILER_ARGUMENTS: -XXLanguage:+DefinitelyNotNullTypeParameters
// !LANGUAGE: +DefinitelyNonNullableTypes
// COMPILER_ARGUMENTS: -XXLanguage:+DefinitelyNonNullableTypes
package test
fun <T> foo(x: T & Any, y: List<T & Any>, z: (T & Any) -> T & Any): T & Any = x
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1
View File
@@ -229,6 +229,7 @@ enum class LanguageFeature(
ProhibitSmartcastsOnPropertyFromAlienBaseClass(KOTLIN_1_7, kind = BUG_FIX),
ProhibitInvalidCharsInNativeIdentifiers(KOTLIN_1_7, kind = BUG_FIX),
DefinitelyNotNullTypeParameters(KOTLIN_1_7),
DefinitelyNonNullableTypes(KOTLIN_1_7),
// Temporarily disabled, see KT-27084/KT-22379
SoundSmartcastFromLoopConditionForLoopAssignedVariables(sinceVersion = null, kind = BUG_FIX),