diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt index d52d8759874..2eeac2c1054 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt @@ -31,8 +31,6 @@ object JvmPlatform : TargetPlatform("JVM") { override val defaultModuleParameters = object : ModuleParameters { override val defaultImports: List get() = DEFAULT_IMPORTS_FOR_JVM - override val excludedImports: List - get() = EXCLUDED_IMPORTS_FOR_JVM } override val platformConfigurator: PlatformConfigurator = JvmPlatformConfigurator @@ -61,5 +59,3 @@ private val DEFAULT_IMPORTS_FOR_JVM: List = ArrayList(). addAllClassifiersFromScope(builtinPackageFragment.getMemberScope()) } } - -private val EXCLUDED_IMPORTS_FOR_JVM: List = emptyList() \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt index b45d99fdc0d..e93c38e100b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt @@ -50,7 +50,6 @@ interface ModuleDescriptor : DeclarationDescriptor, ModuleParameters { interface ModuleParameters { val defaultImports: List - val excludedImports: List get() = emptyList() object Empty : ModuleParameters { override val defaultImports: List = emptyList() diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt index e7d05e850bd..3736e0726ed 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt @@ -71,7 +71,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor( .mapNotNull { it.expandedType.constructor.declarationDescriptor?.fqNameSafe } .filter { nonKotlinDefaultImportedPackages.any(it::isChildOf) } - excludedImports + nonKotlinAliasedTypeFqNames + nonKotlinAliasedTypeFqNames } override fun getPackage(fqName: FqName): PackageViewDescriptor = packages(fqName) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 67ed32f09b5..6a9fab1a387 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -62,12 +62,6 @@ public class ErrorUtils { return emptyList(); } - @NotNull - @Override - public List getExcludedImports() { - return emptyList(); - } - @NotNull @Override public List getEffectivelyExcludedImports() {