PR-1021 review: minor fixes

# Conflicts:
#	compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt
#	compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplEvaluator.kt
#	compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt

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

@@ -53,7 +53,7 @@ class GenericReplAnalyzer(environment: KotlinCoreEnvironment,
     private val topDownAnalyzer: LazyTopDownAnalyzer
     private val resolveSession: ResolveSession
     private val scriptDeclarationFactory: ScriptMutableDeclarationProviderFactory
-    private val replState = ResetableReplState()
+    private val replState = ResettableReplState()
 
     val module: ModuleDescriptorImpl
         get() = stateLock.read { field }
@@ -63,8 +63,8 @@ class GenericReplAnalyzer(environment: KotlinCoreEnvironment,
 
     init {
         // Module source scope is empty because all binary classes are in the dependency module, and all source classes are guaranteed
-        // to be found via ResolveSession. The latter is true as long as light classes are not needed in NONE (which is currently true
-        // because no symbol declared in the NONE session can be used from Java)
+        // to be found via ResolveSession. The latter is true as long as light classes are not needed in REPL (which is currently true
+        // because no symbol declared in the REPL session can be used from Java)
         val container = TopDownAnalyzerFacadeForJVM.createContainer(
                 environment.project,
                 emptyList(),
@@ -178,7 +178,8 @@ class GenericReplAnalyzer(environment: KotlinCoreEnvironment,
         }
     }
 
-    class ResetableReplState() {
+    // TODO: merge with org.jetbrains.kotlin.resolve.repl.ReplState when switching to new REPL infrastruct everywhere
+    class ResettableReplState {
         private val successfulLines = ReplHistory<LineInfo.SuccessfulLine>()
         private val submittedLines = hashMapOf<KtFile, LineInfo>()
 
@@ -232,5 +233,3 @@ class GenericReplAnalyzer(environment: KotlinCoreEnvironment,
         }
     }
 }
-
-

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

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.repl.ReplCheckResult
 import org.jetbrains.kotlin.cli.common.repl.ReplCodeLine
-import org.jetbrains.kotlin.cli.common.repl.makeSriptBaseName
+import org.jetbrains.kotlin.cli.common.repl.makeScriptBaseName
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.repl.messages.DiagnosticMessageHolder
@@ -74,9 +74,9 @@ open class GenericReplChecker(
 
     fun check(codeLine: ReplCodeLine, generation: Long): ReplCheckResult {
         stateLock.write {
-            val scriptFileName = makeSriptBaseName(codeLine, generation)
+            val scriptFileName = makeScriptBaseName(codeLine, generation)
             val virtualFile =
-                    LightVirtualFile("${scriptFileName}${KotlinParserDefinition.STD_SCRIPT_EXT}", KotlinLanguage.INSTANCE, codeLine.code).apply {
+                    LightVirtualFile("$scriptFileName${KotlinParserDefinition.STD_SCRIPT_EXT}", KotlinLanguage.INSTANCE, codeLine.code).apply {
                         charset = CharsetToolkit.UTF8_CHARSET
                     }
             val psiFile: KtFile = psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile?

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

@@ -68,7 +68,7 @@ open class GenericReplCompiler(disposable: Disposable,
 
     override val history: List<ReplCodeLine> get() = stateLock.read { descriptorsHistory.copySources() }
 
-    override fun check(codeLine: ReplCodeLine): ReplCheckResult {
+    override fun check(codeLine: ReplCodeLine): ReplCheckResult = stateLock.read {
         return checker.check(codeLine, generation.get())
     }
 
@@ -87,7 +87,7 @@ open class GenericReplCompiler(disposable: Disposable,
                     when (res) {
                         is ReplCheckResult.Incomplete -> return@compile ReplCompileResult.Incomplete(descriptorsHistory.copySources())
                         is ReplCheckResult.Error -> return@compile ReplCompileResult.Error(descriptorsHistory.copySources(), res.message, res.location)
-                        is ReplCheckResult.Ok -> NO_ACTION()
+                        is ReplCheckResult.Ok -> {} // continue
                     }
                 }
                 Pair(checker.lineState!!.psiFile, checker.lineState!!.errorHolder)
@@ -125,7 +125,7 @@ open class GenericReplCompiler(disposable: Disposable,
                     setOf(psiFile.script!!.getContainingKtFile()),
                     org.jetbrains.kotlin.codegen.CompilationErrorHandler.THROW_EXCEPTION)
 
-            val generatedClassname = makeSriptBaseName(codeLine, currentGeneration)
+            val generatedClassname = makeScriptBaseName(codeLine, currentGeneration)
             val compiledCodeLine = CompiledReplCodeLine(generatedClassname, codeLine)
             descriptorsHistory.add(compiledCodeLine, scriptDescriptor)