Check that kotlin.stdlib is explicitly required in module-info

Writing a Jigsaw-modular Kotlin program which doesn't require
kotlin.stdlib doesn't make sense because it most likely will fail at
runtime, on access to anything from the standard library. Previously, we
checked that kotlin.stdlib was in the module graph, but that's not
enough, we should also check that the source module requires it.
'-Xallow-kotlin-package' can be used to disable the error.

Add a test checking that an indirect (transitive) dependency is also OK

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt

@@ -265,7 +265,7 @@ class ClasspathRootsResolver(
             }
         }
 
-        if (requireStdlibModule && sourceModule != null && KOTLIN_STDLIB_MODULE_NAME !in allDependencies) {
+        if (requireStdlibModule && sourceModule != null && !javaModuleGraph.reads(sourceModule.name, KOTLIN_STDLIB_MODULE_NAME)) {
             report(
                     ERROR,
                     "The Kotlin standard library is not found in the module graph. " +

compiler/testData/javaModules/dependOnManyModules/moduleD/module-info.java

@@ -2,4 +2,6 @@ module moduleD {
     requires moduleA;
     requires moduleB;
     requires moduleC;
-}
+
+    requires kotlin.stdlib;
+}

compiler/testData/javaModules/dependencyOnStdlib/namedWithIndirectDependencyViaOtherModule.txt

@@ -0,0 +1 @@
+OK

compiler/testData/javaModules/dependencyOnStdlib/namedWithIndirectDependencyViaOtherModule/module-info.java

@@ -0,0 +1,3 @@
+module namedWithIndirectDependencyViaOtherModule {
+    requires namedWithExplicitDependency;
+}

compiler/testData/javaModules/dependencyOnStdlib/namedWithIndirectDependencyViaOtherModule/test.kt

@@ -0,0 +1,6 @@
+import kotlin.text.Regex
+
+fun f1(): List<String?> = emptyList()
+fun f2(): Array<Lazy<Unit>> = arrayOf()
+fun f3(map: Map<Int, Regex>): Collection<Regex> =
+        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values

compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency.txt

@@ -1,34 +1,2 @@
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:1:20: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
+compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/module-info.java: error: the Kotlin standard library is not found in the module graph. Please ensure you have the 'requires kotlin.stdlib' clause in your module definition
-import kotlin.text.Regex
-                   ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:3:27: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-fun f1(): List<String?> = emptyList()
-                          ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:4:17: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-fun f2(): Array<Lazy<Unit>> = arrayOf()
-                ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:4:22: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-fun f2(): Array<Lazy<Unit>> = arrayOf()
-                     ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:5:22: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-fun f3(map: Map<Int, Regex>): Collection<Regex> =
-                     ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:5:42: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-fun f3(map: Map<Int, Regex>): Collection<Regex> =
-                                         ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:6:13: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values
-            ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:6:26: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values
-                         ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:6:31: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values
-                              ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:6:48: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values
-                                               ^
-compiler/testData/javaModules/dependencyOnStdlib/namedWithoutExplicitDependency/test.kt:6:61: error: symbol is declared in module 'kotlin.stdlib' which current module does not depend on
-        map.filterNot { (key, entry) -> "$key".equals(entry.toString(), ignoreCase = true) }.values
-                                                            ^
 COMPILATION_ERROR

compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java

@@ -2,4 +2,6 @@ module main {
     requires java.naming;
     requires jdk.net;
     requires oracle.desktop;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/multiReleaseLibrary/main/module-info.java

@@ -1,3 +1,5 @@
 module main {
     requires library;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/namedReadsTransitive/moduleC/module-info.java

@@ -1,3 +1,5 @@
 module moduleC {
     requires moduleB;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/nonTransitiveDoesNotAffectExplicitDependency/moduleD/module-info.java

@@ -1,4 +1,6 @@
 module moduleD {
     requires moduleC;
     requires moduleB;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/severalModulesWithTheSameName/main/module-info.java

@@ -1,3 +1,5 @@
 module main {
     requires dependency;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/simple/moduleB/module-info.java

@@ -1,3 +1,5 @@
 module moduleB {
     requires moduleA;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/simpleUseNonExportedPackage/moduleB/module-info.java

@@ -1,3 +1,5 @@
 module moduleB {
     requires moduleA;
+
+    requires kotlin.stdlib;
 }

compiler/testData/javaModules/specifyPathToModuleInfoInArguments/someOtherDirectoryWithTheActualModuleInfo/module-info.java

@@ -1,3 +1,5 @@
 module moduleB {
     requires moduleA;
+
+    requires kotlin.stdlib;
 }

compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt

@@ -227,8 +227,9 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() {
 
     fun testDependencyOnStdlib() {
         module("unnamed")
-        module("namedWithExplicitDependency")
+        val namedWithExplicitDependency = module("namedWithExplicitDependency")
         module("namedWithoutExplicitDependency")
+        module("namedWithIndirectDependencyViaOtherModule", listOf(namedWithExplicitDependency))
         module("namedWithIndirectDependencyViaReflect", listOf(ForTestCompileRuntime.reflectJarForTests()))
     }
 

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

@@ -1,3 +1,5 @@
 module main {
     requires library;
+
+    requires kotlin.stdlib;
 }

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

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea.caches.resolve
 
 import com.intellij.openapi.module.Module
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.MockLibraryUtil
@@ -41,9 +42,10 @@ class Java9MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
 
     fun testSimpleLibraryExportsPackage() = doTest {
         val jdk9Home = KotlinTestUtils.getJdk9HomeIfPossible() ?: return
+        // -Xallow-kotlin-package to avoid "require kotlin.stdlib" in module-info.java
         val library = MockLibraryUtil.compileJvmLibraryToJar(
                 testDataPath + "${getTestName(true)}/library", "library",
-                extraOptions = listOf("-jdk-home", jdk9Home.path),
+                extraOptions = listOf("-jdk-home", jdk9Home.path, "-Xallow-kotlin-package"),
                 useJava9 = true
         )