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

Module info has to be read under readAction in scriptDefinitionsFromDependencies

Browse Source 
#EA-220355 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-01-06 13:42:02 +01:00
parent aefad5cf5e
commit 93ce4c003f
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+23 -19
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.script package org.jetbrains.kotlin.idea.script
import com.intellij.ProjectTopics import com.intellij.ProjectTopics
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModuleRootEvent import com.intellij.openapi.roots.ModuleRootEvent
import com.intellij.openapi.roots.ModuleRootListener import com.intellij.openapi.roots.ModuleRootListener
@@ -96,28 +97,31 @@ private fun scriptDefinitionsFromDependencies(project: Project): TemplatesWithCp
return templatesFound return templatesFound
} }
// processing source roots from the same project first since the resources are copied to the classes roots only on compilation runReadAction {
project.allModules().forEach { module -> if (project.isDisposed) return@runReadAction
OrderEnumerator.orderEntries(module).withoutDepModules().withoutLibraries().withoutSdk().sourceRoots.forEach { root -> // processing source roots from the same project first since the resources are copied to the classes roots only on compilation
if (addTemplatesFromRoot(root)) { project.allModules().forEach { module ->
classpath.addAll(OrderEnumerator.orderEntries(module).withoutSdk().classesRoots.mapNotNull { OrderEnumerator.orderEntries(module).withoutDepModules().withoutLibraries().withoutSdk().sourceRoots.forEach { root ->
it.canonicalPath?.removeSuffix("!/").let(::File) if (addTemplatesFromRoot(root)) {
}) classpath.addAll(OrderEnumerator.orderEntries(module).withoutSdk().classesRoots.mapNotNull {
it.canonicalPath?.removeSuffix("!/").let(::File)
})
}
} }
} }
}
project.allModules().forEach { module -> project.allModules().forEach { module ->
// assuming that all libraries are placed into classes roots // assuming that all libraries are placed into classes roots
// TODO: extract exact library dependencies instead of putting all module dependencies into classpath // TODO: extract exact library dependencies instead of putting all module dependencies into classpath
OrderEnumerator.orderEntries(module).withoutDepModules().withoutSdk().classesRoots.forEach { root -> OrderEnumerator.orderEntries(module).withoutDepModules().withoutSdk().classesRoots.forEach { root ->
if (addTemplatesFromRoot(root)) { if (addTemplatesFromRoot(root)) {
// minimizing the classpath needed to use the template by taking cp only from modules with new templates found // minimizing the classpath needed to use the template by taking cp only from modules with new templates found
// on the other hand the approach may fail if some module contains a template without proper classpath, while // on the other hand the approach may fail if some module contains a template without proper classpath, while
// the other has properly configured classpath, so assuming that the dependencies are set correctly everywhere // the other has properly configured classpath, so assuming that the dependencies are set correctly everywhere
classpath.addAll(OrderEnumerator.orderEntries(module).withoutSdk().classesRoots.mapNotNull { classpath.addAll(OrderEnumerator.orderEntries(module).withoutSdk().classesRoots.mapNotNull {
it.canonicalPath?.removeSuffix("!/").let(::File) it.canonicalPath?.removeSuffix("!/").let(::File)
}) })
}
} }
} }
} }