From 54f935919570f2f0564b02467c20bbc6f6fbc673 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Mon, 14 May 2018 16:06:04 +0300
Subject: [PATCH] Minor: fixes after review

---
 .../kotlin/idea/scratch/actions/RunScratchAction.kt   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt
index 0e66a452ef4..436678bacde 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt
@@ -56,12 +56,12 @@ class RunScratchAction(private val scratchPanel: ScratchTopPanel) : AnAction(
             return
         }
 
-        val runnable = r@{
+        fun executeScratch() {
             val executor = if (isRepl) provider.createReplExecutor(scratchFile) else provider.createCompilingExecutor(scratchFile)
             if (executor == null) {
                 handler.error(scratchFile, "Couldn't run ${psiFile.name}")
                 handler.onFinish(scratchFile)
-                return@r
+                return
             }
 
             e.presentation.isEnabled = false
@@ -83,7 +83,6 @@ class RunScratchAction(private val scratchPanel: ScratchTopPanel) : AnAction(
                 e.presentation.isEnabled = true
 
                 log.error(ex)
-                return@r
             }
         }
 
@@ -92,15 +91,15 @@ class RunScratchAction(private val scratchPanel: ScratchTopPanel) : AnAction(
                 if (!aborted && errors == 0) {
                     if (DumbService.isDumb(project)) {
                         DumbService.getInstance(project).smartInvokeLater {
-                            runnable()
+                            executeScratch()
                         }
                     } else {
-                        runnable()
+                        executeScratch()
                     }
                 }
             }
         } else {
-            runnable()
+            executeScratch()
         }
     }
 }