Allow to use "static" part of class in own constructors by short name, including in primary constructor

2015-12-08 20:57:45 +03:00
parent f319b1b93a
commit 5bf8b4d946
30 changed files with 1017 additions and 25 deletions
@@ -404,9 +404,9 @@ public class ResolveElementCache(
        bodyResolver.resolveDelegationSpecifierList(DataFlowInfo.EMPTY,
                                                    classOrObject,
                                                    descriptor,
-                                                    descriptor.getUnsubstitutedPrimaryConstructor(),
-                                                    descriptor.getScopeForClassHeaderResolution(),
-                                                    descriptor.getScopeForMemberDeclarationResolution())
+                                                    descriptor.unsubstitutedPrimaryConstructor,
+                                                    descriptor.scopeForConstructorHeaderResolution,
+                                                    descriptor.scopeForMemberDeclarationResolution)

        return trace
    }