From a1fa9ffdbbfbbb71526ce8fcff0548577d5d0dca Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 30 May 2018 12:40:23 +0300
Subject: [PATCH] jps: implement mpp and js daemon compiler services

#KT-24635 fixed

Original commit: 1cbef873ec4687035f50b8dd9c14559f25b64588
---
 .../JpsCompilerServicesFacadeImpl.kt              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
index 0d3ad786b08..93165ff6411 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
@@ -20,7 +20,10 @@ import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer
 import org.jetbrains.kotlin.daemon.client.reportFromDaemon
 import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade
 import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
+import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
+import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import java.io.Serializable
@@ -29,12 +32,14 @@ internal class JpsCompilerServicesFacadeImpl(
     private val env: JpsCompilerEnvironment,
     port: Int = SOCKET_ANY_FREE_PORT
 ) : CompilerCallbackServicesFacadeServer(
-    env.services.get(IncrementalCompilationComponents::class.java),
-    env.services.get(LookupTracker::class.java),
-    env.services.get(CompilationCanceledStatus::class.java),
+    env.services[IncrementalCompilationComponents::class.java],
+    env.services[LookupTracker::class.java],
+    env.services[CompilationCanceledStatus::class.java],
+    env.services[ExpectActualTracker::class.java],
+    env.services[IncrementalResultsConsumer::class.java],
+    env.services[IncrementalDataProvider::class.java],
     port
-),
-    JpsCompilerServicesFacade {
+), JpsCompilerServicesFacade {
 
     override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) {
         env.messageCollector.reportFromDaemon(