From 9e2ff04e1bede88a1a96764869e3a00339b829e1 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Tue, 4 Dec 2018 15:25:25 +0300
Subject: [PATCH] Fix build module in AndroidStudio for REPL and Scratch

^KT-23560 Fixed
---
 .../kotlin/idea/scratch/actions/RunScratchAction.kt        | 6 +++---
 .../org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt  | 7 +++----
 2 files changed, 6 insertions(+), 7 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 cf28507cee6..b3c2691ba15 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
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.scratch.actions
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.compiler.CompilerManager
 import com.intellij.openapi.keymap.KeymapManager
 import com.intellij.openapi.keymap.KeymapUtil
 import com.intellij.openapi.project.DumbService
+import com.intellij.task.ProjectTaskManager
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.scratch.ScratchFile
 import org.jetbrains.kotlin.idea.scratch.ScratchFileLanguageProvider
@@ -97,8 +97,8 @@ class RunScratchAction : ScratchAction(
         }
 
         if (isMakeBeforeRun) {
-            CompilerManager.getInstance(project).make(module) { aborted, errors, _, _ ->
-                if (aborted || errors > 0) {
+            ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result ->
+                if (result.isAborted || result.errors > 0) {
                     handler.error(scratchFile, "There were compilation errors in module ${module.name}")
                 }
 
diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt
index 6de82b3c00e..b0108dacd31 100644
--- a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt
+++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.console
 import com.intellij.execution.ExecutionManager
 import com.intellij.execution.Executor
 import com.intellij.execution.ui.RunContentDescriptor
-import com.intellij.openapi.compiler.CompileContext
 import com.intellij.openapi.compiler.CompilerManager
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
+import com.intellij.task.ProjectTaskManager
 
 class ConsoleCompilerHelper(
     private val project: Project,
@@ -39,10 +39,9 @@ class ConsoleCompilerHelper(
 
     fun compileModule() {
         if (ExecutionManager.getInstance(project).contentManager.removeRunContent(executor, contentDescriptor)) {
-            CompilerManager.getInstance(project).make(module) {
-                _: Boolean, errors: Int, _: Int, _: CompileContext ->
+            ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result ->
                 if (!module.isDisposed) {
-                    KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = errors > 0)
+                    KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = result.errors > 0)
                 }
             }
         }