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

Switch kotlin version to 1.7

Browse Source 
* Change 1.6 to 1.7 constants
* Fix SAFE_CALL_WILL_CHANGE_NULLABILITY for testData
* Change EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_WARNING to EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_ERROR
* Change NON_EXHAUSTIVE_WHEN_STATEMENT to NO_ELSE_IN_WHEN
* Fix testData for SafeCallsAreAlwaysNullable
* Change T -> T & Any in test dumps
* Change INVALID_CHARACTERS_NATIVE_WARNING -> INVALID_CHARACTERS_NATIVE_ERROR
* TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM_WARNING -> TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM_ERROR
This commit is contained in:
Mikhail Glukhikh
2021-12-23 17:55:36 +03:00
committed by Space
parent d741aaf82f
commit 53d6ac24e5
269 changed files with 624 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
Vendored
+1 -1
View File
@@ -100,7 +100,7 @@ fun case_4(value_1: Number, value_2: (() -> Unit)?) {
// TESTCASE NUMBER: 5
fun case_5(value_1: Number?, value_2: String?) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (value_2.case_5(value_1)) {
<!NO_ELSE_IN_WHEN!>when<!> (value_2.case_5(value_1)) {
true -> {
println(value_2<!UNSAFE_CALL!>.<!>length)
println(value_1.toByte())
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.kt
Vendored
+2 -1
View File
@@ -110,7 +110,7 @@ fun case_4(value_1: Number, value_2: (() -> Unit)?) {
// TESTCASE NUMBER: 5
fun case_5(value_1: Number?, value_2: String?) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (value_2.case_5(value_1)) {
when (value_2.case_5(value_1)) {
true -> {
println(value_2<!UNSAFE_CALL!>.<!>length)
println(value_1<!UNSAFE_CALL!>.<!>toByte())
@@ -119,6 +119,7 @@ fun case_5(value_1: Number?, value_2: String?) {
println(value_2<!UNSAFE_CALL!>.<!>length)
println(value_1.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>())
}
else -> {}
}
}
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.fir.kt
Vendored
+11 -11
View File
@@ -27,7 +27,7 @@ fun case_3(value_1: Any?, value_2: Any?) {
fun case_4(value_1: Any?, value_2: Number?) {
funWithReturns(value_1 is Float? && value_1 != null && value_2 != null)
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
// TESTCASE NUMBER: 5
@@ -38,7 +38,7 @@ class case_5_class {
val o = case_5_class()
funWithReturns(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null)
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
}
@@ -107,19 +107,19 @@ fun case_8(value_1: Any?, value_2: Any?) {
fun case_9(value_1: Any?, value_2: Number?) {
if (funWithReturnsTrue(value_1 is Float? && value_1 != null && value_2 != null)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (!funWithReturnsFalse(value_1 is Float? && value_1 != null && value_2 != null)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (funWithReturnsNotNull(value_1 is Float? && value_1 != null && value_2 != null) != null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (funWithReturnsNull(value_1 is Float? && value_1 != null && value_2 != null) == null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
}
@@ -131,22 +131,22 @@ class case_10_class {
val o = case_10_class()
if (funWithReturnsTrue(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (!funWithReturnsFalse(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (funWithReturnsNotNull(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null) != null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (funWithReturnsNull(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null) == null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
}
@@ -160,5 +160,5 @@ class case_10_class {
fun case_11(value_1: Any?, value_2: Any?, value_3: Any?) {
funWithReturnsAndInvertCondition(value_1 !is String || value_2 !is Number || <!USELESS_IS_CHECK!>value_3 !is Any?<!>)
println(value_1<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length)
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.kt
Vendored
+11 -11
View File
@@ -36,7 +36,7 @@ fun case_3(value_1: Any?, value_2: Any?) {
fun case_4(value_1: Any?, value_2: Number?) {
funWithReturns(value_1 is Float? && value_1 != null && value_2 != null)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
// TESTCASE NUMBER: 5
@@ -47,7 +47,7 @@ class case_5_class {
val o = case_5_class()
funWithReturns(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
}
@@ -116,19 +116,19 @@ fun case_8(value_1: Any?, value_2: Any?) {
fun case_9(value_1: Any?, value_2: Number?) {
if (funWithReturnsTrue(value_1 is Float? && value_1 != null && value_2 != null)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (!funWithReturnsFalse(value_1 is Float? && value_1 != null && value_2 != null)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (funWithReturnsNotNull(value_1 is Float? && value_1 != null && value_2 != null) != null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
if (funWithReturnsNull(value_1 is Float? && value_1 != null && value_2 != null) == null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
}
@@ -140,22 +140,22 @@ class case_10_class {
val o = case_10_class()
if (funWithReturnsTrue(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (!funWithReturnsFalse(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (funWithReturnsNotNull(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null) != null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (funWithReturnsNull(value_1 is Float? && value_1 != null && value_2 != null && o.prop_1 != null && this.prop_1 != null) == null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
}
@@ -169,5 +169,5 @@ class case_10_class {
fun case_11(value_1: Any?, value_2: Any?, value_3: Any?) {
funWithReturnsAndInvertCondition(value_1 !is String || value_2 !is Number || <!USELESS_IS_CHECK!>value_3 !is Any?<!>)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!><!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length)
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!><!DEBUG_INFO_SMARTCAST!>value_2<!><!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(<!DEBUG_INFO_SMARTCAST!>value_2<!><!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
}
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/3.fir.kt
Vendored
+5 -5
View File
@@ -103,7 +103,7 @@ class case_3_class {
val o = case_3_class()
contracts.case_3(value_1, value_2, o.prop_1, this.prop_1)
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
}
@@ -155,22 +155,22 @@ class case_6_class {
val o = case_6_class()
if (contracts.case_6_1(value_1, value_2, o.prop_1, this.prop_1)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (!contracts.case_6_2(value_1, value_2, o.prop_1, this.prop_1)) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (contracts.case_6_3(value_1, value_2, o.prop_1, this.prop_1) != null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
if (contracts.case_6_4(value_1, value_2, o.prop_1, this.prop_1) == null) {
println(value_1.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(o.prop_1.plus(3))
}
}
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/3.kt
Vendored
+5 -5
View File
@@ -111,7 +111,7 @@ class case_3_class {
val o = case_3_class()
contracts.case_3(value_1, value_2, o.prop_1, this.prop_1)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
}
@@ -163,22 +163,22 @@ class case_6_class {
val o = case_6_class()
if (contracts.case_6_1(value_1, value_2, o.prop_1, this.prop_1)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (!contracts.case_6_2(value_1, value_2, o.prop_1, this.prop_1)) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (contracts.case_6_3(value_1, value_2, o.prop_1, this.prop_1) != null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
if (contracts.case_6_4(value_1, value_2, o.prop_1, this.prop_1) == null) {
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.dec())
println(<!SAFE_CALL_WILL_CHANGE_NULLABILITY!>value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte()<!>)
println(value_2<!UNNECESSARY_SAFE_CALL!>?.<!>toByte())
println(<!DEBUG_INFO_SMARTCAST!>o.prop_1<!>.plus(3))
}
}
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
Vendored
+1 -1
View File
@@ -105,7 +105,7 @@ fun case_4(value_1: Number, value_2: (() -> Unit)?) {
* ISSUES: KT-26612
*/
fun case_5(value_1: Number?, value_2: String?) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (value_2.case_5(value_1)) {
<!NO_ELSE_IN_WHEN!>when<!> (value_2.case_5(value_1)) {
true -> {
println(value_2.length)
println(value_1.toByte())
compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.kt
Vendored
+2 -1
View File
@@ -115,7 +115,7 @@ fun case_4(value_1: Number, value_2: (() -> Unit)?) {
* ISSUES: KT-26612
*/
fun case_5(value_1: Number?, value_2: String?) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (value_2.case_5(value_1)) {
when (value_2.case_5(value_1)) {
true -> {
println(value_2<!UNSAFE_CALL!>.<!>length)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.toByte())
@@ -124,6 +124,7 @@ fun case_5(value_1: Number?, value_2: String?) {
println(value_2<!UNSAFE_CALL!>.<!>length)
println(<!DEBUG_INFO_SMARTCAST!>value_1<!>.inv())
}
else -> {}
}
}