Farewell, excluded imports from the platform. If anyone ever needs them again, they are buried in this commit.

This commit is contained in:
Ilya Gorbunov
2016-10-07 20:48:32 +03:00
parent f2c5fee1cf
commit 4236a4dd07
4 changed files with 1 additions and 12 deletions
@@ -31,8 +31,6 @@ object JvmPlatform : TargetPlatform("JVM") {
override val defaultModuleParameters = object : ModuleParameters { override val defaultModuleParameters = object : ModuleParameters {
override val defaultImports: List<ImportPath> override val defaultImports: List<ImportPath>
get() = DEFAULT_IMPORTS_FOR_JVM get() = DEFAULT_IMPORTS_FOR_JVM
override val excludedImports: List<FqName>
get() = EXCLUDED_IMPORTS_FOR_JVM
} }
override val platformConfigurator: PlatformConfigurator = JvmPlatformConfigurator override val platformConfigurator: PlatformConfigurator = JvmPlatformConfigurator
@@ -61,5 +59,3 @@ private val DEFAULT_IMPORTS_FOR_JVM: List<ImportPath> = ArrayList<ImportPath>().
addAllClassifiersFromScope(builtinPackageFragment.getMemberScope()) addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
} }
} }
private val EXCLUDED_IMPORTS_FOR_JVM: List<FqName> = emptyList()
@@ -50,7 +50,6 @@ interface ModuleDescriptor : DeclarationDescriptor, ModuleParameters {
interface ModuleParameters { interface ModuleParameters {
val defaultImports: List<ImportPath> val defaultImports: List<ImportPath>
val excludedImports: List<FqName> get() = emptyList()
object Empty : ModuleParameters { object Empty : ModuleParameters {
override val defaultImports: List<ImportPath> = emptyList() override val defaultImports: List<ImportPath> = emptyList()
@@ -71,7 +71,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
.mapNotNull { it.expandedType.constructor.declarationDescriptor?.fqNameSafe } .mapNotNull { it.expandedType.constructor.declarationDescriptor?.fqNameSafe }
.filter { nonKotlinDefaultImportedPackages.any(it::isChildOf) } .filter { nonKotlinDefaultImportedPackages.any(it::isChildOf) }
excludedImports + nonKotlinAliasedTypeFqNames nonKotlinAliasedTypeFqNames
} }
override fun getPackage(fqName: FqName): PackageViewDescriptor = packages(fqName) override fun getPackage(fqName: FqName): PackageViewDescriptor = packages(fqName)
@@ -62,12 +62,6 @@ public class ErrorUtils {
return emptyList(); return emptyList();
} }
@NotNull
@Override
public List<FqName> getExcludedImports() {
return emptyList();
}
@NotNull @NotNull
@Override @Override
public List<FqName> getEffectivelyExcludedImports() { public List<FqName> getEffectivelyExcludedImports() {