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

Minor, use another constructor of ClassId

Browse Source
This commit is contained in:
Alexander Udalov
2014-09-16 11:32:45 +04:00
parent b0539ac7a4
commit ed92eb1d17
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java
+1 -2
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.java;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.descriptors.serialization.ClassId;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
public final class PackageClassUtils {
@@ -50,7 +49,7 @@ public final class PackageClassUtils {
@NotNull
public static ClassId getPackageClassId(@NotNull FqName packageFQN) {
return new ClassId(packageFQN, FqNameUnsafe.topLevel(Name.identifier(getPackageClassName(packageFQN))));
return new ClassId(packageFQN, Name.identifier(getPackageClassName(packageFQN)));
}
@NotNull
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
+1 -1
View File
@@ -93,7 +93,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> {
name ->
val classId = ClassId(packageFragment.fqName, FqNameUnsafe.topLevel(SpecialNames.safeIdentifier(name)))
val classId = ClassId(packageFragment.fqName, SpecialNames.safeIdentifier(name))
val (jClass, kClass) = c.findClassInJava(classId)
if (kClass != null)
kClass
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class DeserializedResolverUtils {
public static ClassId getClassId(@NotNull ClassDescriptor descriptor) {
DeclarationDescriptor owner = descriptor.getContainingDeclaration();
if (owner instanceof PackageFragmentDescriptor) {
return new ClassId(((PackageFragmentDescriptor) owner).getFqName(), FqNameUnsafe.topLevel(descriptor.getName()));
return new ClassId(((PackageFragmentDescriptor) owner).getFqName(), descriptor.getName());
}
return getClassId((ClassDescriptor) owner).createNestedClassId(descriptor.getName());
}