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

Fix TypeConstructor#getSupertypes() return type

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-07 15:32:34 +04:00
parent daf9c6f2c1
commit a657a19253
10 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java
+2 -1
View File
@@ -60,7 +60,8 @@ public final class DescriptorResolverUtils {
return kind == ClassKind.CLASS || kind == ClassKind.TRAIT || kind == ClassKind.ENUM_CLASS;
}
public static Collection<? extends JetType> getSupertypes(@NotNull ClassOrNamespaceDescriptor classOrNamespaceDescriptor) {
@NotNull
public static Collection<JetType> getSupertypes(@NotNull ClassOrNamespaceDescriptor classOrNamespaceDescriptor) {
if (classOrNamespaceDescriptor instanceof ClassDescriptor) {
return ((ClassDescriptor) classOrNamespaceDescriptor).getTypeConstructor().getSupertypes();
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+1 -1
View File
@@ -259,7 +259,7 @@ public class DescriptorUtils {
@NotNull
public static List<ClassDescriptor> getSuperclassDescriptors(@NotNull ClassDescriptor classDescriptor) {
Collection<? extends JetType> superclassTypes = classDescriptor.getTypeConstructor().getSupertypes();
Collection<JetType> superclassTypes = classDescriptor.getTypeConstructor().getSupertypes();
List<ClassDescriptor> superClassDescriptors = new ArrayList<ClassDescriptor>();
for (JetType type : superclassTypes) {
ClassDescriptor result = getClassDescriptorForType(type);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
+1 -1
View File
@@ -346,7 +346,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
@NotNull
@Override
public Collection<? extends JetType> getSupertypes() {
public Collection<JetType> getSupertypes() {
if (supertypes == null) {
if (resolveSession.isClassSpecial(DescriptorUtils.getFQName(LazyClassDescriptor.this))) {
this.supertypes = Collections.emptyList();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor, Laz
typeConstructor = new TypeConstructor() {
@NotNull
@Override
public Collection<? extends JetType> getSupertypes() {
public Collection<JetType> getSupertypes() {
return LazyTypeParameterDescriptor.this.getUpperBounds();
}
compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class IntersectionTypeConstructor extends AnnotatedImpl implements TypeCo
@NotNull
@Override
public Collection<? extends JetType> getSupertypes() {
public Collection<JetType> getSupertypes() {
return intersectedTypes;
}
compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java
+1 -1
View File
@@ -33,7 +33,7 @@ public interface TypeConstructor extends Annotated {
List<TypeParameterDescriptor> getParameters();
@NotNull
Collection<? extends JetType> getSupertypes();
Collection<JetType> getSupertypes();
boolean isSealed();
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+1 -1
View File
@@ -445,7 +445,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
) {
JetType result = null;
JetType thisType = thisReceiver.getType();
Collection<? extends JetType> supertypes = thisType.getConstructor().getSupertypes();
Collection<JetType> supertypes = thisType.getConstructor().getSupertypes();
TypeSubstitutor substitutor = TypeSubstitutor.create(thisType);
JetTypeReference superTypeQualifier = expression.getSuperTypeQualifier();
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+2 -2
View File
@@ -611,12 +611,12 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
renderTypeParameters(descriptor.getTypeConstructor().getParameters(), builder);
}
if (!descriptor.equals(KotlinBuiltIns.getInstance().getNothing())) {
Collection<? extends JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
Collection<JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
if (supertypes.isEmpty() || supertypes.size() == 1 && KotlinBuiltIns.getInstance().isAny(supertypes.iterator().next())) {
}
else {
builder.append(" : ");
for (Iterator<? extends JetType> iterator = supertypes.iterator(); iterator.hasNext(); ) {
for (Iterator<JetType> iterator = supertypes.iterator(); iterator.hasNext(); ) {
JetType supertype = iterator.next();
builder.append(renderType(supertype));
if (iterator.hasNext()) {
idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class GotoSuperActionHandler implements CodeInsightActionHandler {
Collection<? extends DeclarationDescriptor> superDescriptors;
String message;
if (descriptor instanceof ClassDescriptor) {
Collection<? extends JetType> supertypes = ((ClassDescriptor) descriptor).getTypeConstructor().getSupertypes();
Collection<JetType> supertypes = ((ClassDescriptor) descriptor).getTypeConstructor().getSupertypes();
List<ClassDescriptor> superclasses = ContainerUtil.mapNotNull(supertypes, new Function<JetType, ClassDescriptor>() {
@Override
public ClassDescriptor fun(JetType type) {
js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+1 -1
View File
@@ -182,7 +182,7 @@ public final class ClassTranslator extends AbstractTranslator {
@NotNull
private List<JsExpression> getSupertypesNameReferences() {
Collection<? extends JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
Collection<JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
if (supertypes.isEmpty()) {
return Collections.emptyList();
}