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

[NI] Fix substitution for receiver when resolving constructor super call

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2018-01-21 01:32:31 +03:00
parent 2a0bb68e1c
commit 0e31162df4
6 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/generics/innerClasses/bareTypesComplex.kt
Vendored
+1 -2
View File
@@ -1,10 +1,9 @@
// !WITH_NEW_INFERENCE
open class SuperOuter<E> {
inner open class SuperInner<F>
}
class DerivedOuter<G> : SuperOuter<G>() {
inner class DerivedInner<H> : SuperOuter<G>.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>SuperInner<!><H>()
inner class DerivedInner<H> : SuperOuter<G>.SuperInner<H>()
}
fun bare(x: SuperOuter<*>.SuperInner<*>, y: Any?) {
compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/secondLevelDepth.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !WITH_NEW_INFERENCE
// !CHECK_TYPE
open class Outer<E> {
inner open class Inner<F> {
@@ -9,7 +8,7 @@ open class Outer<E> {
}
class DerivedOuter : Outer<String>() {
inner class DerivedInner : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>Inner<!><Int>() {
inner class DerivedInner : Inner<Int>() {
fun foo(): Inner2<Char> = null!!
}
}
compiler/testData/diagnostics/tests/generics/innerClasses/innerSuperCall.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !WITH_NEW_INFERENCE
open class Super<T> {
inner open class Inner {
}
@@ -6,5 +5,5 @@ open class Super<T> {
class Sub : Super<String>() {
// TODO: it would be nice to have a possibility to omit explicit type argument in supertype
inner class SubInner : Super<String>.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>Inner<!>() {}
inner class SubInner : Super<String>.Inner() {}
}
compiler/testData/diagnostics/tests/generics/innerClasses/innerSuperCallSecondary.kt
Vendored
+2 -3
View File
@@ -1,4 +1,3 @@
// !WITH_NEW_INFERENCE
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class Super<T> {
inner open class Inner {
@@ -7,7 +6,7 @@ open class Super<T> {
class Sub : Super<String>() {
inner class SubInner : Super<String>.Inner {
constructor()<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!><!>
constructor(x: Int) : <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>super<!>() {}
constructor()
constructor(x: Int) : super() {}
}
}
compiler/testData/diagnostics/tests/generics/innerClasses/kt3357.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// !WITH_NEW_INFERENCE
// !DIAGNOSTICS: -UNUSED_VARIABLE
open class Super<T> {
@@ -8,7 +7,7 @@ open class Super<T> {
}
class Sub<T1>(): Super<T1>() {
inner class SubInner : Super<T1>.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>Inner<!>() { // 'Inner' is unresolved
inner class SubInner : Super<T1>.Inner() { // 'Inner' is unresolved
// Also, T1 is not resolved to anything, and not marked as resolved
init {
val x: Super<T1>.Inner = this // T1 is not resolved to anything