diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.kt index d228bc23e47..c5e25dc11aa 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.kt @@ -77,8 +77,6 @@ class ScriptCodegen private constructor( classBuilder: ClassBuilder, methodContext: MethodContext ) { - val scriptDefinition = scriptContext.script.kotlinScriptDefinition - val jvmSignature = typeMapper.mapScriptSignature( scriptDescriptor, scriptContext.earlierScripts diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptHelperImpl.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptHelperImpl.kt deleted file mode 100644 index 3b311453818..00000000000 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptHelperImpl.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.script - -import org.jetbrains.kotlin.descriptors.ScriptDescriptor -import kotlin.reflect.KClass - -class ScriptHelperImpl : ScriptHelper { - override fun getScriptParameters(kotlinScriptDefinition: KotlinScriptDefinition, scriptDefinition: ScriptDescriptor) = - kotlinScriptDefinition.getScriptParameters(scriptDefinition) - - override fun getKotlinType(scriptDescriptor: ScriptDescriptor, kClass: KClass) = - getKotlinTypeByKClass(scriptDescriptor, kClass) -} \ No newline at end of file diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTypeUtil.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTypeUtil.kt index 849e88403da..76ceebfc944 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTypeUtil.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTypeUtil.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.descriptors.NotFoundClasses import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.findNonGenericClassAcrossDependencies -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.lazy.descriptors.script.classId import org.jetbrains.kotlin.storage.LockBasedStorageManager @@ -29,12 +28,6 @@ import kotlin.reflect.KClass import kotlin.reflect.KType import kotlin.reflect.KTypeProjection import kotlin.reflect.KVariance -import kotlin.reflect.full.primaryConstructor - -fun KotlinScriptDefinition.getScriptParameters(scriptDescriptor: ScriptDescriptor): List = - template.primaryConstructor?.parameters - ?.map { ScriptParameter(Name.identifier(it.name!!), getKotlinTypeByKType(scriptDescriptor, it.type)) } - ?: emptyList() fun getKotlinTypeByKClass(scriptDescriptor: ScriptDescriptor, kClass: KClass): KotlinType = scriptDescriptor.module.findNonGenericClassAcrossDependencies( diff --git a/compiler/psi/src/org/jetbrains/kotlin/script/ScriptHelper.kt b/compiler/psi/src/org/jetbrains/kotlin/script/ScriptHelper.kt deleted file mode 100644 index c9f592126f5..00000000000 --- a/compiler/psi/src/org/jetbrains/kotlin/script/ScriptHelper.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.script - -import org.jetbrains.kotlin.descriptors.ScriptDescriptor -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.types.KotlinType -import java.util.* -import kotlin.reflect.KClass - -data class ScriptParameter(val name: Name, val type: KotlinType) - -interface ScriptHelper { - fun getScriptParameters(kotlinScriptDefinition: KotlinScriptDefinition, scriptDefinition: ScriptDescriptor): List - fun getKotlinType(scriptDescriptor: ScriptDescriptor, kClass: KClass): KotlinType - - companion object { - private val scriptHelperInstance: ScriptHelper = - ServiceLoader.load(ScriptHelper::class.java, ScriptHelper::class.java.classLoader).firstOrNull() - ?: error("ScriptHelper implementation is not found") - - fun getInstance(): ScriptHelper = scriptHelperInstance - } -}