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

Minor: FakePureImplementationsProvider does not need builtins, just fq names

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-23 17:21:19 +03:00
parent 83503b66d2
commit 0830e48029
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt
+3 -5
View File
@@ -28,11 +28,9 @@ public object FakePureImplementationsProvider {
else -> null
}
private val kotlinBuiltins = KotlinBuiltIns.getInstance()
private val MUTABLE_LIST_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableList())
private val MUTABLE_SET_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableSet())
private val MUTABLE_MAP_FQ_NAME = DescriptorUtils.getFqNameSafe(kotlinBuiltins.getMutableMap())
private val MUTABLE_LIST_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableList
private val MUTABLE_SET_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableSet
private val MUTABLE_MAP_FQ_NAME = KotlinBuiltIns.FQ_NAMES.mutableMap
private val MUTABLE_LISTS_IMPLEMENTATIONS = setOfFqNames("java.util.ArrayList", "java.util.LinkedList")
private val MUTABLE_MAPS_IMPLEMENTATIONS = setOfFqNames(
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+4
View File
@@ -181,6 +181,10 @@ public class KotlinBuiltIns {
public final FqName annotationTarget = annotationName("AnnotationTarget");
public final FqName annotationRetention = annotationName("AnnotationRetention");
public final FqName mutableList = fqName("MutableList");
public final FqName mutableSet = fqName("MutableSet");
public final FqName mutableMap = fqName("MutableMap");
public final FqNameUnsafe kClass = new FqName("kotlin.reflect.KClass").toUnsafe();
public final Map<FqNameUnsafe, PrimitiveType> fqNameToPrimitiveType;