Get rid of daemon-client dependency on openapi, making others "provided"

(cherry picked from commit 175d74c)

compiler/daemon/daemon-client/daemon-client.iml

@@ -7,11 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="native-platform-uberjar" level="project" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="daemon-common" scope="PROVIDED" />
+    <orderEntry type="module" module-name="util" scope="PROVIDED" />
+    <orderEntry type="library" scope="PROVIDED" name="native-platform-uberjar" level="project" />
+    <orderEntry type="module" module-name="cli-common" scope="PROVIDED" />
+    <orderEntry type="module" module-name="descriptors" scope="PROVIDED" />
   </component>
 </module>

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.daemon.client
 
-import com.intellij.openapi.progress.ProcessCanceledException
 import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
 import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
 import org.jetbrains.kotlin.daemon.common.RmiFriendlyCompilationCanceledException
@@ -27,7 +26,9 @@ import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompil
 import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
 import org.jetbrains.kotlin.modules.TargetId
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
+import org.jetbrains.kotlin.utils.rethrow
 import java.rmi.server.UnicastRemoteObject
+import kotlin.reflect.full.allSuperclasses
 
 
 open class CompilerCallbackServicesFacadeServer(
@@ -83,10 +84,12 @@ open class CompilerCallbackServicesFacadeServer(
         try {
             compilationCanceledStatus!!.checkCanceled()
         }
-        catch (e: ProcessCanceledException) {
+        catch (e: Exception) {
             // avoid passing exceptions that may have different serialVersionUID on across rmi border
-            // TODO: doublecheck whether we need to distinguish different cancellation exceptions
-            throw RmiFriendlyCompilationCanceledException()
+            // removing dependency from openapi (this is obsolete part anyway, and will be removed soon)
+            if ((e::class.allSuperclasses + e::class).any { it.qualifiedName == "com.intellij.openapi.progress.ProcessCanceledException" })
+                throw RmiFriendlyCompilationCanceledException()
+            else throw e
         }
     }
 }

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinRemoteReplClient.kt

@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.daemon.client
 
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.cli.common.repl.*
 import org.jetbrains.kotlin.daemon.common.CompileService
 import org.jetbrains.kotlin.daemon.common.RemoteOperationsTracer
@@ -29,7 +27,6 @@ import java.io.OutputStream
 // TODO: reduce number of ports used then SOCKET_ANY_FREE_PORT is passed (same problem with other calls)
 
 open class KotlinRemoteReplClientBase(
-        disposable: Disposable,
         protected val compileService: CompileService,
         clientAliveFlagFile: File?,
         targetPlatform: CompileService.TargetPlatform,
@@ -60,20 +57,18 @@ open class KotlinRemoteReplClientBase(
             operationsTracer
     ).get()
 
-    init {
-        Disposer.register(disposable, Disposable {
-            try {
-                compileService.releaseReplSession(sessionId)
-            }
-            catch (ex: java.rmi.RemoteException) {
-                // assuming that communication failed and daemon most likely is already down
-            }
-        })
+    // dispose should be called at the end of the repl lifetime to free daemon repl session and appropriate resources
+    open fun dispose() {
+        try {
+            compileService.releaseReplSession(sessionId)
+        }
+        catch (ex: java.rmi.RemoteException) {
+            // assuming that communication failed and daemon most likely is already down
+        }
     }
 }
 
 class KotlinRemoteReplCompiler(
-        disposable: Disposable,
         compileService: CompileService,
         clientAliveFlagFile: File?,
         targetPlatform: CompileService.TargetPlatform,
@@ -83,7 +78,6 @@ class KotlinRemoteReplCompiler(
         port: Int = SOCKET_ANY_FREE_PORT,
         operationsTracer: RemoteOperationsTracer? = null
 ) : KotlinRemoteReplClientBase(
-        disposable = disposable,
         compileService = compileService,
         clientAliveFlagFile = clientAliveFlagFile,
         targetPlatform = targetPlatform,
@@ -114,7 +108,6 @@ class KotlinRemoteReplCompiler(
 
 // TODO: consider removing daemon eval completely - it is not required now and has questionable security. This will simplify daemon interface as well
 class KotlinRemoteReplEvaluator(
-        disposable: Disposable,
         compileService: CompileService,
         clientAliveFlagFile: File?,
         targetPlatform: CompileService.TargetPlatform,
@@ -129,7 +122,6 @@ class KotlinRemoteReplEvaluator(
         port: Int = SOCKET_ANY_FREE_PORT,
         operationsTracer: RemoteOperationsTracer? = null
 ) : KotlinRemoteReplClientBase(
-        disposable = disposable,
         compileService = compileService,
         clientAliveFlagFile = clientAliveFlagFile,
         targetPlatform = targetPlatform,