Add total reset to repl history and state interfaces

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt

@@ -26,16 +26,28 @@ import kotlin.script.dependencies.KotlinScriptExternalDependencies
 
 class ReplCompilerStageHistory(private val state: GenericReplCompilerState) : BasicReplStageHistory<ScriptDescriptor>(state.lock) {
 
+    override fun reset(): Iterable<ILineId> {
+        val removedCompiledLines = super.reset()
+        val removedAnalyzedLines = state.analyzerEngine.reset()
+
+        checkConsistent(removedCompiledLines, removedAnalyzedLines)
+        return removedCompiledLines
+    }
+
     override fun resetTo(id: ILineId): Iterable<ILineId> {
         val removedCompiledLines = super.resetTo(id)
-        val removedAnalyzedLines = state.analyzerEngine.resetToLine(id.no)
+        val removedAnalyzedLines = state.analyzerEngine.resetToLine(id)
 
+        checkConsistent(removedCompiledLines, removedAnalyzedLines)
+        return removedCompiledLines
+    }
+
+    private fun checkConsistent(removedCompiledLines: Iterable<ILineId>, removedAnalyzedLines: List<ReplCodeLine>) {
         removedCompiledLines.zip(removedAnalyzedLines).forEach {
             if (it.first != LineId(it.second)) {
                 throw IllegalStateException("History mismatch when resetting lines: ${it.first.no} != ${it.second}")
             }
         }
-        return removedCompiledLines
     }
 }
 

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplCodeAnalyzer.kt

@@ -19,6 +19,7 @@
 package org.jetbrains.kotlin.cli.jvm.repl
 
 import org.jetbrains.kotlin.cli.common.repl.CompiledReplCodeLine
+import org.jetbrains.kotlin.cli.common.repl.ILineId
 import org.jetbrains.kotlin.cli.common.repl.ReplCodeLine
 import org.jetbrains.kotlin.cli.common.repl.ReplHistory
 import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport
@@ -88,7 +89,9 @@ class ReplCodeAnalyzer(environment: KotlinCoreEnvironment) {
         }
     }
 
-    fun resetToLine(lineNumber: Int): List<ReplCodeLine> = replState.resetToLine(lineNumber)
+    fun resetToLine(lineId: ILineId): List<ReplCodeLine> = replState.resetToLine(lineId)
+
+    fun reset(): List<ReplCodeLine> = replState.reset()
 
     fun analyzeReplLine(psiFile: KtFile, codeLine: ReplCodeLine): ReplLineAnalysisResult {
         topDownAnalysisContext.scripts.clear()
@@ -172,12 +175,17 @@ class ReplCodeAnalyzer(environment: KotlinCoreEnvironment) {
         private val successfulLines = ReplHistory<LineInfo.SuccessfulLine>()
         private val submittedLines = hashMapOf<KtFile, LineInfo>()
 
-        fun resetToLine(lineNumber: Int): List<ReplCodeLine> {
-            val removed = successfulLines.resetToLine(lineNumber)
+        fun resetToLine(lineId: ILineId): List<ReplCodeLine> {
+            val removed = successfulLines.resetToLine(lineId.no)
             removed.forEach { submittedLines.remove(it.second.linePsi) }
             return removed.map { it.first }
         }
 
+        fun reset(): List<ReplCodeLine> {
+            submittedLines.clear()
+            return successfulLines.reset().map { it.first }
+        }
+
         fun submitLine(ktFile: KtFile, codeLine: ReplCodeLine) {
             val line = LineInfo.SubmittedLine(ktFile, successfulLines.lastValue())
             submittedLines[ktFile] = line