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

This commit is contained in:
Zalim Bashorov
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
}
@@ -4,7 +4,7 @@ interface I {
val p: CCCC.Nested
}
class CCCC(override val p: CCCC.Nested<caret>val x: Int) : I {
class CCCC(override val p: Nested<caret>val x: Int) : I {
interface Nested
}
@@ -2,6 +2,8 @@ package ppp
import ppp.Base.Nested
class Base(p: Nested) {
fun foo(p: Nested) {}
class Base {
class Nested
}
@@ -2,6 +2,8 @@ package ppp
import ppp.Base.Nested
class Base(p: Nested) {
fun foo(p: Nested) {}
class Base {
class Nested
}