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

Fix PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL diagnostic in new inference

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-01-18 14:40:17 +03:00
parent 090c2998d2
commit 2da3366a47
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ProtectedConstructorCallChecker.kt
+1 -1
View File
@@ -55,7 +55,7 @@ object ProtectedConstructorCallChecker : CallChecker {
// And without ProtectedConstructorCallChecker such calls would be allowed only because they are performed within subclass // And without ProtectedConstructorCallChecker such calls would be allowed only because they are performed within subclass
// of constructor owner // of constructor owner
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
if (Visibilities.findInvisibleMember(Visibilities.FALSE_IF_PROTECTED, descriptor, scopeOwner) == actualConstructor) { if (Visibilities.findInvisibleMember(Visibilities.FALSE_IF_PROTECTED, descriptor, scopeOwner) == actualConstructor.original) {
context.trace.report(Errors.PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL.on(reportOn, descriptor)) context.trace.report(Errors.PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL.on(reportOn, descriptor))
} }
} }
compiler/testData/diagnostics/tests/inline/kt15410.kt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ open class Foo protected constructor()
inline fun foo(f: () -> Unit) = object: Foo() {} inline fun foo(f: () -> Unit) = object: Foo() {}
class A : Foo() { class A : Foo() {
inline fun foo(f: () -> Unit) = <!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>() inline fun foo(f: () -> Unit) = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>()
} }
compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt
Vendored
+4 -4
View File
@@ -8,14 +8,14 @@ open class A protected constructor(x: Int) {
class B4 : A(1) { class B4 : A(1) {
init { init {
<!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>() <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>()
<!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>(1) <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>(1)
A(5.0) A(5.0)
} }
fun foo() { fun foo() {
<!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>() <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>()
<!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>(1) <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>A<!>(1)
A(5.0) A(5.0)
object : A() {} object : A() {}
compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ class MyDerived : MyClass(1.0) {
val test4 = <!INVISIBLE_MEMBER!>MyAlias<!>(1) val test4 = <!INVISIBLE_MEMBER!>MyAlias<!>(1)
val test4a = <!INVISIBLE_MEMBER!>MyClass<!>(1) val test4a = <!INVISIBLE_MEMBER!>MyClass<!>(1)
val test5 = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>MyAlias<!>("") val test5 = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>MyAlias<!>("")
val test5a = <!OI;PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>MyClass<!>("") val test5a = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>MyClass<!>("")
val test6 = MyAlias(1.0) val test6 = MyAlias(1.0)
val test6a = MyClass(1.0) val test6a = MyClass(1.0)
} }