[AA] KT-55566 StandaloneProjectFactory: Setup JDK default module roots

- Setup JDK default module roots in `StandaloneProjectFactory` (compare with `KotlinCoreEnvironment`). The implementation is a distilled version of `ClasspathRootsResolver`'s default module handling. - This fixes an issue where some LL FIR tests with JDK 17 and 11 had mismatched types between Kotlin and Java sources. ^KT-55566 fixed
2023-01-03 18:44:32 +01:00
parent e68111c218
commit a777ffcd8a
12 changed files with 97 additions and 71 deletions
@@ -260,7 +260,7 @@ class ClasspathRootsResolver(
        val rootModules = when {
            sourceModule != null -> listOf(sourceModule.name) + additionalModules
            addAllModulePathToRoots -> modules.map(JavaModule::name)
-            else -> computeDefaultRootModules() + additionalModules
+            else -> javaModuleFinder.computeDefaultRootModules() + additionalModules
        }

        val allDependencies = javaModuleGraph.getAllDependencies(rootModules)
@@ -282,14 +282,7 @@ class ClasspathRootsResolver(
            if (module == null) {
                report(ERROR, "Module $moduleName cannot be found in the module graph")
            } else {
-                module.moduleRoots.mapTo(result) { (root, isBinary, isBinarySignature) ->
-                    val type = when {
-                        isBinarySignature -> JavaRoot.RootType.BINARY_SIG
-                        isBinary -> JavaRoot.RootType.BINARY
-                        else -> JavaRoot.RootType.SOURCE
-                    }
-                    JavaRoot(root, type)
-                }
+                result.addAll(module.getJavaModuleRoots())
            }
        }

@@ -303,40 +296,6 @@ class ClasspathRootsResolver(
        }
    }

-    // See http://openjdk.java.net/jeps/261
-    private fun computeDefaultRootModules(): List<String> {
-        val result = arrayListOf<String>()
-
-        val systemModules = javaModuleFinder.systemModules.associateBy(JavaModule::name)
-        val javaSeExists = "java.se" in systemModules
-        if (javaSeExists) {
-            // The java.se module is a root, if it exists.
-            result.add("java.se")
-        }
-
-        fun JavaModule.Explicit.exportsAtLeastOnePackageUnqualified(): Boolean = moduleInfo.exports.any { it.toModules.isEmpty() }
-
-        if (!javaSeExists) {
-            // If it does not exist then every java.* module on the upgrade module path or among the system modules
-            // that exports at least one package, without qualification, is a root.
-            for ((name, module) in systemModules) {
-                if (name.startsWith("java.") && module.exportsAtLeastOnePackageUnqualified()) {
-                    result.add(name)
-                }
-            }
-        }
-
-        for ((name, module) in systemModules) {
-            // Every non-java.* module on the upgrade module path or among the system modules that exports at least one package,
-            // without qualification, is also a root.
-            if (!name.startsWith("java.") && module.exportsAtLeastOnePackageUnqualified()) {
-                result.add(name)
-            }
-        }
-
-        return result
-    }
-
    private fun report(severity: CompilerMessageSeverity, message: String, file: VirtualFile? = null) {
        if (messageCollector == null) {
            throw IllegalStateException("${if (file != null) file.path + ":" else ""}$severity: $message (no MessageCollector configured)")
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.cli.jvm.compiler
+
+import org.jetbrains.kotlin.cli.jvm.index.JavaRoot
+import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleFinder
+import org.jetbrains.kotlin.resolve.jvm.modules.JavaModule
+
+fun JavaModule.getJavaModuleRoots(): List<JavaRoot> =
+    moduleRoots.map { (root, isBinary, isBinarySignature) ->
+        val type = when {
+            isBinarySignature -> JavaRoot.RootType.BINARY_SIG
+            isBinary -> JavaRoot.RootType.BINARY
+            else -> JavaRoot.RootType.SOURCE
+        }
+        JavaRoot(root, type)
+    }
+
+/**
+ * Computes the JDK's default root modules. See [JEP 261: Module System](http://openjdk.java.net/jeps/261).
+ */
+fun CliJavaModuleFinder.computeDefaultRootModules(): List<String> {
+    val result = arrayListOf<String>()
+
+    val systemModules = systemModules.associateBy(JavaModule::name)
+    val javaSeExists = "java.se" in systemModules
+    if (javaSeExists) {
+        // The java.se module is a root, if it exists.
+        result.add("java.se")
+    }
+
+    fun JavaModule.Explicit.exportsAtLeastOnePackageUnqualified(): Boolean = moduleInfo.exports.any { it.toModules.isEmpty() }
+
+    if (!javaSeExists) {
+        // If it does not exist then every java.* module on the upgrade module path or among the system modules
+        // that exports at least one package, without qualification, is a root.
+        for ((name, module) in systemModules) {
+            if (name.startsWith("java.") && module.exportsAtLeastOnePackageUnqualified()) {
+                result.add(name)
+            }
+        }
+    }
+
+    for ((name, module) in systemModules) {
+        // Every non-java.* module on the upgrade module path or among the system modules that exports at least one package,
+        // without qualification, is also a root.
+        if (!name.startsWith("java.") && module.exportsAtLeastOnePackageUnqualified()) {
+            result.add(name)
+        }
+    }
+
+    return result
+}