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

Minor, refine return type of AbstractClassTypeConstructor.getDeclarationDescriptor

Browse Source
This commit is contained in:
Alexander Udalov
2017-10-13 20:13:02 +02:00
parent dc02b2e3ab
commit 0a861fd4ed
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt
+1 -1
View File
@@ -116,7 +116,7 @@ class SyntheticClassOrObjectDescriptor(
override fun getParameters(): List<TypeParameterDescriptor> = emptyList() override fun getParameters(): List<TypeParameterDescriptor> = emptyList()
override fun isFinal(): Boolean = true override fun isFinal(): Boolean = true
override fun isDenotable(): Boolean = true override fun isDenotable(): Boolean = true
override fun getDeclarationDescriptor(): ClassifierDescriptor = thisDescriptor override fun getDeclarationDescriptor(): ClassDescriptor = thisDescriptor
override fun computeSupertypes(): Collection<KotlinType> = syntheticSupertypes override fun computeSupertypes(): Collection<KotlinType> = syntheticSupertypes
override val supertypeLoopChecker: SupertypeLoopChecker = SupertypeLoopChecker.EMPTY override val supertypeLoopChecker: SupertypeLoopChecker = SupertypeLoopChecker.EMPTY
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -1
View File
@@ -662,7 +662,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
@Override @Override
@NotNull @NotNull
public ClassifierDescriptor getDeclarationDescriptor() { public ClassDescriptor getDeclarationDescriptor() {
return LazyClassDescriptor.this; return LazyClassDescriptor.this;
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+2 -2
View File
@@ -257,9 +257,9 @@ class LazyJavaClassDescriptor(
override fun isFinal(): Boolean = isFinalClass override fun isFinal(): Boolean = isFinalClass
override fun isDenotable() = true override fun isDenotable(): Boolean = true
override fun getDeclarationDescriptor() = this@LazyJavaClassDescriptor override fun getDeclarationDescriptor(): ClassDescriptor = this@LazyJavaClassDescriptor
override fun toString(): String = name.asString() override fun toString(): String = name.asString()
} }
core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java
+3 -3
View File
@@ -39,7 +39,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
if (currentHashCode != 0) return currentHashCode; if (currentHashCode != 0) return currentHashCode;
ClassifierDescriptor descriptor = getDeclarationDescriptor(); ClassifierDescriptor descriptor = getDeclarationDescriptor();
if (descriptor instanceof ClassDescriptor && hasMeaningfulFqName(descriptor)) { if (hasMeaningfulFqName(descriptor)) {
currentHashCode = DescriptorUtils.getFqName(descriptor).hashCode(); currentHashCode = DescriptorUtils.getFqName(descriptor).hashCode();
} }
else { else {
@@ -51,7 +51,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
@NotNull @NotNull
@Override @Override
public abstract ClassifierDescriptor getDeclarationDescriptor(); public abstract ClassDescriptor getDeclarationDescriptor();
@NotNull @NotNull
@Override @Override
@@ -81,7 +81,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
return false; return false;
} }
if (myDescriptor instanceof ClassDescriptor && otherDescriptor instanceof ClassDescriptor) { if (otherDescriptor instanceof ClassDescriptor) {
return areFqNamesEqual(((ClassDescriptor) myDescriptor), ((ClassDescriptor) otherDescriptor)); return areFqNamesEqual(((ClassDescriptor) myDescriptor), ((ClassDescriptor) otherDescriptor));
} }