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

Refactoring: extract class for parameter in debugger

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-06-15 13:50:30 +03:00
parent 346ea28337
commit 9a09a25df5
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt
+7 -6
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.apache.log4j.Logger import org.apache.log4j.Logger
import org.jetbrains.eval4j.Value
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
class KotlinEvaluateExpressionCache(val project: Project) { class KotlinEvaluateExpressionCache(val project: Project) {
@@ -92,15 +93,15 @@ class KotlinEvaluateExpressionCache(val project: Project) {
val parameters: ParametersDescriptor val parameters: ParametersDescriptor
) )
class ParametersDescriptor : Iterable<Pair<String, JetType>> { class ParametersDescriptor : Iterable<Parameter> {
private val list = ArrayList<Pair<String, JetType>>() private val list = ArrayList<Parameter>()
fun add(name: String, jetType: JetType) { fun add(name: String, jetType: JetType, value: Value? = null) {
list.add(name to jetType) list.add(Parameter(name, jetType, value))
} }
fun getParameterNames() = list.map { it.first }
override fun iterator() = list.iterator() override fun iterator() = list.iterator()
} }
data class Parameter(val callText: String, val type: JetType, val value: Value? = null)
} }
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+7 -6
View File
@@ -217,7 +217,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<out String>?): MethodVisitor? { override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<out String>?): MethodVisitor? {
if (name == compiledData.funName) { if (name == compiledData.funName) {
val argumentTypes = Type.getArgumentTypes(desc) val argumentTypes = Type.getArgumentTypes(desc)
val args = context.getArgumentsForEval4j(compiledData.parameters.getParameterNames(), argumentTypes) val args = context.getArgumentsForEval4j(compiledData.parameters, argumentTypes)
return object : MethodNode(Opcodes.ASM5, access, name, desc, signature, exceptions) { return object : MethodNode(Opcodes.ASM5, access, name, desc, signature, exceptions) {
override fun visitEnd() { override fun visitEnd() {
@@ -307,9 +307,11 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
} }
} }
private fun EvaluationContextImpl.getArgumentsForEval4j(parameterNames: List<String>, parameterTypes: Array<Type>): List<Value> { private fun EvaluationContextImpl.getArgumentsForEval4j(parameters: ParametersDescriptor, parameterTypes: Array<Type>): List<Value> {
val frameVisitor = FrameVisitor(this) val frameVisitor = FrameVisitor(this)
return parameterNames.zip(parameterTypes).map { frameVisitor.findValue(it.first, it.second, checkType = false, failIfNotFound = true)!! } return parameters.zip(parameterTypes).map {
frameVisitor.findValue(it.first.callText, it.second, checkType = false, failIfNotFound = true)!!
}
} }
private fun createClassFileFactory( private fun createClassFileFactory(
@@ -353,9 +355,8 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
val valueParameters = extractedFunction.getValueParameters() val valueParameters = extractedFunction.getValueParameters()
var paramIndex = 0 var paramIndex = 0
for (param in parameters) { for (param in parameters) {
val (callText, type) = param
if (callText.contains(THIS_NAME)) continue if (param.callText.contains(THIS_NAME)) continue
val valueParameter = valueParameters[paramIndex++] val valueParameter = valueParameters[paramIndex++]
@@ -368,7 +369,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
exception("An exception occurs during Evaluate Expression Action") exception("An exception occurs during Evaluate Expression Action")
} }
state.getBindingTrace().recordAnonymousType(paramRef, callText, frameVisitor) state.getBindingTrace().recordAnonymousType(paramRef, param.callText, frameVisitor)
} }
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION) KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION)