MemberDescriptor ancestor extracted to ClassifierDescriptorWithTypeParameters

core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.types.TypeSubstitutor;
 import java.util.Collection;
 import java.util.List;
 
-public interface ClassDescriptor extends ClassifierDescriptorWithTypeParameters, MemberDescriptor, ClassOrPackageFragmentDescriptor {
+public interface ClassDescriptor extends ClassifierDescriptorWithTypeParameters, ClassOrPackageFragmentDescriptor {
     @NotNull
     MemberScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments);
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java

@@ -21,7 +21,8 @@ import org.jetbrains.annotations.ReadOnly;
 
 import java.util.List;
 
-public interface ClassifierDescriptorWithTypeParameters extends ClassifierDescriptor, DeclarationDescriptorWithVisibility {
+public interface ClassifierDescriptorWithTypeParameters
+        extends ClassifierDescriptor, DeclarationDescriptorWithVisibility, MemberDescriptor {
     /**
      * @return <code>true</code> if this class contains a reference to its outer class (as opposed to static nested class)
      */

core/descriptors/src/org/jetbrains/kotlin/descriptors/TypeAliasDescriptor.kt

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors
 import org.jetbrains.kotlin.types.SimpleType
 import org.jetbrains.kotlin.types.TypeSubstitutor
 
-interface TypeAliasDescriptor : ClassifierDescriptorWithTypeParameters, MemberDescriptor {
+interface TypeAliasDescriptor : ClassifierDescriptorWithTypeParameters {
     /// Right-hand side of the type alias definition.
     /// May contain type aliases.
     val underlyingType: SimpleType