Fix transitive module dependencies for scripts

This commit is contained in:
Natalia Selezneva
2018-04-09 13:57:37 +03:00
parent 2d5f5d65b2
commit a58bc7f301
5 changed files with 17 additions and 1 deletions
@@ -47,7 +47,7 @@ data class ScriptModuleInfo(
override fun dependencies(): List<IdeaModuleInfo> {
return arrayListOf<IdeaModuleInfo>(this).apply {
add(ScriptDependenciesInfo.ForFile(project, this@ScriptModuleInfo))
relatedModuleSourceInfo?.let { add(it) }
relatedModuleSourceInfo?.let { addAll(it.dependencies()) }
findJdk(externalDependencies, project)?.let { add(SdkInfo(project, it)) }
}
}
@@ -0,0 +1,3 @@
public class ClassFromModule1 {
}
@@ -0,0 +1,4 @@
val c1 = ClassFromModule1()
val c2 = ClassFromModule2()
// DEPENDENCIES: classpath:runtime-classes
@@ -0,0 +1,3 @@
public class ClassFromModule2 {
}
@@ -91,6 +91,12 @@ public class ScriptConfigurationHighlightingTestGenerated extends AbstractScript
doTest(fileName);
}
@TestMetadata("multiModule")
public void testMultiModule() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/script/definition/highlighting/multiModule/");
doTest(fileName);
}
@TestMetadata("noResolver")
public void testNoResolver() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/script/definition/highlighting/noResolver/");