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

Remove reference to KotlinBuiltIns from CompanionObjectMapping

Browse Source 
Make it a class
This commit is contained in:
Pavel V. Talanov
2015-09-16 15:56:42 +03:00
parent d2a4235dd8
commit 424d71e964
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt
+4 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects
import com.google.dart.compiler.backend.js.ast.JsArrayAccess
import com.google.dart.compiler.backend.js.ast.JsExpression
import org.jetbrains.kotlin.builtins.CompanionObjectMapping
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
import org.jetbrains.kotlin.js.translate.context.TranslationContext
@@ -36,8 +37,10 @@ class DefaultClassObjectIntrinsic(val fqName: FqName, val moduleName: String): O
}
public class ObjectIntrinsics {
private val companionObjectMapping = CompanionObjectMapping(KotlinBuiltIns.getInstance())
public fun getIntrinsic(classDescriptor: ClassDescriptor): ObjectIntrinsic {
if (!CompanionObjectMapping.hasMappingToObject(classDescriptor)) return NO_OBJECT_INTRINSIC
if (!companionObjectMapping.hasMappingToObject(classDescriptor)) return NO_OBJECT_INTRINSIC
val containingDeclaration = classDescriptor.getContainingDeclaration()
val name = Name.identifier(containingDeclaration.getName().asString() + "CompanionObject")