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

Search java.lang aliases also in kotlin.text package (for aliases to Appendable and StringBuilder)

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-10-06 18:22:29 +03:00
parent 5042158df5
commit ff01b3d41b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+1
View File
@@ -51,6 +51,7 @@ public abstract class KotlinBuiltIns {
private static final FqName ANNOTATION_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("annotation")); private static final FqName ANNOTATION_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("annotation"));
public static final FqName COLLECTIONS_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("collections")); public static final FqName COLLECTIONS_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("collections"));
public static final FqName RANGES_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("ranges")); public static final FqName RANGES_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("ranges"));
public static final FqName TEXT_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("text"));
public static final Set<FqName> BUILT_INS_PACKAGE_FQ_NAMES = setOf( public static final Set<FqName> BUILT_INS_PACKAGE_FQ_NAMES = setOf(
BUILT_INS_PACKAGE_FQ_NAME, BUILT_INS_PACKAGE_FQ_NAME,
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
+1 -1
View File
@@ -51,7 +51,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
} }
override val effectivelyExcludedImports: List<FqName> by storageManager.createLazyValue { override val effectivelyExcludedImports: List<FqName> by storageManager.createLazyValue {
val packagesWithAliases = listOf(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.COLLECTIONS_PACKAGE_FQ_NAME) val packagesWithAliases = listOf(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.TEXT_PACKAGE_FQ_NAME)
val dependencies = this.dependencies.sure { "Dependencies of module $id were not set" } val dependencies = this.dependencies.sure { "Dependencies of module $id were not set" }
val builtinTypeAliases = dependencies.allDependencies.filter { it != this }.flatMap { val builtinTypeAliases = dependencies.allDependencies.filter { it != this }.flatMap {
System.out.flush() System.out.flush()