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

Get rid of assumption that primary ctr is a child of JetClass

Browse Source 
As it can be contained within JetObjectDeclaration
This commit is contained in:
Denis Zharkov
2015-05-27 16:05:09 +03:00
parent 71b5cd692b
commit c054dc19e3
11 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+2 -2
View File
@@ -76,8 +76,8 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
is JetNamedFunction ->
addCorrespondingParameterDescriptor(getDescriptor(declaringElement, resolveSession) as FunctionDescriptor, parameter)
is JetPrimaryConstructor -> {
val jetClass: JetClass = declaringElement.getContainingClass()
val classDescriptor = getDescriptor(jetClass, resolveSession) as ClassDescriptor
val jetClassOrObject: JetClassOrObject = declaringElement.getContainingClassOrObject()
val classDescriptor = getDescriptor(jetClassOrObject, resolveSession) as ClassDescriptor
addCorrespondingParameterDescriptor(classDescriptor.getUnsubstitutedPrimaryConstructor(), parameter)
}
else -> super.visitParameter(parameter)