More cleanup: lift return / assignment out

compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt

@@ -68,11 +68,11 @@ class ModuleVisibilityHelperImpl : ModuleVisibilityHelper {
 
     private fun findModule(descriptor: DeclarationDescriptor, modules: Collection<Module>): Module? {
         val sourceElement = getSourceElement(descriptor)
-        if (sourceElement is KotlinSourceElement) {
-            return modules.singleOrNull() ?: modules.firstOrNull { sourceElement.psi.containingKtFile.virtualFile.path in it.getSourceFiles() }
+        return if (sourceElement is KotlinSourceElement) {
+            modules.singleOrNull() ?: modules.firstOrNull { sourceElement.psi.containingKtFile.virtualFile.path in it.getSourceFiles() }
         }
         else {
-            return modules.firstOrNull { module ->
+            modules.firstOrNull { module ->
                 isContainedByCompiledPartOfOurModule(descriptor, File(module.getOutputDirectory())) ||
                 module.getFriendPaths().any { isContainedByCompiledPartOfOurModule(descriptor, File(it)) }
             }

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

@@ -113,14 +113,14 @@ class ReplCodeAnalyzer(environment: KotlinCoreEnvironment) {
 
         val diagnostics = trace.bindingContext.diagnostics
         val hasErrors = diagnostics.any { it.severity == Severity.ERROR }
-        if (hasErrors) {
+        return if (hasErrors) {
             replState.lineFailure(linePsi, codeLine)
-            return ReplLineAnalysisResult.WithErrors(diagnostics)
+            ReplLineAnalysisResult.WithErrors(diagnostics)
         }
         else {
             val scriptDescriptor = context.scripts[linePsi.script]!!
             replState.lineSuccess(linePsi, codeLine, scriptDescriptor)
-            return ReplLineAnalysisResult.Successful(scriptDescriptor, diagnostics)
+            ReplLineAnalysisResult.Successful(scriptDescriptor, diagnostics)
         }
 
     }

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

@@ -96,11 +96,11 @@ class ReplFromTerminal(
         }
 
         val lineResult = eval(line)
-        if (lineResult is ReplEvalResult.Incomplete) {
-            return WhatNextAfterOneLine.INCOMPLETE
+        return if (lineResult is ReplEvalResult.Incomplete) {
+            WhatNextAfterOneLine.INCOMPLETE
         }
         else {
-            return WhatNextAfterOneLine.READ_LINE
+            WhatNextAfterOneLine.READ_LINE
         }
     }