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

Variance checker: add check for nested local / anonymous classes

Browse Source 
So #KT-16136 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-04-21 16:12:18 +03:00
committed by Mikhail Glukhikh
parent 9dd217eee3
commit b66401a41d
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
+3
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
import org.jetbrains.kotlin.resolve.source.getPsi
import org.jetbrains.kotlin.resolve.typeBinding.TypeBinding
import org.jetbrains.kotlin.resolve.typeBinding.createTypeBinding
@@ -64,6 +65,7 @@ class VarianceCheckerCore(
fun checkClassOrObject(klass: KtClassOrObject): Boolean {
if (klass is KtClass) {
if (!checkClassHeader(klass)) return false
if (klass.getSuperTypeList()?.anyDescendantOfType<KtClassOrObject> { !checkClassOrObject(it) } == true) return false
}
for (member in klass.declarations + klass.primaryConstructorParameters) {
val descriptor = when (member) {
@@ -77,6 +79,7 @@ class VarianceCheckerCore(
}
is KtCallableDeclaration -> {
if (descriptor is CallableMemberDescriptor && !checkMember(member, descriptor)) return false
if (member.anyDescendantOfType<KtClassOrObject> { !checkClassOrObject(it) }) return false
}
}
}