Support for --jvm option in Enso runner

build.sbt

@@ -2614,55 +2614,60 @@ lazy val `engine-runner` = project
     assembly := assembly
       .dependsOn(`runtime-fat-jar` / assembly)
       .value,
-    rebuildNativeImage :=
-      NativeImage
-        .buildNativeImage(
-          "runner",
-          staticOnLinux = false,
-          additionalOptions = Seq(
-            "-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog",
-            "-H:IncludeResources=.*Main.enso$",
-            "-H:+AddAllCharsets",
-            "-H:+IncludeAllLocales",
-            "-ea",
-            // useful perf & debug switches:
-            // "-g",
-            // "-H:+SourceLevelDebug",
-            // "-H:-DeleteLocalSymbols",
-            // you may need to set smallJdk := None to use following flags:
-            // "--trace-class-initialization=org.enso.syntax2.Parser",
-            "-Dnic=nic"
-          ),
-          mainClass = Some("org.enso.runner.Main"),
-          initializeAtRuntime = Seq(
-            "org.jline.nativ.JLineLibrary",
-            "org.jline.terminal.impl.jna",
-            "io.methvin.watchservice.jna.CarbonAPI",
-            "zio.internal.ZScheduler$$anon$4",
-            "org.enso.runner.Main$",
-            "sun.awt",
-            "sun.java2d",
-            "sun.font",
-            "java.awt",
-            "com.sun.imageio",
-            "com.sun.jna.internal.Cleaner",
-            "com.sun.jna.Structure$FFIType",
-            "akka.http"
+    rebuildNativeImage := Def
+      .taskDyn {
+        NativeImage
+          .buildNativeImage(
+            "enso",
+            targetDir     = engineDistributionRoot.value / "bin",
+            staticOnLinux = false,
+            additionalOptions = Seq(
+              "-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog",
+              "-H:IncludeResources=.*Main.enso$",
+              "-H:+AddAllCharsets",
+              "-H:+IncludeAllLocales",
+              "-ea",
+              // useful perf & debug switches:
+              // "-g",
+              // "-H:+SourceLevelDebug",
+              // "-H:-DeleteLocalSymbols",
+              // you may need to set smallJdk := None to use following flags:
+              // "--trace-class-initialization=org.enso.syntax2.Parser",
+              "-Dnic=nic"
+            ),
+            mainClass = Some("org.enso.runner.Main"),
+            initializeAtRuntime = Seq(
+              "org.jline.nativ.JLineLibrary",
+              "org.jline.terminal.impl.jna",
+              "io.methvin.watchservice.jna.CarbonAPI",
+              "zio.internal.ZScheduler$$anon$4",
+              "org.enso.runner.Main$",
+              "sun.awt",
+              "sun.java2d",
+              "sun.font",
+              "java.awt",
+              "com.sun.imageio",
+              "com.sun.jna.internal.Cleaner",
+              "com.sun.jna.Structure$FFIType",
+              "akka.http"
+            )
           )
-        )
-        .dependsOn(NativeImage.additionalCp)
-        .dependsOn(NativeImage.smallJdk)
-        .dependsOn(assembly)
-        .dependsOn(
-          buildEngineDistribution
-        )
-        .value,
-    buildNativeImage := NativeImage
-      .incrementalNativeImageBuild(
-        rebuildNativeImage,
-        "runner"
+      }
+      .dependsOn(NativeImage.additionalCp)
+      .dependsOn(NativeImage.smallJdk)
+      .dependsOn(assembly)
+      .dependsOn(
+        buildEngineDistribution
       )
-      .value
+      .value,
+    buildNativeImage := Def.taskDyn {
+      NativeImage
+        .incrementalNativeImageBuild(
+          rebuildNativeImage,
+          "enso",
+          targetDir = engineDistributionRoot.value / "bin"
+        )
+    }.value
   )
   .dependsOn(`version-output`)
   .dependsOn(yaml)
@@ -3559,6 +3564,10 @@ ThisBuild / buildEngineDistribution := {
   buildEngineDistribution.result.value
 }
 
+ThisBuild / engineDistributionRoot := {
+  engineDistributionRoot.value
+}
+
 lazy val buildEngineDistributionNoIndex =
   taskKey[Unit]("Builds the engine distribution without generating indexes")
 buildEngineDistributionNoIndex := {

engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala

@@ -158,7 +158,11 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) {
   val distributionManager = new DistributionManager(environment)
 
   val editionProvider =
-    EditionManager.makeEditionProvider(distributionManager, Some(languageHome))
+    EditionManager.makeEditionProvider(
+      distributionManager,
+      Some(languageHome),
+      false
+    )
   val editionResolver = EditionResolver(editionProvider)
   val editionReferenceResolver = new EditionReferenceResolver(
     contentRoot.file,

engine/runner/src/main/java/org/enso/runner/Main.java

@@ -8,6 +8,7 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,6 +54,7 @@
 
 /** The main CLI entry point class. */
 public final class Main {
+  private static final String JVM_OPTION = "jvm";
   private static final String RUN_OPTION = "run";
   private static final String INSPECT_OPTION = "inspect";
   private static final String DUMP_GRAPHS_OPTION = "dump-graphs";
@@ -127,6 +129,15 @@ private static Options buildOptions() {
             .longOpt(RUN_OPTION)
             .desc("Runs a specified Enso file.")
             .build();
+    var jvm =
+        cliOptionBuilder()
+            .hasArg(true)
+            .numberOfArgs(1)
+            .optionalArg(true)
+            .argName("jvm")
+            .longOpt(JVM_OPTION)
+            .desc("Specifies whether to run JVM mode and optionally selects a JVM to run with.")
+            .build();
     var inspect =
         cliOptionBuilder()
             .longOpt(INSPECT_OPTION)
@@ -451,6 +462,7 @@ private static Options buildOptions() {
     options
         .addOption(help)
         .addOption(repl)
+        .addOption(jvm)
         .addOption(run)
         .addOption(inspect)
         .addOption(dumpGraphs)
@@ -966,7 +978,7 @@ private URI parseUri(String string) {
    *
    * @param args the command line arguments
    */
-  public static void main(String[] args) throws IOException {
+  public static void main(String[] args) throws Exception {
     new Main().launch(args);
   }
 
@@ -1294,9 +1306,91 @@ private void println(String msg) {
     System.out.println(msg);
   }
 
-  private void launch(String[] args) {
+  private void launch(String[] args) throws IOException, InterruptedException, URISyntaxException {
     var options = buildOptions();
     var line = preprocessArguments(options, args);
+
+    if (line.hasOption(JVM_OPTION)) {
+      var jvm = line.getOptionValue(JVM_OPTION);
+      var current = System.getProperty("java.home");
+      if (jvm == null) {
+        jvm = current;
+      }
+      if (current == null || !current.equals(jvm)) {
+        var loc = Main.class.getProtectionDomain().getCodeSource().getLocation();
+        var commandAndArgs = new ArrayList<String>();
+        JVM_FOUND:
+        if (jvm == null) {
+          var env = new Environment() {};
+          var dm = new DistributionManager(env);
+          var paths = dm.paths();
+          var files = paths.runtimes().toFile().listFiles();
+          if (files != null) {
+            for (var d : files) {
+              var java = new File(new File(d, "bin"), "java").getAbsoluteFile();
+              if (java.exists()) {
+                commandAndArgs.add(java.getPath());
+                break JVM_FOUND;
+              }
+            }
+          }
+          commandAndArgs.add("java");
+        } else {
+          commandAndArgs.add(new File(new File(new File(jvm), "bin"), "java").getAbsolutePath());
+        }
+        var jvmOptions = System.getenv("JAVA_OPTS");
+        if (jvmOptions != null) {
+          for (var op : jvmOptions.split(" ")) {
+            if (op.isEmpty()) {
+              continue;
+            }
+            commandAndArgs.add(op);
+          }
+        }
+
+        commandAndArgs.add("--add-opens=java.base/java.nio=ALL-UNNAMED");
+        commandAndArgs.add("--module-path");
+        var component = new File(loc.toURI().resolve("..")).getAbsoluteFile();
+        if (!component.getName().equals("component")) {
+          component = new File(component, "component");
+        }
+        if (!component.isDirectory()) {
+          throw new IOException("Cannot find " + component + " directory");
+        }
+        commandAndArgs.add(component.getPath());
+        commandAndArgs.add("-m");
+        commandAndArgs.add("org.enso.runtime/org.enso.EngineRunnerBootLoader");
+        var it = line.iterator();
+        while (it.hasNext()) {
+          var op = it.next();
+          if (JVM_OPTION.equals(op.getLongOpt())) {
+            continue;
+          }
+          var longName = op.getLongOpt();
+          if (longName != null) {
+            commandAndArgs.add("--" + longName);
+          } else {
+            commandAndArgs.add("-" + op.getOpt());
+          }
+          var values = op.getValuesList();
+          if (values != null) {
+            commandAndArgs.addAll(values);
+          }
+        }
+        commandAndArgs.addAll(line.getArgList());
+        var pb = new ProcessBuilder();
+        pb.inheritIO();
+        pb.command(commandAndArgs);
+        var p = pb.start();
+        var exitCode = p.waitFor();
+        if (exitCode == 0) {
+          throw exitSuccess();
+        } else {
+          throw doExit(exitCode);
+        }
+      }
+    }
+
     launch(options, line);
   }
 

engine/runner/src/main/scala/org/enso/runner/DependencyPreinstaller.scala

@@ -43,7 +43,8 @@ object DependencyPreinstaller {
 
     val editionProvider = EditionManager.makeEditionProvider(
       distributionManager,
-      Some(languageHome)
+      Some(languageHome),
+      true
     )
     val editionResolver = EditionResolver(editionProvider)
     val edition = editionResolver

lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/EditionManager.scala

@@ -10,7 +10,9 @@ import java.nio.file.Path
 import scala.util.Try
 
 /** A helper class for resolving editions. */
-class EditionManager private (editionProvider: UpdatingEditionProvider) {
+class EditionManager private (
+  editionProvider: editions.provider.EditionProvider
+) {
   private val editionResolver = EditionResolver(editionProvider)
   private val engineVersionResolver =
     editions.EngineVersionResolver(editionProvider)
@@ -46,18 +48,26 @@ class EditionManager private (editionProvider: UpdatingEditionProvider) {
 object EditionManager {
 
   /** Create an [[EditionProvider]] that can locate editions from the
-    * distribution and the language home.
+    * distribution (if updating) and the language home.
     */
-  def makeEditionProvider(
+  final def makeEditionProvider(
     distributionManager: DistributionManager,
-    languageHome: Option[LanguageHome]
-  ): UpdatingEditionProvider = {
-    val config = new GlobalConfigurationManager(distributionManager).getConfig
-    new UpdatingEditionProvider(
-      getSearchPaths(distributionManager, languageHome),
-      distributionManager.paths.cachedEditions,
-      config.editionProviders
-    )
+    languageHome: Option[LanguageHome],
+    updating: Boolean
+  ): editions.provider.EditionProvider = {
+    val config      = new GlobalConfigurationManager(distributionManager).getConfig
+    val searchPaths = getSearchPaths(distributionManager, languageHome)
+    val cachePath   = distributionManager.paths.cachedEditions
+    if (updating) {
+      new UpdatingEditionProvider(
+        searchPaths,
+        cachePath,
+        config.editionProviders
+      )
+    } else {
+      val actualSearchPaths = (searchPaths ++ List(cachePath)).distinct
+      new editions.provider.FileSystemEditionProvider(actualSearchPaths)
+    }
   }
 
   /** Get search paths associated with the distribution and language home. */
@@ -77,6 +87,6 @@ object EditionManager {
     distributionManager: DistributionManager,
     languageHome: Option[LanguageHome] = None
   ): EditionManager = new EditionManager(
-    makeEditionProvider(distributionManager, languageHome)
+    makeEditionProvider(distributionManager, languageHome, false)
   )
 }

lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/UpdatingEditionProvider.scala

@@ -38,12 +38,8 @@ class UpdatingEditionProvider(
       case Right(value)     => Right(value)
     }
 
-  /** Finds all editions available on the [[searchPaths]]. */
-  override def findAvailableEditions(): Seq[String] =
-    provider.findAvailableEditions()
-
   /** Finds all available editions, performing an update if asked to. */
-  def findAvailableEditions(update: Boolean): Seq[String] = {
+  override def findAvailableEditions(update: Boolean): Seq[String] = {
     if (update) {
       updater.updateEditions()
     }

lib/scala/editions/src/main/scala/org/enso/editions/provider/EditionProvider.scala

@@ -15,5 +15,5 @@ trait EditionProvider {
   ): Either[EditionLoadingError, Editions.Raw.Edition]
 
   /** Finds all editions that are currently available. */
-  def findAvailableEditions(): Seq[String]
+  def findAvailableEditions(update: Boolean = false): Seq[String]
 }

lib/scala/editions/src/main/scala/org/enso/editions/provider/FileSystemEditionProvider.scala

@@ -51,7 +51,9 @@ class FileSystemEditionProvider(searchPaths: List[Path])
   }
 
   /** Finds all editions available on the [[searchPaths]]. */
-  override def findAvailableEditions(): Seq[String] =
+  override def findAvailableEditions(
+    ignoreUpdateRequest: Boolean
+  ): Seq[String] =
     searchPaths.flatMap(findEditionsAt).distinct
 
   private def findEditionName(path: Path): Option[String] =