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

Drop ModuleParameters, inline defaultImports everywhere

Browse Source
This commit is contained in:
Alexander Udalov
2016-10-11 10:47:14 +03:00
parent d335aea682
commit 2f616bdd33
13 changed files with 66 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsPlatform.kt
+11 -14
View File
@@ -19,27 +19,24 @@ package org.jetbrains.kotlin.js.resolve
import com.google.common.collect.ImmutableList
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ModuleParameters
import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.PlatformConfigurator
import org.jetbrains.kotlin.resolve.TargetPlatform
object JsPlatform : TargetPlatform("JS") {
override val defaultModuleParameters = object : ModuleParameters {
override val defaultImports: List<ImportPath> = ImmutableList.of(
ImportPath("java.lang.*"),
ImportPath("kotlin.*"),
ImportPath("kotlin.annotation.*"),
ImportPath("kotlin.collections.*"),
ImportPath("kotlin.ranges.*"),
ImportPath("kotlin.sequences.*"),
ImportPath("kotlin.text.*"),
ImportPath("kotlin.js.*")
)
}
override val defaultImports: List<ImportPath> = ImmutableList.of(
ImportPath("java.lang.*"),
ImportPath("kotlin.*"),
ImportPath("kotlin.annotation.*"),
ImportPath("kotlin.collections.*"),
ImportPath("kotlin.ranges.*"),
ImportPath("kotlin.sequences.*"),
ImportPath("kotlin.text.*"),
ImportPath("kotlin.js.*")
)
override val platformConfigurator: PlatformConfigurator = JsPlatformConfigurator
val builtIns: KotlinBuiltIns
get() = DefaultBuiltIns.Instance
}
}