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

Minor: simplify code

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-26 18:24:19 +03:00
parent d2fc7c7fd3
commit c73ac97ecf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.kt
+2 -4
View File
@@ -56,13 +56,11 @@ public abstract class BaseDescriptorLoader protected(
return findKotlinClassByDescriptor(container.getContainingDeclaration() as ClassOrPackageFragmentDescriptor) return findKotlinClassByDescriptor(container.getContainingDeclaration() as ClassOrPackageFragmentDescriptor)
} }
else if (isTrait(container) && kind == AnnotatedCallableKind.PROPERTY) { else if (isTrait(container) && kind == AnnotatedCallableKind.PROPERTY) {
val containingPackage = DescriptorUtils.getParentOfType<PackageFragmentDescriptor>(container, javaClass<PackageFragmentDescriptor>())
.sure("Trait must have a package fragment among his parents: " + container)
if (proto.hasExtension(implClassName)) { if (proto.hasExtension(implClassName)) {
val packageFqName = getClassId(container as ClassDescriptor).getPackageFqName()
val tImplName = nameResolver.getName(proto.getExtension(implClassName)) val tImplName = nameResolver.getName(proto.getExtension(implClassName))
// TODO: store accurate name for nested traits // TODO: store accurate name for nested traits
return kotlinClassFinder.findKotlinClass(ClassId(containingPackage.fqName, tImplName)) return kotlinClassFinder.findKotlinClass(ClassId(packageFqName, tImplName))
} }
return null return null
} }