added -g javac option & updated bin/scalafmt

modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/DebugAdapterPlugin.scala

@@ -100,7 +100,12 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
  def runSettings: Seq[Def.Setting[_]] = Seq(
  startMainClassDebugSession := mainClassSessionTask.evaluated,
  startRemoteDebugSession := remoteSessionTask.evaluated,
- stopDebugSession := stopSessionTask.value
+ stopDebugSession := stopSessionTask.value,
+ Keys.compile / Keys.javacOptions := {
+ val jo = (Keys.compile / Keys.javacOptions).value
+ if (jo.contains("-g")) jo
+ else jo :+ "-g"
+ }
  )
 
  /**

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/build.sbt

@@ -0,0 +1,17 @@
+import ch.epfl.scala.debugadapter.testfmk._
+
+val checkDebugJava = inputKey[Unit]("Check that the -g option has been added")
+
+def checkDebugJavaTask = Def.inputTask {
+ val uri = (Compile / startMainClassDebugSession).evaluated
+ val source = (Compile / sources).value.head.toPath
+ implicit val context: TestingContext = TestingContext(source, "3.3.0")
+ DebugTest.check(uri)(Breakpoint(source, 6), Evaluation.success("x", 1))
+}
+
+lazy val debugJavaWithG =
+ project
+ .in(file("./withG"))
+ .settings(javacOptions += "-g", checkDebugJava := checkDebugJavaTask.evaluated)
+
+lazy val debugJavaWithoutG = project.in(file("./withoutG")).settings(checkDebugJava := checkDebugJavaTask.evaluated)

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/project/plugins.sbt

@@ -0,0 +1,12 @@
+val pluginVersion = sys.props
+ .get("plugin.version")
+ .getOrElse {
+ sys.error(
+ """|The system property 'plugin.version' is not defined.
+ |Specify this property using the scriptedLaunchOpts -D.
+ |""".stripMargin
+ )
+ }
+
+addSbtPlugin("ch.epfl.scala" % "sbt-debug-adapter" % pluginVersion)
+libraryDependencies += "ch.epfl.scala" %% "scala-debug-adapter-test" % pluginVersion

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/project/project/plugins.sbt

@@ -0,0 +1,2 @@
+// required for [email protected]
+addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/test

@@ -0,0 +1,2 @@
+> 'debugJavaWithG / checkDebugJava {"class":"example.Main","arguments":[],"jvmOptions":[]}'
+> 'debugJavaWithoutG / checkDebugJava {"class":"example.Main","arguments":[],"jvmOptions":[]}'

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/withG/src/main/java/example/Main.java

@@ -0,0 +1,8 @@
+package example;
+
+public class Main {
+ public static void main(String[] args) {
+ var x = 1;
+ System.out.println("Hello, world!");
+ }
+}

modules/sbt-plugin/src/sbt-test/debug-session/debug-java/withoutG/src/main/java/example/Main.java

@@ -0,0 +1,8 @@
+package example;
+
+public class Main {
+ public static void main(String[] args) {
+ var x = 1;
+ System.out.println("Hello, world!");
+ }
+}