Add basic bindings support to IDEA JSR223 scripting, fix evaluator

2016-09-23 15:37:36 +02:00
parent bdaaf4fb09
commit bf0d5b6237
4 changed files with 37 additions and 7 deletions
@@ -57,7 +57,7 @@ open class GenericReplCompiledEvaluator(baseClasspath: Iterable<File>, baseClass
                (compiledLoadedClassesHistory.map { it.second.klass } +
                 (scriptArgs?.asIterable()
                          ?.mapIndexed { i, it ->
-                              it?.javaClass ?: if (i < (scriptArgsTypes?.size ?: 0)) scriptArgsTypes!![i] else Any::class.java
+                              if (i < (scriptArgsTypes?.size ?: 0)) scriptArgsTypes!![i] else it?.javaClass ?: Any::class.java
                          }
                  ?: emptyList()
                 )