From 5c572aa56ee1efe1973750eba4e30a9bae8a6d7b Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 4 Apr 2018 19:01:44 +0300
Subject: [PATCH] Add java.lang & kotlin.jvm to default star importing scope

---
 .../kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt
index 09907825846..826ad5cd3ef 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt
@@ -20,7 +20,10 @@ class FirDefaultStarImportingScope(session: FirSession, lookupInFir: Boolean = f
         "kotlin.ranges",
         "kotlin.sequences",
         "kotlin.text",
-        "kotlin.io"
+        "kotlin.io",
+        "java.lang",
+        // We should not (probably) import it for non-JVM projects
+        "kotlin.jvm"
     ).map {
         val fqName = FqName(it)
         FirResolvedPackageStarImport(