Merge PR #41

Author: fwcd

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

@@ -88,22 +88,25 @@ class KotlinDebugAdapter(
 		configurationDoneResponse = response
 		return response
 	}
-	
+
 	override fun launch(args: Map<String, Any>) = launcherAsync.execute {
 		performInitialization()
-		
+
 		val projectRoot = (args["projectRoot"] as? String)?.let { Paths.get(it) }
 			?: throw missingRequestArgument("launch", "projectRoot")
-		
+
 		val mainClass = (args["mainClass"] as? String)
 			?: throw missingRequestArgument("launch", "mainClass")
-		
+
+		val vmArguments:String? = (args["vmArguments"] as? String)
+
 		setupCommonInitializationParams(args)
-		
+
 		val config = LaunchConfiguration(
 			debugClassPathResolver(listOf(projectRoot)).classpathOrEmpty,
 			mainClass,
-			projectRoot
+			projectRoot,
+			vmArguments ?: ""
 		)
 		debuggee = launcher.launch(
 			config,
@@ -185,7 +188,7 @@ class KotlinDebugAdapter(
 		performInitialization()
 
 		val projectRoot = (args["projectRoot"] as? String)?.let { Paths.get(it) }
-			?: throw missingRequestArgument("launch", "projectRoot")
+			?: throw missingRequestArgument("attach", "projectRoot")
 
 		val hostName = (args["hostName"] as? String)
 			?: throw missingRequestArgument("attach", "hostName")

adapter/src/main/kotlin/org/javacs/ktda/core/launch/LaunchConfiguration.kt

@@ -5,5 +5,6 @@ import java.nio.file.Path
 class LaunchConfiguration(
 	val classpath: Set<Path>,
 	val mainClass: String,
-	val projectRoot: Path
+	val projectRoot: Path,
+	val vmArguments: String = ""
 )

adapter/src/main/kotlin/org/javacs/ktda/jdi/launch/JDILauncher.kt

@@ -84,7 +84,7 @@ class JDILauncher(
 
 	private fun formatOptions(config: LaunchConfiguration): String {
 		var options = ""
-		vmArguments?.let { options += it }
+		options += config.vmArguments
 		modulePaths?.let { options += " --module-path \"$modulePaths\"" }
 		options += " -classpath \"${formatClasspath(config)}\""
 		return options

adapter/src/test/kotlin/org/javacs/ktda/DebugAdapterTestFixture.kt

@@ -16,7 +16,8 @@ import org.hamcrest.Matchers.equalTo
 
 abstract class DebugAdapterTestFixture(
     relativeWorkspaceRoot: String,
-    private val mainClass: String
+    private val mainClass: String,
+    private val vmArguments: String = ""
 ) : IDebugProtocolClient {
     val absoluteWorkspaceRoot: Path = Paths.get(DebugAdapterTestFixture::class.java.getResource("/Anchor.txt").toURI()).parent.resolve(relativeWorkspaceRoot)
     lateinit var debugAdapter: KotlinDebugAdapter
@@ -58,7 +59,8 @@ abstract class DebugAdapterTestFixture(
         println("Launching...")
         debugAdapter.launch(mapOf(
             "projectRoot" to absoluteWorkspaceRoot.toString(),
-            "mainClass" to mainClass
+            "mainClass" to mainClass,
+            "vmArguments" to vmArguments
         )).join()
         println("Launched")
     }

adapter/src/test/kotlin/org/javacs/ktda/SampleWorkspaceTest.kt

@@ -21,7 +21,7 @@ import java.util.concurrent.CountDownLatch
  * Tests a very basic debugging scenario
  * using a sample application.
  */
-class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace", "sample.workspace.AppKt") {
+class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace", "sample.workspace.AppKt", "-Dtest=testVmArgs") {
     private val latch = CountDownLatch(1)
     private var asyncException: Throwable? = null
 
@@ -74,7 +74,7 @@ class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace", "sample.
                 variablesReference = receiver!!.variablesReference
             }).join().variables
 
-            assertThat(members.map { Pair(it.name, it.value) }, containsInAnyOrder(Pair("member", "\"test\"")))
+            assertThat(members.map { Pair(it.name, it.value) }, containsInAnyOrder(Pair("member", "\"testVmArgs\"")))
         } catch (e: Throwable) {
             asyncException = e
         } finally {

adapter/src/test/resources/sample-workspace/src/main/kotlin/sample/workspace/App.kt

@@ -1,7 +1,7 @@
 package sample.workspace
 
 class App {
-    private val member: String = "test"
+    private val member: String = System.getProperty("test")
     val greeting: String
         get() {
             val local: Int = 123