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

MemberDescriptor ancestor extracted to ClassifierDescriptorWithTypeParameters

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-16 18:08:06 +03:00
parent 5947d49dee
commit b363d34fd7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.types.TypeSubstitutor;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
public interface ClassDescriptor extends ClassifierDescriptorWithTypeParameters, MemberDescriptor, ClassOrPackageFragmentDescriptor { public interface ClassDescriptor extends ClassifierDescriptorWithTypeParameters, ClassOrPackageFragmentDescriptor {
@NotNull @NotNull
MemberScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments); MemberScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments);
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java
+2 -1
View File
@@ -21,7 +21,8 @@ import org.jetbrains.annotations.ReadOnly;
import java.util.List; 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) * @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
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors
import org.jetbrains.kotlin.types.SimpleType import org.jetbrains.kotlin.types.SimpleType
import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.TypeSubstitutor
interface TypeAliasDescriptor : ClassifierDescriptorWithTypeParameters, MemberDescriptor { interface TypeAliasDescriptor : ClassifierDescriptorWithTypeParameters {
/// Right-hand side of the type alias definition. /// Right-hand side of the type alias definition.
/// May contain type aliases. /// May contain type aliases.
val underlyingType: SimpleType val underlyingType: SimpleType