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

Don't allow to use own members when resolve super constructor call in (companion) object

Browse Source
This commit is contained in:
Zalim Bashorov
2015-12-14 18:45:17 +03:00
parent e9ea4cc953
commit 69c2668530
6 changed files with 114 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class ClassResolutionScopesSupport(
}
public val scopeForConstructorHeaderResolution: () -> LexicalScope = storageManager.createLazyValue {
scopeWithGenerics(scopeForStaticMemberDeclarationResolution())
scopeWithGenerics(if (classDescriptor.kind.isSingleton) scopeForCompanionObjectHeaderResolution() else scopeForStaticMemberDeclarationResolution())
}
private val inheritanceScopeWithoutMe: () -> LexicalScope = storageManager.createLazyValue(onRecursion = createThrowingLexicalScope) {
compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectSuperConstructorArguments.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
open class S(val a: Any, val b: Any, val c: Any) {}
interface A {
companion object : S(<!UNRESOLVED_REFERENCE!>prop1<!>, <!UNRESOLVED_REFERENCE!>prop2<!>, <!UNRESOLVED_REFERENCE!>func<!>()) {
val prop1 = 1
val prop2: Int
get() = 1
fun func() {}
}
}
class B {
companion object : S(<!UNRESOLVED_REFERENCE!>prop1<!>, <!UNRESOLVED_REFERENCE!>prop2<!>, <!UNRESOLVED_REFERENCE!>func<!>()) {
val prop1 = 1
val prop2: Int
get() = 1
fun func() {}
}
}
compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectSuperConstructorArguments.txt
Vendored
+50
View File
@@ -0,0 +1,50 @@
package
public interface A {
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 companion object Companion : S {
private constructor Companion()
public final override /*1*/ /*fake_override*/ val a: kotlin.Any
public final override /*1*/ /*fake_override*/ val b: kotlin.Any
public final override /*1*/ /*fake_override*/ val c: kotlin.Any
public final val prop1: kotlin.Int = 1
public final val prop2: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun func(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class B {
public constructor B()
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 companion object Companion : S {
private constructor Companion()
public final override /*1*/ /*fake_override*/ val a: kotlin.Any
public final override /*1*/ /*fake_override*/ val b: kotlin.Any
public final override /*1*/ /*fake_override*/ val c: kotlin.Any
public final val prop1: kotlin.Int = 1
public final val prop2: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun func(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public open class S {
public constructor S(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any, /*2*/ c: kotlin.Any)
public final val a: kotlin.Any
public final val b: kotlin.Any
public final val c: kotlin.Any
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/scopes/classHeader/objectSuperConstructorArguments.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
open class S(val a: Any, val b: Any, val c: Any) {}
object A : S(<!UNRESOLVED_REFERENCE!>prop1<!>, <!UNRESOLVED_REFERENCE!>prop2<!>, <!UNRESOLVED_REFERENCE!>func<!>()) {
val prop1 = 1
val prop2: Int
get() = 1
fun func() {}
}
compiler/testData/diagnostics/tests/scopes/classHeader/objectSuperConstructorArguments.txt
Vendored
+24
View File
@@ -0,0 +1,24 @@
package
public object A : S {
private constructor A()
public final override /*1*/ /*fake_override*/ val a: kotlin.Any
public final override /*1*/ /*fake_override*/ val b: kotlin.Any
public final override /*1*/ /*fake_override*/ val c: kotlin.Any
public final val prop1: kotlin.Int = 1
public final val prop2: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun func(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class S {
public constructor S(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any, /*2*/ c: kotlin.Any)
public final val a: kotlin.Any
public final val b: kotlin.Any
public final val c: kotlin.Any
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/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+12
View File
@@ -14018,6 +14018,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("companionObjectSuperConstructorArguments.kt")
public void testCompanionObjectSuperConstructorArguments() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectSuperConstructorArguments.kt");
doTest(fileName);
}
@TestMetadata("constructors.kt")
public void testConstructors() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/classHeader/constructors.kt");
@@ -14036,6 +14042,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("objectSuperConstructorArguments.kt")
public void testObjectSuperConstructorArguments() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/classHeader/objectSuperConstructorArguments.kt");
doTest(fileName);
}
@TestMetadata("simpleDelegation.kt")
public void testSimpleDelegation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/classHeader/simpleDelegation.kt");