Use utility classes from shared KLS module

Author: fwcd

adapter/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 	implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.6.0'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
-	implementation 'com.github.fwcd.kotlin-language-server:shared:7eb014a37a9a9184edd974c4f3d7be05b1cf9485'
+	implementation 'com.github.fwcd.kotlin-language-server:shared:2db25b8de902eecfbc072f7a8529877cd05aa780'
 	// The Java Debug Interface classes (com.sun.jdi.*)
 	implementation files("${System.properties['java.home']}/../lib/tools.jar")
 	testImplementation 'junit:junit:4.12'

adapter/src/main/kotlin/org/javacs/ktda/KDAMain.kt

@@ -1,10 +1,11 @@
 package org.javacs.ktda
 
 import java.util.concurrent.Executors
+import org.javacs.kt.LOG
+import org.javacs.kt.util.ExitingInputStream
 import org.javacs.ktda.adapter.KotlinDebugAdapter
 import org.javacs.ktda.core.launch.DebugLauncher
 import org.javacs.ktda.jdi.launch.JDILauncher
-import org.javacs.ktda.util.ExitingInputStream
 import org.javacs.ktda.util.LoggingInputStream
 import org.javacs.ktda.util.LoggingOutputStream
 import org.eclipse.lsp4j.debug.launch.DSPLauncher
@@ -23,14 +24,10 @@ fun main(args: Array<String>) {
 	LOG.connectJULFrontend()
 
 	val launcher: DebugLauncher = JDILauncher()
-	var client: IDebugProtocolClient? = null
 
 	// Setup IO streams for JSON communication
 
-	val input = LoggingInputStream(ExitingInputStream(System.`in`) {
-		client?.terminated(TerminatedEventArguments())
-		System.exit(0)
-	}, JSON_IN_LOGGING, JSON_IN_LOGGING_BUFFER_LINES)
+	val input = LoggingInputStream(ExitingInputStream(System.`in`), JSON_IN_LOGGING, JSON_IN_LOGGING_BUFFER_LINES)
 	val output = LoggingOutputStream(System.out, JSON_OUT_LOGGING, JSON_OUT_LOGGING_BUFFER_LINES)
 
 	// Create debug adapter and launcher

adapter/src/main/kotlin/org/javacs/ktda/Logger.kt

@@ -11,12 +11,12 @@ import org.eclipse.lsp4j.debug.*
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
 import org.eclipse.lsp4j.debug.services.IDebugProtocolServer
 import org.eclipse.lsp4j.debug.services.IDebugProtocolClient
-import org.javacs.ktda.LOG
-import org.javacs.ktda.JSON_LOG
-import org.javacs.ktda.LogLevel
-import org.javacs.ktda.LogMessage
+import org.javacs.kt.LOG
+import org.javacs.kt.LogLevel
+import org.javacs.kt.LogMessage
+import org.javacs.kt.util.AsyncExecutor
+import org.javacs.ktda.util.JSON_LOG
 import org.javacs.ktda.util.KotlinDAException
-import org.javacs.ktda.util.AsyncExecutor
 import org.javacs.ktda.util.waitUntil
 import org.javacs.ktda.core.Debuggee
 import org.javacs.ktda.core.DebugContext

adapter/src/main/kotlin/org/javacs/ktda/adapter/KotlinDebugAdapter.kt

@@ -2,7 +2,7 @@ package org.javacs.ktda.classpath
 
 import java.util.logging.Level
 import org.javacs.kt.SourceExclusions
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.util.winCompatiblePathOf
 import org.javacs.ktda.util.tryResolving
 import org.javacs.ktda.util.firstNonNull

adapter/src/main/kotlin/org/javacs/ktda/classpath/FindClassPath.kt

@@ -1,6 +1,6 @@
 package org.javacs.ktda.classpath
 
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.util.firstNonNull
 import org.javacs.ktda.util.tryResolving
 import org.javacs.ktda.util.execAndReadStdout

adapter/src/main/kotlin/org/javacs/ktda/classpath/GradleDependencyResolver.kt

@@ -1,6 +1,6 @@
 package org.javacs.ktda.classpath
 
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.util.firstNonNull
 import java.nio.file.Files
 import java.nio.file.Paths

adapter/src/main/kotlin/org/javacs/ktda/classpath/PathUtils.kt

@@ -9,7 +9,7 @@ import org.javacs.ktda.core.launch.LaunchConfiguration
 import org.javacs.ktda.core.event.DebuggeeEventBus
 import org.javacs.ktda.core.breakpoint.Breakpoint
 import org.javacs.ktda.core.breakpoint.ExceptionBreakpoint
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.util.ObservableList
 import org.javacs.ktda.classpath.findValidKtFilePath
 import org.javacs.ktda.classpath.toJVMClassNames

adapter/src/main/kotlin/org/javacs/ktda/jdi/JDIDebuggee.kt

@@ -1,6 +1,6 @@
 package org.javacs.ktda.jdi.event
 
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.util.ListenerList
 import org.javacs.ktda.util.Subscription
 import org.javacs.ktda.core.event.DebuggeeEventBus

adapter/src/main/kotlin/org/javacs/ktda/jdi/event/VMEventBus.kt

@@ -1,6 +1,6 @@
 package org.javacs.ktda.jdi.launch
 
-import org.javacs.ktda.LOG
+import org.javacs.kt.LOG
 import org.javacs.ktda.core.launch.DebugLauncher
 import org.javacs.ktda.core.launch.LaunchConfiguration
 import org.javacs.ktda.core.launch.AttachConfiguration