getTypeConstructor() pushed back down
This commit is contained in:
@@ -29,7 +29,6 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
public abstract class ClassDescriptorBase implements ClassDescriptor {
|
public abstract class ClassDescriptorBase implements ClassDescriptor {
|
||||||
|
|
||||||
protected TypeConstructor typeConstructor;
|
|
||||||
protected JetType defaultType;
|
protected JetType defaultType;
|
||||||
|
|
||||||
protected abstract JetScope getScopeForMemberLookup();
|
protected abstract JetScope getScopeForMemberLookup();
|
||||||
@@ -59,12 +58,6 @@ public abstract class ClassDescriptorBase implements ClassDescriptor {
|
|||||||
return new LazySubstitutingClassDescriptor(this, substitutor);
|
return new LazySubstitutingClassDescriptor(this, substitutor);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public TypeConstructor getTypeConstructor() {
|
|
||||||
return typeConstructor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public JetType getDefaultType() {
|
public JetType getDefaultType() {
|
||||||
|
|||||||
+8
@@ -46,6 +46,8 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
|
|||||||
private List<TypeParameterDescriptor> typeParameters;
|
private List<TypeParameterDescriptor> typeParameters;
|
||||||
private Collection<JetType> supertypes = Lists.newArrayList();
|
private Collection<JetType> supertypes = Lists.newArrayList();
|
||||||
|
|
||||||
|
private TypeConstructor typeConstructor;
|
||||||
|
|
||||||
private Modality modality;
|
private Modality modality;
|
||||||
private Visibility visibility;
|
private Visibility visibility;
|
||||||
|
|
||||||
@@ -113,6 +115,12 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public TypeConstructor getTypeConstructor() {
|
||||||
|
return typeConstructor;
|
||||||
|
}
|
||||||
|
|
||||||
public void setScopeForMemberLookup(JetScope scopeForMemberLookup) {
|
public void setScopeForMemberLookup(JetScope scopeForMemberLookup) {
|
||||||
this.scopeForMemberLookup = scopeForMemberLookup;
|
this.scopeForMemberLookup = scopeForMemberLookup;
|
||||||
this.innerClassesScope = new InnerClassesScopeWrapper(scopeForMemberLookup);
|
this.innerClassesScope = new InnerClassesScopeWrapper(scopeForMemberLookup);
|
||||||
|
|||||||
Reference in New Issue
Block a user