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

Change Class<?> parameter to ClassId in JavaToKotlinClassMap implementations

Browse Source
This commit is contained in:
Alexander Udalov
2015-04-22 04:33:44 +03:00
parent 0dec1eaaad
commit 4b07ec11ea
5 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java
+3 -2
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.resolve.jvm.kotlinSignature;
import com.google.common.collect.ImmutableBiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder;
public class CollectionClassMapping extends JavaToKotlinClassMapBuilder {
@@ -42,13 +43,13 @@ public class CollectionClassMapping extends JavaToKotlinClassMapBuilder {
}
@Override
protected void register(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
protected void register(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
// do nothing
}
@Override
protected void register(
@NotNull Class<?> javaClass,
@NotNull ClassId javaClassId,
@NotNull ClassDescriptor kotlinDescriptor,
@NotNull ClassDescriptor kotlinMutableDescriptor
) {
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java
+5 -16
View File
@@ -21,9 +21,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType;
@@ -71,32 +69,23 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
}
@Override
protected void register(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
protected void register(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) {
register(DescriptorUtils.getFqName(kotlinDescriptor), computeClassId(javaClass));
register(DescriptorUtils.getFqName(kotlinDescriptor), javaClassId);
}
}
@Override
protected void register(
@NotNull Class<?> javaClass,
@NotNull ClassId javaClassId,
@NotNull ClassDescriptor kotlinDescriptor,
@NotNull ClassDescriptor kotlinMutableDescriptor
) {
register(javaClass, kotlinDescriptor, Direction.BOTH);
register(javaClass, kotlinMutableDescriptor, Direction.BOTH);
register(javaClassId, kotlinDescriptor, Direction.BOTH);
register(javaClassId, kotlinMutableDescriptor, Direction.BOTH);
}
private void register(@NotNull FqNameUnsafe kotlinFqName, @NotNull ClassId javaClassId) {
map.put(kotlinFqName, javaClassId);
}
@NotNull
private static ClassId computeClassId(@NotNull Class<?> clazz) {
assert !clazz.isPrimitive() && !clazz.isArray() : "Invalid class: " + clazz;
Class<?> outer = clazz.getDeclaringClass();
return outer == null
? ClassId.topLevel(new FqName(clazz.getCanonicalName()))
: computeClassId(outer).createNestedClassId(Name.identifier(clazz.getSimpleName()));
}
}