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

Move static constants with builtin names to :core:descriptors.common module

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-16 22:57:12 +03:00
parent 2e92fe9be9
commit 7a7fe77b8e
180 changed files with 1085 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.descriptors.commonizer.utils
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.name.ClassId
@@ -16,7 +16,7 @@ internal val DEPRECATED_ANNOTATION_FQN: FqName = FqName(Deprecated::class.java.n
internal val DEPRECATED_ANNOTATION_CID: ClassId = internedClassId(DEPRECATED_ANNOTATION_FQN)
internal val STANDARD_KOTLIN_PACKAGE_FQNS: List<FqName> = listOf(
KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.intern(),
KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.intern(),
FqName("kotlinx").intern()
)
native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt
+2 -2
View File
@@ -7,10 +7,10 @@ package org.jetbrains.kotlin.builtins.konan
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE
import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE
import org.jetbrains.kotlin.storage.StorageManager
class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageManager) {
@@ -22,4 +22,4 @@ class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageMana
Name.identifier("SuspendFunction$parameterCount")
)
)!!
}
}
native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeThrowsChecker.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.resolve.konan.diagnostics
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
@@ -37,7 +37,7 @@ object NativeThrowsChecker : DeclarationChecker {
// Note: can't use subtyping, because CancellationException can be missing (e.g. for common code).
private val cancellationExceptionAndSupersClassIds = sequenceOf(
KotlinBuiltIns.FQ_NAMES.throwable,
KotlinBuiltInsNames.FqNames.throwable,
FqName("kotlin.Exception"),
FqName("kotlin.RuntimeException"),
FqName("kotlin.IllegalStateException"),