Restore infer type functionality in runtime plugin

Author: ligee

kshell/src/main/kotlin/com/github/khud/sparklin/kshell/KShell.kt

@@ -5,7 +5,6 @@ import com.github.khud.sparklin.kshell.configuration.IntConverter
 import com.github.khud.sparklin.kshell.configuration.ReplConfiguration
 import com.github.khud.sparklin.kshell.wrappers.ResultWrapper
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
 import org.jetbrains.kotlin.scripting.ide_services.compiler.KJvmReplCompilerWithIdeServices
 import org.jline.reader.EndOfFileException
 import org.jline.reader.LineReader
@@ -14,6 +13,7 @@ import org.jline.reader.UserInterruptException
 import org.jline.terminal.Terminal
 import org.jline.terminal.TerminalBuilder
 import java.io.File
+import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -87,8 +87,6 @@ open class KShell(val replConfiguration: ReplConfiguration,
     fun initEngine() {
         replConfiguration.load()
 
-        setIdeaIoUseFallback()
-
         settings = Settings(replConfiguration)
 
         val term = if (settings.overrideSignals) {
@@ -189,10 +187,14 @@ open class KShell(val replConfiguration: ReplConfiguration,
 
     private fun nextLine(code: String) = code.toScriptSource("Line_${currentSnippetNo.incrementAndGet()}.${compilationConfiguration[ScriptCompilationConfiguration.fileExtension]}")
 
+    private fun tempLine(code: String) = code.toScriptSource("\$\$tempLine_${UUID.randomUUID()}.${compilationConfiguration[ScriptCompilationConfiguration.fileExtension]}")
+
     suspend fun compile(code: String) = compiler.compile(nextLine(code), compilationConfiguration)
 
     fun compile(code: SourceCode) = runBlocking { compiler.compile(code, compilationConfiguration) }
 
+    fun analyze(code: String, pos: SourceCode.Position) = runBlocking { compiler.analyze(tempLine(code), pos, compilationConfiguration) }
+
     fun eval(source: String): ResultWrapper {
         return if (settings.overrideSignals) {
             evalThread.apply {

kshell/src/main/kotlin/com/github/khud/sparklin/kshell/plugins/RuntimePlugin.kt

@@ -14,8 +14,7 @@ import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.full.valueParameters
 import kotlin.reflect.jvm.javaField
-import kotlin.script.experimental.api.ScriptCompilationConfiguration
-import kotlin.script.experimental.api.resultField
+import kotlin.script.experimental.api.*
 import kotlin.script.experimental.jvm.KJvmEvaluatedSnippet
 import kotlin.script.experimental.util.LinkedSnippet
 
@@ -46,12 +45,13 @@ class RuntimePlugin : Plugin {
             val expr = line.substring(p + 1).trim()
 
             // TODO: restore
-//            val compileResult = repl.compile(CodeExpr(counter.getAndIncrement(), expr))
-//            when (compileResult) {
-//                is Result.Error -> repl.handleError(compileResult.error)
-//                is Result.Success -> compileResult.data.classes.type?.let { println(it) }
-//            }
-            println("!not implemented!")
+            val analysisResults = repl.analyze(expr, SourceCode.Position(0, 0))
+            when (analysisResults) {
+                is ResultWithDiagnostics.Failure -> repl.handleError(analysisResults)
+                is ResultWithDiagnostics.Success<ReplAnalyzerResult> -> {
+                    analysisResults.value[ReplAnalyzerResult.renderedResultType]?.let { println(it) }
+                }
+            }
         }
 
         override fun highlighter(): Highlighter = customHighlighter

pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<properties>
-        <kotlin.version>1.4.0-dev-6132</kotlin.version>
+        <kotlin.version>1.4.0-dev-8551</kotlin.version>
         <jvm.version>1.8</jvm.version>
         <sparklin.version>0.2.7-SNAPSHOT</sparklin.version>
 	</properties>