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

Evaluate Expression: fix ClassNotFoundException for primitives and arrays

Browse Source
This commit is contained in:
Natalia Selezneva
2018-02-14 13:46:40 +03:00
parent 2f61bd41d5
commit 19e7002d02
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
+13 -12
View File
@@ -89,6 +89,18 @@ class JDIEval(
}
}
fun loadClassByName(name: String, classLoader: ClassLoaderReference): jdi_Type {
val dimensions = name.count { it == '[' }
val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name
val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType(classLoader)
return if (dimensions == 0)
baseType
else
Type.getType("[".repeat(dimensions) + baseType.asType().descriptor).asReferenceType(classLoader)
}
override fun loadString(str: String): Value = vm.mirrorOf(str).asValue()
override fun newInstance(classType: Type): Value {
@@ -413,18 +425,7 @@ class JDIEval(
return argumentTypes()
}
catch (e: ClassNotLoadedException) {
return argumentTypeNames()!!.map {
name ->
val dimensions = name.count { it == '[' }
val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name
val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType(declaringType().classLoader())
if (dimensions == 0)
baseType
else
Type.getType("[".repeat(dimensions) + baseType.asType().descriptor).asReferenceType(declaringType().classLoader())
}
return argumentTypeNames()!!.map { name -> loadClassByName(name, declaringType().classLoader()) }
}
}
}