Add test on cyclicly dependent Java 9 modules

idea/testData/multiModuleHighlighting/java9/cyclicDependency/main/module-info.java

@@ -0,0 +1,5 @@
+module main {
+    requires moduleA;
+    requires moduleB;
+    requires moduleC;
+}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/main/usage.kt

@@ -0,0 +1,10 @@
+import a.*
+import b.*
+import c.*
+
+fun usage(): String {
+    val a = A()
+    val b = B()
+    val c = C()
+    return "$a$b$c"
+}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleA/a/A.java

@@ -0,0 +1,3 @@
+package a;
+
+public class A {}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleA/module-info.java

@@ -0,0 +1,4 @@
+module moduleA {
+    exports a;
+    requires transitive moduleC;
+}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleB/b/B.java

@@ -0,0 +1,3 @@
+package b;
+
+public class B {}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleB/module-info.java

@@ -0,0 +1,4 @@
+module moduleB {
+    exports b;
+    requires transitive moduleA;
+}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleC/c/C.java

@@ -0,0 +1,3 @@
+package c;
+
+public class C {}

idea/testData/multiModuleHighlighting/java9/cyclicDependency/moduleC/module-info.java

@@ -0,0 +1,4 @@
+module moduleC {
+    exports c;
+    requires transitive moduleB;
+}

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt

@@ -83,4 +83,12 @@ class Java9MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         module("main").addDependency(module("dependency"))
         checkHighlightingInAllFiles()
     }
+
+    fun testCyclicDependency() = doTest {
+        val a = module("moduleA")
+        val b = module("moduleB")
+        val c = module("moduleC")
+        module("main").addDependency(a).addDependency(b).addDependency(c)
+        checkHighlightingInAllFiles()
+    }
 }

idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt

@@ -84,7 +84,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() {
             other: Module,
             dependencyScope: DependencyScope = DependencyScope.COMPILE,
             exported: Boolean = false
-    ) = ModuleRootModificationUtil.addDependency(this, other, dependencyScope, exported)
+    ): Module = this.apply { ModuleRootModificationUtil.addDependency(this, other, dependencyScope, exported) }
 
     protected fun Module.addLibrary(jar: File, name: String = KotlinJdkAndLibraryProjectDescriptor.LIBRARY_NAME) {
         ConfigLibraryUtil.addLibrary(NewLibraryEditor().apply {