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

[FE 1.0] Implement deprecation warning for private constructors of sealed classes

Browse Source 
^KT-44866
^KT-49729 Fixed
This commit is contained in:
Dmitriy Novozhilov
2021-11-16 17:21:47 +03:00
parent 93378b1a04
commit da02d25278
18 changed files with 277 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_error.fir.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// LANGUAGE: +UseConsistentRulesForPrivateConstructorsOfSealedClasses
// ISSUE: KT-44866, KT-49729
// FILE: base.kt
sealed class SealedBase(x: Int) {
private constructor(y: String) : this(y.length)
class SealedNested : SealedBase("nested")
}
class SealedOuter : SealedBase(<!ARGUMENT_TYPE_MISMATCH!>"outer"<!>)
abstract class RegularBase(x: Int) {
private constructor(y: String) : this(y.length)
class RegularNested : RegularBase("nested")
}
class RegularOuter : RegularBase(<!ARGUMENT_TYPE_MISMATCH!>"outer"<!>)
// FILE: derived.kt
class SealedOuterInDifferentFile : SealedBase(<!ARGUMENT_TYPE_MISMATCH!>"other file"<!>)
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_error.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// LANGUAGE: +UseConsistentRulesForPrivateConstructorsOfSealedClasses
// ISSUE: KT-44866, KT-49729
// FILE: base.kt
sealed class SealedBase(x: Int) {
private constructor(y: String) : this(y.length)
class SealedNested : SealedBase("nested")
}
class SealedOuter : <!INVISIBLE_MEMBER!>SealedBase<!>("outer")
abstract class RegularBase(x: Int) {
private constructor(y: String) : this(y.length)
class RegularNested : RegularBase("nested")
}
class RegularOuter : <!INVISIBLE_MEMBER!>RegularBase<!>("outer")
// FILE: derived.kt
class SealedOuterInDifferentFile : <!INVISIBLE_MEMBER!>SealedBase<!>("other file")
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_error.txt
Vendored
+53
View File
@@ -0,0 +1,53 @@
package
public abstract class RegularBase {
public constructor RegularBase(/*0*/ x: kotlin.Int)
private constructor RegularBase(/*0*/ y: kotlin.String)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class RegularNested : RegularBase {
public constructor RegularNested()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class RegularOuter : RegularBase {
public constructor RegularOuter()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public sealed class SealedBase {
protected constructor SealedBase(/*0*/ x: kotlin.Int)
private constructor SealedBase(/*0*/ y: kotlin.String)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class SealedNested : SealedBase {
public constructor SealedNested()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class SealedOuter : SealedBase {
public constructor SealedOuter()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class SealedOuterInDifferentFile : SealedBase {
public constructor SealedOuterInDifferentFile()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_warning.fir.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// LANGUAGE: -UseConsistentRulesForPrivateConstructorsOfSealedClasses
// ISSUE: KT-44866, KT-49729
// FILE: base.kt
sealed class SealedBase(x: Int) {
private constructor(y: String) : this(y.length)
class SealedNested : SealedBase("nested")
}
class SealedOuter : SealedBase(<!ARGUMENT_TYPE_MISMATCH!>"outer"<!>)
abstract class RegularBase(x: Int) {
private constructor(y: String) : this(y.length)
class RegularNested : RegularBase("nested")
}
class RegularOuter : RegularBase(<!ARGUMENT_TYPE_MISMATCH!>"outer"<!>)
// FILE: derived.kt
class SealedOuterInDifferentFile : SealedBase(<!ARGUMENT_TYPE_MISMATCH!>"other file"<!>)
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_warning.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// LANGUAGE: -UseConsistentRulesForPrivateConstructorsOfSealedClasses
// ISSUE: KT-44866, KT-49729
// FILE: base.kt
sealed class SealedBase(x: Int) {
private constructor(y: String) : this(y.length)
class SealedNested : SealedBase("nested")
}
class SealedOuter : <!RESOLUTION_TO_PRIVATE_CONSTRUCTOR_OF_SEALED_CLASS!>SealedBase<!>("outer")
abstract class RegularBase(x: Int) {
private constructor(y: String) : this(y.length)
class RegularNested : RegularBase("nested")
}
class RegularOuter : <!INVISIBLE_MEMBER!>RegularBase<!>("outer")
// FILE: derived.kt
class SealedOuterInDifferentFile : <!INVISIBLE_MEMBER, RESOLUTION_TO_PRIVATE_CONSTRUCTOR_OF_SEALED_CLASS!>SealedBase<!>("other file")
compiler/testData/diagnostics/tests/sealed/privateSealedConstructors_warning.txt
Vendored
+53
View File
@@ -0,0 +1,53 @@
package
public abstract class RegularBase {
public constructor RegularBase(/*0*/ x: kotlin.Int)
private constructor RegularBase(/*0*/ y: kotlin.String)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class RegularNested : RegularBase {
public constructor RegularNested()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class RegularOuter : RegularBase {
public constructor RegularOuter()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public sealed class SealedBase {
protected constructor SealedBase(/*0*/ x: kotlin.Int)
private constructor SealedBase(/*0*/ y: kotlin.String)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class SealedNested : SealedBase {
public constructor SealedNested()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class SealedOuter : SealedBase {
public constructor SealedOuter()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class SealedOuterInDifferentFile : SealedBase {
public constructor SealedOuterInDifferentFile()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/sealed/protectedConstructors_disabled.fir.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ sealed class Case3 private constructor(val x: Int) {
class Inheritor2 : Case3("Hello")
}
class Case3Inheritor3 : Case3(<!ARGUMENT_TYPE_MISMATCH!>20<!>) // should be an error in 1.6 (?)
class Case3Inheritor3 : Case3(<!ARGUMENT_TYPE_MISMATCH!>20<!>) // should be an error in 1.8
sealed class Case4 {
protected constructor(x: Int)
compiler/testData/diagnostics/tests/sealed/protectedConstructors_disabled.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ sealed class Case3 private constructor(val x: Int) {
class Inheritor2 : Case3("Hello")
}
class Case3Inheritor3 : Case3(20) // should be an error in 1.6 (?)
class Case3Inheritor3 : Case3(20) // should be an error in 1.8
sealed class Case4 {
<!NON_PRIVATE_CONSTRUCTOR_IN_SEALED!>protected<!> constructor(x: Int)
compiler/testData/diagnostics/tests/sealed/protectedConstructors_enabled.fir.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ sealed class Case3 private constructor(val x: Int) {
class Inheritor2 : Case3("Hello")
}
class Case3Inheritor3 : Case3(<!ARGUMENT_TYPE_MISMATCH!>20<!>) // should be an error in 1.6 (?)
class Case3Inheritor3 : Case3(<!ARGUMENT_TYPE_MISMATCH!>20<!>) // should be an error in 1.8
sealed class Case4 {
protected constructor(x: Int)
compiler/testData/diagnostics/tests/sealed/protectedConstructors_enabled.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ sealed class Case3 private constructor(val x: Int) {
class Inheritor2 : Case3("Hello")
}
class Case3Inheritor3 : Case3(20) // should be an error in 1.6 (?)
class Case3Inheritor3 : <!RESOLUTION_TO_PRIVATE_CONSTRUCTOR_OF_SEALED_CLASS!>Case3<!>(20) // should be an error in 1.8
sealed class Case4 {
protected constructor(x: Int)