Minor, extracted TypeUtils.isTypeParameter

2014-10-02 18:22:13 +04:00
parent b09684024b
commit 8e3f87abaf
2 changed files with 15 additions and 7 deletions
@@ -434,7 +434,7 @@ public class TypeUtils {
        if (TypesPackage.isFlexible(type) && isNullableType(TypesPackage.flexibility(type).getUpperBound())) {
            return true;
        }
-        if (type.getConstructor().getDeclarationDescriptor() instanceof TypeParameterDescriptor) {
+        if (isTypeParameter(type)) {
            return hasNullableSuperType(type);
        }
        return false;
@@ -720,6 +720,18 @@ public class TypeUtils {
        });
    }

+    public static boolean isTypeParameter(@NotNull JetType type) {
+        return getTypeParameterDescriptorOrNull(type) != null;
+    }
+
+    @Nullable
+    public static TypeParameterDescriptor getTypeParameterDescriptorOrNull(@NotNull JetType type) {
+        if (type.getConstructor().getDeclarationDescriptor() instanceof TypeParameterDescriptor) {
+            return (TypeParameterDescriptor) type.getConstructor().getDeclarationDescriptor();
+        }
+        return null;
+    }
+
    private static abstract class AbstractTypeWithKnownNullability extends AbstractJetType {
        private final JetType delegate;