From a657a1925359bd7b07b830fb3e46d4d24719a2de Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 7 Nov 2012 15:32:34 +0400 Subject: [PATCH] Fix TypeConstructor#getSupertypes() return type --- .../jet/lang/resolve/java/DescriptorResolverUtils.java | 3 ++- .../src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java | 2 +- .../jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java | 2 +- .../jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java | 2 +- .../jetbrains/jet/lang/types/IntersectionTypeConstructor.java | 2 +- .../src/org/jetbrains/jet/lang/types/TypeConstructor.java | 2 +- .../lang/types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../src/org/jetbrains/jet/resolve/DescriptorRenderer.java | 4 ++-- .../jet/plugin/codeInsight/GotoSuperActionHandler.java | 2 +- .../jetbrains/k2js/translate/declaration/ClassTranslator.java | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java index f9103e9e371..cf31283f461 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java @@ -60,7 +60,8 @@ public final class DescriptorResolverUtils { return kind == ClassKind.CLASS || kind == ClassKind.TRAIT || kind == ClassKind.ENUM_CLASS; } - public static Collection getSupertypes(@NotNull ClassOrNamespaceDescriptor classOrNamespaceDescriptor) { + @NotNull + public static Collection getSupertypes(@NotNull ClassOrNamespaceDescriptor classOrNamespaceDescriptor) { if (classOrNamespaceDescriptor instanceof ClassDescriptor) { return ((ClassDescriptor) classOrNamespaceDescriptor).getTypeConstructor().getSupertypes(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 0550a792f63..17ed36689b2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -259,7 +259,7 @@ public class DescriptorUtils { @NotNull public static List getSuperclassDescriptors(@NotNull ClassDescriptor classDescriptor) { - Collection superclassTypes = classDescriptor.getTypeConstructor().getSupertypes(); + Collection superclassTypes = classDescriptor.getTypeConstructor().getSupertypes(); List superClassDescriptors = new ArrayList(); for (JetType type : superclassTypes) { ClassDescriptor result = getClassDescriptorForType(type); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java index a9a2fcb1783..538d168814f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java @@ -346,7 +346,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc @NotNull @Override - public Collection getSupertypes() { + public Collection getSupertypes() { if (supertypes == null) { if (resolveSession.isClassSpecial(DescriptorUtils.getFQName(LazyClassDescriptor.this))) { this.supertypes = Collections.emptyList(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java index f4960abbb93..cd5be43d18b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java @@ -180,7 +180,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor, Laz typeConstructor = new TypeConstructor() { @NotNull @Override - public Collection getSupertypes() { + public Collection getSupertypes() { return LazyTypeParameterDescriptor.this.getUpperBounds(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java index 2a9136302ae..9dcc0c6f8c8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java @@ -47,7 +47,7 @@ public class IntersectionTypeConstructor extends AnnotatedImpl implements TypeCo @NotNull @Override - public Collection getSupertypes() { + public Collection getSupertypes() { return intersectedTypes; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java index 26e88ce00ec..839ae421c5e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java @@ -33,7 +33,7 @@ public interface TypeConstructor extends Annotated { List getParameters(); @NotNull - Collection getSupertypes(); + Collection getSupertypes(); boolean isSealed(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 0d1b313db07..7f503d413c7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -445,7 +445,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { ) { JetType result = null; JetType thisType = thisReceiver.getType(); - Collection supertypes = thisType.getConstructor().getSupertypes(); + Collection supertypes = thisType.getConstructor().getSupertypes(); TypeSubstitutor substitutor = TypeSubstitutor.create(thisType); JetTypeReference superTypeQualifier = expression.getSuperTypeQualifier(); diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java index 1af27e0c1f9..cdb9d911ba5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java @@ -611,12 +611,12 @@ public class DescriptorRenderer implements Renderer { renderTypeParameters(descriptor.getTypeConstructor().getParameters(), builder); } if (!descriptor.equals(KotlinBuiltIns.getInstance().getNothing())) { - Collection supertypes = descriptor.getTypeConstructor().getSupertypes(); + Collection supertypes = descriptor.getTypeConstructor().getSupertypes(); if (supertypes.isEmpty() || supertypes.size() == 1 && KotlinBuiltIns.getInstance().isAny(supertypes.iterator().next())) { } else { builder.append(" : "); - for (Iterator iterator = supertypes.iterator(); iterator.hasNext(); ) { + for (Iterator iterator = supertypes.iterator(); iterator.hasNext(); ) { JetType supertype = iterator.next(); builder.append(renderType(supertype)); if (iterator.hasNext()) { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index b6dbe8d098e..feb26d3cedd 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -67,7 +67,7 @@ public class GotoSuperActionHandler implements CodeInsightActionHandler { Collection superDescriptors; String message; if (descriptor instanceof ClassDescriptor) { - Collection supertypes = ((ClassDescriptor) descriptor).getTypeConstructor().getSupertypes(); + Collection supertypes = ((ClassDescriptor) descriptor).getTypeConstructor().getSupertypes(); List superclasses = ContainerUtil.mapNotNull(supertypes, new Function() { @Override public ClassDescriptor fun(JetType type) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java index c9788084588..f25c3de81ba 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java @@ -182,7 +182,7 @@ public final class ClassTranslator extends AbstractTranslator { @NotNull private List getSupertypesNameReferences() { - Collection supertypes = descriptor.getTypeConstructor().getSupertypes(); + Collection supertypes = descriptor.getTypeConstructor().getSupertypes(); if (supertypes.isEmpty()) { return Collections.emptyList(); }