Exclude exceptions from java.lang package for which type aliases exist in kotlin package.

Add relevant note to the type aliases.
This commit is contained in:
Ilya Gorbunov
2016-08-11 20:21:21 +03:00
parent 0d7819e011
commit cf898ae357
2 changed files with 20 additions and 1 deletions
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.resolve.jvm.platform
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
import org.jetbrains.kotlin.descriptors.ModuleParameters
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap
import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -34,6 +35,8 @@ object JvmPlatform : TargetPlatform("JVM") {
get() = JavaToKotlinClassMap.INSTANCE
override val defaultImports: List<ImportPath>
get() = DEFAULT_IMPORTS_FOR_JVM
override val excludedImports: List<FqName>
get() = EXCLUDED_IMPORTS_FOR_JVM
}
override val platformConfigurator: PlatformConfigurator = JvmPlatformConfigurator
@@ -62,3 +65,17 @@ private val DEFAULT_IMPORTS_FOR_JVM: List<ImportPath> = ArrayList<ImportPath>().
addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
}
}
private val EXCLUDED_IMPORTS_FOR_JVM: List<FqName> = listOf(
"Error",
"Exception",
"RuntimeException",
"IllegalArgumentException",
"IllegalStateException",
"IndexOutOfBoundsException",
"UnsupportedOperationException",
"NumberFormatException",
"NullPointerException",
"ClassCastException",
"AssertionError"
).map { FqName("java.lang.$it") }