azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, return a set in JavaModuleGraph.getAllDependencies

Browse Source 
To prevent duplicate roots to be added
This commit is contained in:
Alexander Udalov
2017-07-05 16:38:21 +03:00
parent ec6e4f2469
commit 3808ecbd1e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt
+1 -2
View File
@@ -191,8 +191,7 @@ internal class ClasspathRootsResolver(
else -> computeDefaultRootModules() + additionalModules else -> computeDefaultRootModules() + additionalModules
} }
val allDependencies = javaModuleGraph.getAllDependencies(rootModules).toMutableList() val allDependencies = javaModuleGraph.getAllDependencies(rootModules)
if (allDependencies.any { moduleName -> javaModuleFinder.findModule(moduleName) is JavaModule.Automatic }) { if (allDependencies.any { moduleName -> javaModuleFinder.findModule(moduleName) is JavaModule.Automatic }) {
// According to java.lang.module javadoc, if at least one automatic module is added to the module graph, // According to java.lang.module javadoc, if at least one automatic module is added to the module graph,
// all observable automatic modules should be added. // all observable automatic modules should be added.
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
+3 -3
View File
@@ -22,8 +22,8 @@ class JavaModuleGraph(finder: JavaModuleFinder) {
private val module: (String) -> JavaModule? = private val module: (String) -> JavaModule? =
LockBasedStorageManager.NO_LOCKS.createMemoizedFunctionWithNullableValues(finder::findModule) LockBasedStorageManager.NO_LOCKS.createMemoizedFunctionWithNullableValues(finder::findModule)
fun getAllDependencies(moduleNames: List<String>): List<String> { fun getAllDependencies(moduleNames: List<String>): LinkedHashSet<String> {
val visited = moduleNames.toMutableSet() val visited = LinkedHashSet(moduleNames)
// Every module implicitly depends on java.base // Every module implicitly depends on java.base
visited += "java.base" visited += "java.base"
@@ -55,7 +55,7 @@ class JavaModuleGraph(finder: JavaModuleFinder) {
} }
} }
return visited.toList() return visited
} }
fun reads(moduleName: String, dependencyName: String): Boolean { fun reads(moduleName: String, dependencyName: String): Boolean {