diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index d25471e410f..9f1c4c26c84 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -62,8 +62,8 @@ import org.jetbrains.org.objectweb.asm.commons.Method; import java.util.*; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.ENUM_VALUES; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.ENUM_VALUE_OF; +import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES; +import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isGenericToArray; import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isNonGenericToArray; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index e92fd6c8021..1c7e6a6cba6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -12,7 +12,7 @@ import kotlin.text.StringsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.CodegenUtil; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.context.CodegenContext; @@ -405,7 +405,7 @@ public class JvmCodegenUtil { // The Result class is the only inline class in the standard library without special rules for equality. // We only call Result.equals-impl0 if we are compiling for Kotlin 1.4 or later. Otherwise, the code // might well be running against an older version of the standard library. - if (DescriptorUtils.getFqNameSafe(classDescriptor).equals(KotlinBuiltInsNames.RESULT_FQ_NAME)) { + if (DescriptorUtils.getFqNameSafe(classDescriptor).equals(StandardNames.RESULT_FQ_NAME)) { return state.getLanguageVersionSettings().getApiVersion().compareTo(ApiVersion.KOTLIN_1_4) >= 0; } else { return ((DeserializedClassDescriptor) descriptor).getMetadataVersion().isAtLeast(1, 1, 16); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt index 2306309710d..f064ab86e4a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.codegen.coroutines import com.intellij.openapi.project.Project import org.jetbrains.kotlin.backend.common.COROUTINE_SUSPENDED_NAME import org.jetbrains.kotlin.backend.common.isBuiltInSuspendCoroutineUninterceptedOrReturn -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isBuiltinFunctionalClassDescriptor import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding @@ -312,7 +312,7 @@ private fun FunctionDescriptor.getContinuationParameterTypeOfSuspendFunction(isR fun ModuleDescriptor.getResult(kotlinType: KotlinType) = module.resolveTopLevelClass( - KotlinBuiltInsNames.RESULT_FQ_NAME, + StandardNames.RESULT_FQ_NAME, NoLookupLocation.FROM_BACKEND )?.defaultType?.let { KotlinTypeFactory.simpleType( @@ -501,7 +501,7 @@ fun FunctionDescriptor.isSuspendLambdaOrLocalFunction() = this.isSuspend && when fun FunctionDescriptor.isLocalSuspendFunctionNotSuspendLambda() = isSuspendLambdaOrLocalFunction() && this !is AnonymousFunctionDescriptor @JvmField -val EXPERIMENTAL_CONTINUATION_ASM_TYPE = KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.topLevelClassAsmType() +val EXPERIMENTAL_CONTINUATION_ASM_TYPE = StandardNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.topLevelClassAsmType() @JvmField -val RELEASE_CONTINUATION_ASM_TYPE = KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.topLevelClassAsmType() +val RELEASE_CONTINUATION_ASM_TYPE = StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.topLevelClassAsmType() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt index 8585073b981..dab012217e7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.codegen.inline import com.intellij.psi.PsiElement import com.intellij.util.ArrayUtil -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive import org.jetbrains.kotlin.codegen.context.ClosureContext @@ -675,7 +675,7 @@ abstract class InlineCodegen( if (callableDescriptor is FictitiousArrayConstructor) return true val name = callableDescriptor.name.asString() return (name == "arrayOf" || name == "emptyArray") && callableDescriptor.containingDeclaration.let { container -> - container is PackageFragmentDescriptor && container.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + container is PackageFragmentDescriptor && container.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt index 4afc4aa2de2..fddf9908ab3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.codegen.inline import org.jetbrains.kotlin.backend.common.isBuiltInIntercepted import org.jetbrains.kotlin.backend.common.isBuiltInSuspendCoroutineUninterceptedOrReturn import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.coroutines.createMethodNodeForCoroutineContext import org.jetbrains.kotlin.codegen.coroutines.createMethodNodeForIntercepted @@ -55,7 +55,7 @@ internal fun generateInlineIntrinsic( private fun isSpecialEnumMethod(descriptor: FunctionDescriptor): Boolean { val containingDeclaration = descriptor.containingDeclaration as? PackageFragmentDescriptor ?: return false - if (containingDeclaration.fqName != KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) { + if (containingDeclaration.fqName != StandardNames.BUILT_INS_PACKAGE_FQ_NAME) { return false } if (descriptor.typeParameters.size != 1) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java index a2443fba38b..8feb66f79ab 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableList; import kotlin.text.StringsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.config.JvmTarget; @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.org.objectweb.asm.Type; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.*; +import static org.jetbrains.kotlin.builtins.StandardNames.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class IntrinsicMethods { @@ -70,15 +70,15 @@ public class IntrinsicMethods { public IntrinsicMethods(JvmTarget jvmTarget, boolean canReplaceStdlibRuntimeApiBehavior, boolean shouldThrowNpeOnExplicitEqualsForBoxedNull) { intrinsicsMap.registerIntrinsic(KOTLIN_JVM, RECEIVER_PARAMETER_FQ_NAME, "javaClass", -1, JavaClassProperty.INSTANCE); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltInsNames.FqNames.kClass, "java", -1, new KClassJavaProperty()); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltInsNames.FqNames.kClass, "javaObjectType", -1, new KClassJavaObjectTypeProperty()); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltInsNames.FqNames.kClass, "javaPrimitiveType", -1, new KClassJavaPrimitiveTypeProperty()); - intrinsicsMap.registerIntrinsic(KotlinBuiltInsNames.FqNames.kCallable.toSafe(), null, "name", -1, new KCallableNameProperty()); + intrinsicsMap.registerIntrinsic(KOTLIN_JVM, StandardNames.FqNames.kClass, "java", -1, new KClassJavaProperty()); + intrinsicsMap.registerIntrinsic(KOTLIN_JVM, StandardNames.FqNames.kClass, "javaObjectType", -1, new KClassJavaObjectTypeProperty()); + intrinsicsMap.registerIntrinsic(KOTLIN_JVM, StandardNames.FqNames.kClass, "javaPrimitiveType", -1, new KClassJavaPrimitiveTypeProperty()); + intrinsicsMap.registerIntrinsic(StandardNames.FqNames.kCallable.toSafe(), null, "name", -1, new KCallableNameProperty()); intrinsicsMap.registerIntrinsic(new FqName("kotlin.jvm.internal.unsafe"), null, "monitorEnter", 1, MonitorInstruction.MONITOR_ENTER); intrinsicsMap.registerIntrinsic(new FqName("kotlin.jvm.internal.unsafe"), null, "monitorExit", 1, MonitorInstruction.MONITOR_EXIT); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltInsNames.FqNames.array, "isArrayOf", 0, new IsArrayOf()); + intrinsicsMap.registerIntrinsic(KOTLIN_JVM, StandardNames.FqNames.array, "isArrayOf", 0, new IsArrayOf()); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltInsNames.FqNames.kProperty0, "isInitialized", -1, LateinitIsInitialized.INSTANCE); + intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, StandardNames.FqNames.kProperty0, "isInitialized", -1, LateinitIsInitialized.INSTANCE); intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, null, "arrayOf", 1, new ArrayOf()); @@ -87,7 +87,7 @@ public class IntrinsicMethods { ImmutableList primitiveCastMethods = OperatorConventions.NUMBER_CONVERSIONS.asList(); for (Name method : primitiveCastMethods) { String methodName = method.asString(); - declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.number, methodName, 0, NUMBER_CAST); + declareIntrinsicFunction(StandardNames.FqNames.number, methodName, 0, NUMBER_CAST); for (PrimitiveType type : PrimitiveType.NUMBER_TYPES) { declareIntrinsicFunction(type.getTypeFqName(), methodName, 0, NUMBER_CAST); } @@ -139,20 +139,20 @@ public class IntrinsicMethods { declareBinaryOp("or", IOR); declareBinaryOp("xor", IXOR); - declareIntrinsicFunction(KotlinBuiltInsNames.FqNames._boolean, "not", 0, new Not()); + declareIntrinsicFunction(StandardNames.FqNames._boolean, "not", 0, new Not()); - declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.string, "plus", 1, new Concat()); - declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.string, "get", 1, new StringGetChar()); + declareIntrinsicFunction(StandardNames.FqNames.string, "plus", 1, new Concat()); + declareIntrinsicFunction(StandardNames.FqNames.string, "get", 1, new StringGetChar()); if (canReplaceStdlibRuntimeApiBehavior) { - intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, KotlinBuiltInsNames.FqNames.string, "trimMargin", 1, new TrimMargin()); - intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, KotlinBuiltInsNames.FqNames.string, "trimIndent", 0, new TrimIndent()); + intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, StandardNames.FqNames.string, "trimMargin", 1, new TrimMargin()); + intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, StandardNames.FqNames.string, "trimIndent", 0, new TrimIndent()); } - declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.cloneable, "clone", 0, CLONE); + declareIntrinsicFunction(StandardNames.FqNames.cloneable, "clone", 0, CLONE); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltInsNames.FqNames.any, "toString", 0, TO_STRING); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltInsNames.FqNames.string, "plus", 1, STRING_PLUS); + intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, StandardNames.FqNames.any, "toString", 0, TO_STRING); + intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, StandardNames.FqNames.string, "plus", 1, STRING_PLUS); intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, null, "arrayOfNulls", 1, new NewArray()); for (PrimitiveType type : PrimitiveType.values()) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.kt index 7b0ff612bdb..5dcaf142997 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.intrinsics -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COLLECTIONS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COLLECTIONS_PACKAGE_FQ_NAME import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.Callable import org.jetbrains.kotlin.codegen.CallableMethod diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt index 773d66ebb1f..9e9725a3503 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.codegen.intrinsics -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.AsmTypes diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt index d6f9de7050c..f3c7c3f16c3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.codegen.range import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor import org.jetbrains.kotlin.descriptors.* @@ -84,10 +84,10 @@ fun getRangeOrProgressionElementType(rangeType: KotlinType): KotlinType? { COMPARABLE_RANGE_FQN -> rangeType.arguments.singleOrNull()?.type UINT_RANGE_FQN, UINT_PROGRESSION_FQN -> - rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltInsNames.FqNames.uIntFqName) + rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(StandardNames.FqNames.uIntFqName) ULONG_RANGE_FQN, ULONG_PROGRESSION_FQN -> - rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltInsNames.FqNames.uLongFqName) + rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(StandardNames.FqNames.uLongFqName) else -> null } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt index f16231383d4..4e5ed42857d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.codegen.state import com.intellij.openapi.util.text.StringUtil import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.RESULT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.RESULT_FQ_NAME import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt index f86c9bad0a8..17d39d6a5a5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.state -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt index 9aa8e00497c..ad00e39b831 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.serialization.builtins import com.intellij.openapi.util.Disposer -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInClassDescriptorFactory import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots @@ -100,9 +100,9 @@ class BuiltInsSerializer(dependOnOldBuiltIns: Boolean) : MetadataSerializer(Buil // Since Kotlin 1.1, we always discard this class during deserialization (see ClassDeserializer.kt). private fun createCloneable(module: ModuleDescriptor): ClassDescriptor { val factory = JvmBuiltInClassDescriptorFactory(LockBasedStorageManager.NO_LOCKS, module) { - EmptyPackageFragmentDescriptor(module, KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) + EmptyPackageFragmentDescriptor(module, StandardNames.BUILT_INS_PACKAGE_FQ_NAME) } - return factory.createClass(ClassId.topLevel(KotlinBuiltInsNames.FqNames.cloneable.toSafe())) + return factory.createClass(ClassId.topLevel(StandardNames.FqNames.cloneable.toSafe())) ?: error("Could not create kotlin.Cloneable in $module") } } diff --git a/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt b/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt index 954539c481e..4223f3fa908 100644 --- a/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt +++ b/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.config -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -17,9 +17,9 @@ fun LanguageVersionSettings.isReleaseCoroutines() = supportsFeature(LanguageFeat private fun coroutinesPackageFqName(isReleaseCoroutines: Boolean): FqName { return if (isReleaseCoroutines) - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE + StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE else - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL + StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL } fun LanguageVersionSettings.coroutinesIntrinsicsPackageFqName() = @@ -33,7 +33,7 @@ fun LanguageVersionSettings.restrictsSuspensionFqName() = fun FqName.isBuiltInCoroutineContext(languageVersionSettings: LanguageVersionSettings) = if (languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)) - this == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) + this == StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) else - this == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) || - this == KotlinBuiltInsNames.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + this == StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) || + this == StandardNames.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index aad22940653..34f70f97bc9 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.backend import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAMES import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.SourceElement diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 9708df408b5..81c59aa64bb 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.deserialization -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSettings import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -210,7 +210,7 @@ private fun FirRegularClassBuilder.addSerializableIfNeeded(classId: ClassId) { } private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId) { - if (classId.packageFqName != KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) return + if (classId.packageFqName != StandardNames.BUILT_INS_PACKAGE_FQ_NAME) return if (classId.shortClassName !in ARRAY_CLASSES) return superTypeRefs += buildResolvedTypeRef { type = ConeClassLikeTypeImpl( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/suspendTypeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/suspendTypeUtils.kt index bd70b4976b6..f568419dbf2 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/suspendTypeUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/suspendTypeUtils.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.deserialization -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.ClassId -val CONTINUATION_INTERFACE_CLASS_ID = ClassId.topLevel(KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE) +val CONTINUATION_INTERFACE_CLASS_ID = ClassId.topLevel(StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index 0ff2a122fd0..097a27f36c1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.* @@ -395,7 +395,7 @@ fun CallableId.isInvoke() = isKFunctionInvoke() || callableName.asString() == "invoke" && className?.asString()?.startsWith("Function") == true - && packageName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + && packageName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME fun CallableId.isKFunctionInvoke() = callableName.asString() == "invoke" diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt index 0b94edcc7a1..93b43d1c0ff 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -56,7 +56,7 @@ class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider: Kot private fun loadBuiltIns(): List { val classLoader = this::class.java.classLoader val streamProvider = { path: String -> classLoader?.getResourceAsStream(path) ?: ClassLoader.getSystemResourceAsStream(path) } - val packageFqNames = KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES + val packageFqNames = StandardNames.BUILT_INS_PACKAGE_FQ_NAMES return packageFqNames.map { fqName -> val resourcePath = BuiltInSerializerProtocol.getBuiltInsFilePath(fqName) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt index bf3d5c9dbe3..261e05080df 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.Name class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopeProvider) : FirSymbolProvider(session) { companion object { val CLONEABLE: Name = Name.identifier("Cloneable") - val CLONEABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE) + val CLONEABLE_CLASS_ID: ClassId = ClassId(StandardNames.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE) val CLONE: Name = Name.identifier("clone") } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt index 0bf2132e084..3faaa1641e3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.diagnostics.ConeIntermediateDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic @@ -148,9 +148,9 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver { typeRef.valueParameters.map { it.returnTypeRef.coneType } + listOf(typeRef.returnTypeRef.coneType) val classId = if (typeRef.isSuspend) { - KotlinBuiltInsNames.getSuspendFunctionClassId(typeRef.parametersCount) + StandardNames.getSuspendFunctionClassId(typeRef.parametersCount) } else { - KotlinBuiltInsNames.getFunctionClassId(typeRef.parametersCount) + StandardNames.getFunctionClassId(typeRef.parametersCount) } val attributes = typeRef.annotations.computeTypeAttributes() return ConeClassLikeTypeImpl( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt index 401cd4c9264..e50edc045e1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession @@ -495,10 +495,10 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty } override fun TypeConstructorMarker.getPrimitiveType() = - getClassFqNameUnsafe()?.let(KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType::get) + getClassFqNameUnsafe()?.let(StandardNames.FqNames.fqNameToPrimitiveType::get) override fun TypeConstructorMarker.getPrimitiveArrayType() = - getClassFqNameUnsafe()?.let(KotlinBuiltInsNames.FqNames.arrayClassFqNameToPrimitiveType::get) + getClassFqNameUnsafe()?.let(StandardNames.FqNames.arrayClassFqNameToPrimitiveType::get) override fun TypeConstructorMarker.isUnderKotlinPackage() = getClassFqNameUnsafe()?.startsWith(Name.identifier("kotlin")) == true diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/SyntheticElementUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/SyntheticElementUtils.kt index 1e9d9e4def9..2450ac0f5cb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/SyntheticElementUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/SyntheticElementUtils.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiMethod import com.intellij.psi.SyntheticElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames fun isSyntheticValuesOrValueOfMethod(method: PsiMethod): Boolean { if (method !is SyntheticElement) return false - return KotlinBuiltInsNames.ENUM_VALUE_OF.asString() == method.name || KotlinBuiltInsNames.ENUM_VALUES.asString() == method.name + return StandardNames.ENUM_VALUE_OF.asString() == method.name || StandardNames.ENUM_VALUES.asString() == method.name } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/JavaActualAnnotationArgumentExtractor.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/JavaActualAnnotationArgumentExtractor.kt index 75748d417fc..2ffcca26007 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/JavaActualAnnotationArgumentExtractor.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/multiplatform/JavaActualAnnotationArgumentExtractor.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve.jvm.multiplatform -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.load.java.components.JavaPropertyInitializerEvaluatorImpl @@ -68,7 +68,7 @@ class JavaActualAnnotationArgumentExtractor : ExpectedActualDeclarationChecker.A is JavaPrimitiveType -> { val primitiveType = type.type // void.class is not representable in Kotlin, we approximate it by Unit::class - ?: return KClassValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.unit.toSafe()), 0) + ?: return KClassValue(ClassId.topLevel(StandardNames.FqNames.unit.toSafe()), 0) if (arrayDimensions > 0) { KClassValue(ClassId.topLevel(primitiveType.arrayTypeFqName), arrayDimensions - 1) } else { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt index e037d5cee16..1c89a9d2d55 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -238,7 +238,7 @@ class AnnotationChecker( } fun applicableTargetSet(classDescriptor: ClassDescriptor): Set? { - val targetEntryDescriptor = classDescriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.target) ?: return null + val targetEntryDescriptor = classDescriptor.annotations.findAnnotation(StandardNames.FqNames.target) ?: return null return loadAnnotationTargets(targetEntryDescriptor) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt index 1e30553aa02..aa56d037e33 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.resolve import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.ModuleDescriptor @@ -76,7 +76,7 @@ class CollectionLiteralResolver( expression: KtCollectionLiteralExpression, callName: Name ): Collection { - val memberScopeOfKotlinPackage = module.getPackage(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME).memberScope + val memberScopeOfKotlinPackage = module.getPackage(StandardNames.BUILT_INS_PACKAGE_FQ_NAME).memberScope return memberScopeOfKotlinPackage.getContributedFunctions(callName, KotlinLookupLocation(expression)) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt index b2a8d57c816..ae9402dd3f7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve import com.google.common.collect.ImmutableSet import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -976,7 +976,7 @@ class DeclarationsChecker( if (containingDeclaration !is ClassDescriptor) continue if (visitedClasses.contains(containingDeclaration)) continue - if (DescriptorUtils.getFqName(containingDeclaration) == KotlinBuiltInsNames.FqNames.any) { + if (DescriptorUtils.getFqName(containingDeclaration) == StandardNames.FqNames.any) { return true } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt index d4d93a5fcae..765afd913b8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.resolve import com.google.common.collect.Lists import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -175,7 +175,7 @@ class DelegatedPropertyResolver( } private fun KtPsiFactory.createExpressionForProperty(): KtExpression { - return createExpression("null as ${KotlinBuiltInsNames.FqNames.kPropertyFqName.asString()}<*>") + return createExpression("null as ${StandardNames.FqNames.kPropertyFqName.asString()}<*>") } /* Resolve getValue() or setValue() methods from delegate */ diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index 0202a6f275b..138a5d0e756 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -306,7 +306,7 @@ class FunctionDescriptorResolver( private fun KotlinType.removeParameterNameAnnotation(): KotlinType { if (this is TypeUtils.SpecialType) return this - val parameterNameAnnotation = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.parameterName) ?: return this + val parameterNameAnnotation = annotations.findAnnotation(StandardNames.FqNames.parameterName) ?: return this return replaceAnnotations(Annotations.create(annotations.filter { it != parameterNameAnnotation })) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index e63b410a230..cdb0addd792 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PropertyAccessorDescriptorImpl @@ -148,7 +148,7 @@ class VarianceCheckerCore( if (classifierDescriptor is TypeParameterDescriptor) { val declarationVariance = classifierDescriptor.varianceWithManual() if (!declarationVariance.allowsPosition(position) - && !type.annotations.hasAnnotation(KotlinBuiltInsNames.FqNames.unsafeVariance) + && !type.annotations.hasAnnotation(StandardNames.FqNames.unsafeVariance) ) { val varianceConflictDiagnosticData = VarianceConflictDiagnosticData(containingType, classifierDescriptor, position) val diagnostic = diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt index c5e0f2c4c47..bf15bf9b0a7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve.calls.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/TypeOfChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/TypeOfChecker.kt index c83f4065549..87e34fe13b7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/TypeOfChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/TypeOfChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.calls.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/coroutineCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/coroutineCallChecker.kt index 73cadeb4a03..c6e2cfa6968 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/coroutineCallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/coroutineCallChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.calls.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.coroutines.hasSuspendFunctionType import org.jetbrains.kotlin.descriptors.* @@ -36,13 +36,13 @@ import org.jetbrains.kotlin.utils.addToStdlib.cast import org.jetbrains.kotlin.utils.addToStdlib.safeAs val COROUTINE_CONTEXT_1_2_20_FQ_NAME = - KotlinBuiltInsNames.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + StandardNames.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) val COROUTINE_CONTEXT_1_2_30_FQ_NAME = - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) val COROUTINE_CONTEXT_1_3_FQ_NAME = - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) + StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) fun FunctionDescriptor.isBuiltInCoroutineContext(languageVersionSettings: LanguageVersionSettings) = (this as? PropertyGetterDescriptor)?.correspondingProperty?.fqNameSafe?.isBuiltInCoroutineContext(languageVersionSettings) == true diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/AnnotationClassTargetAndRetentionChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/AnnotationClassTargetAndRetentionChecker.kt index b835175ab4f..aba08a6d7ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/AnnotationClassTargetAndRetentionChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/AnnotationClassTargetAndRetentionChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -31,8 +31,8 @@ class AnnotationClassTargetAndRetentionChecker : DeclarationChecker { val retention = descriptor.getAnnotationRetention() ?: KotlinRetention.RUNTIME if (targets.contains(KotlinTarget.EXPRESSION) && retention != KotlinRetention.SOURCE) { - val retentionAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.retention) - val targetAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.target) + val retentionAnnotation = descriptor.annotations.findAnnotation(StandardNames.FqNames.retention) + val targetAnnotation = descriptor.annotations.findAnnotation(StandardNames.FqNames.target) val diagnostics = if (context.languageVersionSettings.supportsFeature(LanguageFeature.RestrictRetentionForExpressionAnnotations)) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/DeprecatedSinceKotlinAnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/DeprecatedSinceKotlinAnnotationChecker.kt index 7eb60c2a383..79d9dbd6a91 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/DeprecatedSinceKotlinAnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/DeprecatedSinceKotlinAnnotationChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor @@ -25,14 +25,14 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs object DeprecatedSinceKotlinAnnotationChecker : DeclarationChecker { override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { - val deprecatedSinceAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecatedSinceKotlin) ?: return + val deprecatedSinceAnnotation = descriptor.annotations.findAnnotation(StandardNames.FqNames.deprecatedSinceKotlin) ?: return val deprecatedSinceAnnotationPsi = deprecatedSinceAnnotation.source.getPsi() as? KtAnnotationEntry ?: return - val deprecatedAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecated) + val deprecatedAnnotation = descriptor.annotations.findAnnotation(StandardNames.FqNames.deprecated) val deprecatedSinceAnnotationName = deprecatedSinceAnnotationPsi.typeReference ?: return - if (descriptor.fqNameOrNull()?.isSubpackageOf(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) == false) { + if (descriptor.fqNameOrNull()?.isSubpackageOf(StandardNames.BUILT_INS_PACKAGE_FQ_NAME) == false) { context.trace.report( Errors.DEPRECATED_SINCE_KOTLIN_OUTSIDE_KOTLIN_SUBPACKAGE.on( deprecatedSinceAnnotationName diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalMarkerDeclarationAnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalMarkerDeclarationAnnotationChecker.kt index 15cac15d7c8..45bf75eb8fe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalMarkerDeclarationAnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalMarkerDeclarationAnnotationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve.checkers -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget @@ -70,7 +70,7 @@ class ExperimentalMarkerDeclarationAnnotationChecker(private val module: ModuleD val targetEntry = entries.associate { entry -> entry to trace.bindingContext.get(BindingContext.ANNOTATION, entry) } .entries - .firstOrNull { (_, descriptor) -> descriptor != null && descriptor.fqName == KotlinBuiltInsNames.FqNames.target } + .firstOrNull { (_, descriptor) -> descriptor != null && descriptor.fqName == StandardNames.FqNames.target } ?: return val (entry, descriptor) = targetEntry val allowedTargets = AnnotationChecker.loadAnnotationTargets(descriptor!!) ?: return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt index e6716ca7ba0..c5987b39dfa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve.checkers -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor @@ -38,7 +38,7 @@ object PublishedApiUsageChecker { for (entry in declaration.annotationEntries) { val annotationDescriptor = trace.get(BindingContext.ANNOTATION, entry) ?: continue - if (annotationDescriptor.fqName == KotlinBuiltInsNames.FqNames.publishedApi) { + if (annotationDescriptor.fqName == StandardNames.FqNames.publishedApi) { trace.report(Errors.NON_INTERNAL_PUBLISHED_API.on(entry)) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt index de6a5f514f0..a74303ed84b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve.checkers -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.* @@ -59,6 +59,6 @@ internal fun KotlinType.isResultType(): Boolean { private fun DeclarationDescriptor.isResultClass(): Boolean { val container = containingDeclaration ?: return false return container is PackageFragmentDescriptor && - container.fqName == KotlinBuiltInsNames.RESULT_FQ_NAME.parent() && - name == KotlinBuiltInsNames.RESULT_FQ_NAME.shortName() + container.fqName == StandardNames.RESULT_FQ_NAME.parent() && + name == StandardNames.RESULT_FQ_NAME.shortName() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index 1f9ea4261dd..7ec2595116c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -11,7 +11,7 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.TypeConversionUtil import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -1018,7 +1018,7 @@ private class ConstantExpressionEvaluatorVisitor( } private fun checkAccessibilityOfUnsignedTypes(): Boolean { - val uInt = constantExpressionEvaluator.module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uInt) ?: return false + val uInt = constantExpressionEvaluator.module.findClassAcrossModuleDependencies(StandardNames.FqNames.uInt) ?: return false val accessibility = uInt.checkSinceKotlinVersionAccessibility(languageVersionSettings) // Case `NotAccessibleButWasExperimental` will be checked later in `checkExperimentalityOfConstantLiteral` return accessibility is SinceKotlinAccessibility.Accessible diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt index 5e74865d949..0f326a986b9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.deprecation import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -201,11 +201,11 @@ class DeprecationResolver( } private fun DeclarationDescriptor.addDeprecationIfPresent(result: MutableList) { - val annotation = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED) + val annotation = annotations.findAnnotation(StandardNames.FqNames.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED) if (annotation != null) { val deprecatedByAnnotation = DeprecatedByAnnotation.create( - annotation, annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecatedSinceKotlin), + annotation, annotations.findAnnotation(StandardNames.FqNames.deprecatedSinceKotlin), this, deprecationSettings.propagatedToOverrides(annotation), languageVersionSettings.apiVersion ) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt index 04b963e4ab7..11db7df1ce1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableSet import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.psi.PsiElement import com.intellij.util.containers.ContainerUtil -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Severity @@ -152,7 +152,7 @@ abstract class KotlinSuppressCache { } private fun processAnnotation(builder: ImmutableSet.Builder, annotationDescriptor: AnnotationDescriptor) { - if (annotationDescriptor.fqName != KotlinBuiltInsNames.FqNames.suppress) return + if (annotationDescriptor.fqName != StandardNames.FqNames.suppress) return // We only add strings and skip other values to facilitate recovery in presence of erroneous code for (arrayValue in annotationDescriptor.allValueArguments.values) { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt index d8374d237a3..a1973a9e325 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.ir import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.lower.LocalDeclarationsLowering import org.jetbrains.kotlin.builtins.* -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies @@ -318,7 +318,7 @@ abstract class Symbols(val context: T, irBuiltIns: function.getPackageFragment()!!.fqName.asString() == "kotlin" && function.valueParameters.isEmpty() && symbol.owner.extensionReceiverParameter?.type?.classOrNull?.owner.let { receiverClass -> - receiverClass?.fqNameWhenAvailable?.toUnsafe() == KotlinBuiltInsNames.FqNames.kProperty0 + receiverClass?.fqNameWhenAvailable?.toUnsafe() == StandardNames.FqNames.kProperty0 } } diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt index 66ab00b0f67..c5141058ce7 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction @@ -72,8 +72,8 @@ class FlattenStringConcatenationLowering(val context: CommonBackendContext) : Fi // The version for nullable strings has FqName kotlin.plus, the version for non-nullable strings // is a member function of kotlin.String (with FqName kotlin.String.plus) private val PARENT_NAMES = setOf( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, - KotlinBuiltInsNames.FqNames.string.toSafe() + StandardNames.BUILT_INS_PACKAGE_FQ_NAME, + StandardNames.FqNames.string.toSafe() ) /** @return true if the given expression is a call to [String.plus] */ @@ -108,7 +108,7 @@ class FlattenStringConcatenationLowering(val context: CommonBackendContext) : Fi return dispatchReceiverParameter == null && extensionReceiverParameter?.type?.isNullableAny() == true - && fqNameWhenAvailable?.parent() == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + && fqNameWhenAvailable?.parent() == StandardNames.BUILT_INS_PACKAGE_FQ_NAME } /** @return true if the given expression is a call to [toString] */ diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SpecialBridgeMethods.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SpecialBridgeMethods.kt index 8f8c25536dd..ebe0cd2a5ed 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SpecialBridgeMethods.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SpecialBridgeMethods.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.ir.allOverridden -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction @@ -63,46 +63,46 @@ class SpecialBridgeMethods(val context: CommonBackendContext) { IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, bridge.valueParameters[1].symbol) private val specialMethodsWithDefaults = mapOf( - makeDescription(KotlinBuiltInsNames.FqNames.collection, "contains", 1) to + makeDescription(StandardNames.FqNames.collection, "contains", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltInsNames.FqNames.mutableCollection, "remove", 1) to + makeDescription(StandardNames.FqNames.mutableCollection, "remove", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1, needsArgumentBoxing = true), - makeDescription(KotlinBuiltInsNames.FqNames.map, "containsKey", 1) to + makeDescription(StandardNames.FqNames.map, "containsKey", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltInsNames.FqNames.map, "containsValue", 1) to + makeDescription(StandardNames.FqNames.map, "containsValue", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltInsNames.FqNames.mutableMap, "remove", 2) to + makeDescription(StandardNames.FqNames.mutableMap, "remove", 2) to SpecialMethodWithDefaultInfo(::constFalse, 2), - makeDescription(KotlinBuiltInsNames.FqNames.list, "indexOf", 1) to + makeDescription(StandardNames.FqNames.list, "indexOf", 1) to SpecialMethodWithDefaultInfo(::constMinusOne, 1), - makeDescription(KotlinBuiltInsNames.FqNames.list, "lastIndexOf", 1) to + makeDescription(StandardNames.FqNames.list, "lastIndexOf", 1) to SpecialMethodWithDefaultInfo(::constMinusOne, 1), - makeDescription(KotlinBuiltInsNames.FqNames.map, "getOrDefault", 2) to + makeDescription(StandardNames.FqNames.map, "getOrDefault", 2) to SpecialMethodWithDefaultInfo(::getSecondArg, 1, needsGenericSignature = true), - makeDescription(KotlinBuiltInsNames.FqNames.map, "get", 1) to + makeDescription(StandardNames.FqNames.map, "get", 1) to SpecialMethodWithDefaultInfo(::constNull, 1, needsGenericSignature = true), - makeDescription(KotlinBuiltInsNames.FqNames.mutableMap, "remove", 1) to + makeDescription(StandardNames.FqNames.mutableMap, "remove", 1) to SpecialMethodWithDefaultInfo(::constNull, 1, needsGenericSignature = true) ) private val specialProperties = mapOf( - makeDescription(KotlinBuiltInsNames.FqNames.collection, "size") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.map, "size") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.charSequence.toSafe(), "length") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.map, "keys") to BuiltInWithDifferentJvmName(needsGenericSignature = true), - makeDescription(KotlinBuiltInsNames.FqNames.map, "values") to BuiltInWithDifferentJvmName(needsGenericSignature = true), - makeDescription(KotlinBuiltInsNames.FqNames.map, "entries") to BuiltInWithDifferentJvmName(needsGenericSignature = true) + makeDescription(StandardNames.FqNames.collection, "size") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.map, "size") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.charSequence.toSafe(), "length") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.map, "keys") to BuiltInWithDifferentJvmName(needsGenericSignature = true), + makeDescription(StandardNames.FqNames.map, "values") to BuiltInWithDifferentJvmName(needsGenericSignature = true), + makeDescription(StandardNames.FqNames.map, "entries") to BuiltInWithDifferentJvmName(needsGenericSignature = true) ) private val specialMethods = mapOf( - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toByte") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toShort") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toInt") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toLong") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toFloat") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.number.toSafe(), "toDouble") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.charSequence.toSafe(), "get", 1) to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltInsNames.FqNames.mutableList, "removeAt", 1) to BuiltInWithDifferentJvmName(needsGenericSignature = true) + makeDescription(StandardNames.FqNames.number.toSafe(), "toByte") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.number.toSafe(), "toShort") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.number.toSafe(), "toInt") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.number.toSafe(), "toLong") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.number.toSafe(), "toFloat") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.number.toSafe(), "toDouble") to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.charSequence.toSafe(), "get", 1) to BuiltInWithDifferentJvmName(), + makeDescription(StandardNames.FqNames.mutableList, "removeAt", 1) to BuiltInWithDifferentJvmName(needsGenericSignature = true) ) val specialMethodNames = (specialMethodsWithDefaults + specialMethods).map { (description) -> description.name }.toHashSet() diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt index f254cf47734..6905fc08e0c 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/util/IrTypeUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.util -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.ir.declarations.IrClass diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt index b1d6ab77737..dc3fc9fb9ae 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.jvm import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor import org.jetbrains.kotlin.backend.common.ir.createParameterDeclarations -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.SamType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.FilteredAnnotations @@ -106,7 +106,7 @@ class JvmGeneratorExtensions(private val generateFacades: Boolean = true) : Gene descriptor.getParentJavaStaticClassScope() private val annotationPackage = - IrExternalPackageFragmentImpl(DescriptorlessExternalPackageFragmentSymbol(), KotlinBuiltInsNames.ANNOTATION_PACKAGE_FQ_NAME) + IrExternalPackageFragmentImpl(DescriptorlessExternalPackageFragmentSymbol(), StandardNames.ANNOTATION_PACKAGE_FQ_NAME) private val flexibleNullabilityAnnotationClass = IrFactoryImpl.buildClass { kind = ClassKind.ANNOTATION_CLASS @@ -123,6 +123,6 @@ class JvmGeneratorExtensions(private val generateFacades: Boolean = true) : Gene companion object { val FLEXIBLE_NULLABILITY_ANNOTATION_FQ_NAME = - KotlinBuiltInsNames.ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier("FlexibleNullability")) + StandardNames.ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier("FlexibleNullability")) } } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt index 63fb8053148..a45c13336b6 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt @@ -10,7 +10,7 @@ package org.jetbrains.kotlin.backend.jvm import org.jetbrains.kotlin.backend.common.ir.Symbols import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor import org.jetbrains.kotlin.backend.jvm.intrinsics.IrIntrinsicMethods -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.coroutines.INVOKE_SUSPEND_METHOD_NAME import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_CALL_RESULT_NAME import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME @@ -200,7 +200,7 @@ class JvmSymbols( get() = TODO("not implemented") private val kDeclarationContainer: IrClassSymbol = - createClass(KotlinBuiltInsNames.FqNames.kDeclarationContainer.toSafe(), ClassKind.INTERFACE, Modality.ABSTRACT) + createClass(StandardNames.FqNames.kDeclarationContainer.toSafe(), ClassKind.INTERFACE, Modality.ABSTRACT) val javaLangClass: IrClassSymbol = createClass(FqName("java.lang.Class")) { klass -> @@ -225,12 +225,12 @@ class JvmSymbols( val assertionErrorConstructor = javaLangAssertionError.constructors.single() val continuationClass: IrClassSymbol = - createClass(KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE, ClassKind.INTERFACE) { klass -> + createClass(StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE, ClassKind.INTERFACE) { klass -> klass.addTypeParameter("T", irBuiltIns.anyNType, Variance.IN_VARIANCE) } private val resultClassStub: IrClassSymbol = - createClass(KotlinBuiltInsNames.RESULT_FQ_NAME, classIsInline = true) { klass -> + createClass(StandardNames.RESULT_FQ_NAME, classIsInline = true) { klass -> klass.addTypeParameter("T", irBuiltIns.anyNType, Variance.OUT_VARIANCE) klass.addConstructor { isPrimary = true }.apply { addValueParameter("value", irBuiltIns.anyNType) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt index 560c640cca4..1f4271ee945 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.backend.common.ir.ir2string import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmGeneratorExtensions import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.TypeAnnotationCollector import org.jetbrains.kotlin.codegen.TypePathInfo @@ -373,7 +373,7 @@ private val RETENTION_PARAMETER_NAME = Name.identifier("value") private fun IrClass.getAnnotationRetention(): KotlinRetention? { val retentionArgument = - getAnnotation(KotlinBuiltInsNames.FqNames.retention)?.getValueArgument(RETENTION_PARAMETER_NAME) + getAnnotation(StandardNames.FqNames.retention)?.getValueArgument(RETENTION_PARAMETER_NAME) as? IrGetEnumValue?: return null val retentionArgumentValue = retentionArgument.symbol.owner return KotlinRetention.valueOf(retentionArgumentValue.name.asString()) @@ -393,7 +393,7 @@ private fun IrConstructorCall.getValueArgument(name: Name): IrExpression? { private val TARGET_ALLOWED_TARGETS = Name.identifier("allowedTargets") private fun IrClass.applicableTargetSet(): Set? { - val targetEntry = getAnnotation(KotlinBuiltInsNames.FqNames.target) ?: return null + val targetEntry = getAnnotation(StandardNames.FqNames.target) ?: return null return loadAnnotationTargets(targetEntry) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt index 16d344bd82a..d72c83a6df5 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.isCompiledToJvmDefault import org.jetbrains.kotlin.backend.jvm.ir.isStaticInlineClassReplacement import org.jetbrains.kotlin.backend.jvm.ir.propertyIfAccessor import org.jetbrains.kotlin.backend.jvm.lower.suspendFunctionOriginal -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.codegen.replaceValueParametersIn @@ -130,7 +130,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { else null) ?: context.state.moduleName private fun IrFunction.isPublishedApi(): Boolean = - propertyIfAccessor.annotations.hasAnnotation(KotlinBuiltInsNames.FqNames.publishedApi) + propertyIfAccessor.annotations.hasAnnotation(StandardNames.FqNames.publishedApi) fun mapReturnType(declaration: IrDeclaration, sw: JvmSignatureWriter? = null): Type { if (declaration !is IrFunction) { @@ -369,7 +369,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { } private val IrSimpleFunction.isBuiltIn: Boolean - get() = getPackageFragment()?.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME || + get() = getPackageFragment()?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME || parent.safeAs()?.fqNameWhenAvailable?.toUnsafe()?.let(JavaToKotlinClassMap::mapKotlinToJava) != null // From BuiltinMethodsWithDifferentJvmName.isBuiltinFunctionWithDifferentNameInJvm, BuiltinMethodsWithDifferentJvmName.getJvmName diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt index 39c5424972c..4128671f9fc 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/irCodegenUtils.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.ir.ir2string import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.inline.SourceMapper diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt index 82d7d58614e..0ee1925879b 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.backend.jvm.intrinsics import org.jetbrains.kotlin.backend.jvm.JvmSymbols -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrPackageFragment @@ -46,11 +46,11 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { private val intrinsicsMap = ( listOf( Key(kotlinJvm, FqName("T"), "", emptyList()) to JavaClassProperty, - Key(kotlinJvm, KotlinBuiltInsNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaObjectType, - Key(kotlinJvm, KotlinBuiltInsNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaPrimitiveType, + Key(kotlinJvm, StandardNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaObjectType, + Key(kotlinJvm, StandardNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaPrimitiveType, Key( kotlinJvm, - KotlinBuiltInsNames.FqNames.kClass.toSafe(), + StandardNames.FqNames.kClass.toSafe(), "", emptyList() ) to KClassJavaProperty, @@ -58,49 +58,49 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { kotlinJvmInternalUnsafe, null, "access\$monitorEnter", - listOf(KotlinBuiltInsNames.FqNames.any.toSafe()) + listOf(StandardNames.FqNames.any.toSafe()) ) to MonitorInstruction.MONITOR_ENTER, Key( kotlinJvmInternalUnsafe, null, "access\$monitorExit", - listOf(KotlinBuiltInsNames.FqNames.any.toSafe()) + listOf(StandardNames.FqNames.any.toSafe()) ) to MonitorInstruction.MONITOR_EXIT, Key( kotlinJvm, - KotlinBuiltInsNames.FqNames.array.toSafe(), + StandardNames.FqNames.array.toSafe(), "isArrayOf", emptyList() ) to IsArrayOf, Key( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, + StandardNames.BUILT_INS_PACKAGE_FQ_NAME, null, "arrayOfNulls", - listOf(KotlinBuiltInsNames.FqNames._int.toSafe()) + listOf(StandardNames.FqNames._int.toSafe()) ) to NewArray, Key( - KotlinBuiltInsNames.FqNames.cloneable.toSafe(), + StandardNames.FqNames.cloneable.toSafe(), null, "clone", emptyList() ) to Clone, Key( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, + StandardNames.BUILT_INS_PACKAGE_FQ_NAME, null, "enumValues", listOf() ) to EnumValues, Key( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, + StandardNames.BUILT_INS_PACKAGE_FQ_NAME, null, "enumValueOf", - listOf(KotlinBuiltInsNames.FqNames.string.toSafe()) + listOf(StandardNames.FqNames.string.toSafe()) ) to EnumValueOf, Key( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, - KotlinBuiltInsNames.FqNames.string.toSafe(), + StandardNames.BUILT_INS_PACKAGE_FQ_NAME, + StandardNames.FqNames.string.toSafe(), "plus", - listOf(KotlinBuiltInsNames.FqNames.any.toSafe()) + listOf(StandardNames.FqNames.any.toSafe()) ) to StringPlus, irBuiltIns.eqeqSymbol.toKey()!! to Equals(KtTokens.EQEQ), irBuiltIns.eqeqeqSymbol.toKey()!! to Equals(KtTokens.EQEQEQ), diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt index b4fb1d599fa..9748e7878ec 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IteratorNext.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.backend.jvm.intrinsics import org.jetbrains.kotlin.backend.jvm.JvmBackendContext -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COLLECTIONS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COLLECTIONS_PACKAGE_FQ_NAME import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt index d3695fdaa6e..89e686b53e4 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.ClassLoweringPass import org.jetbrains.kotlin.backend.common.ir.addChild import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention @@ -127,7 +127,7 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC } private fun generateDocumentedAnnotation(irClass: IrClass) { - if (!irClass.hasAnnotation(KotlinBuiltInsNames.FqNames.mustBeDocumented) || + if (!irClass.hasAnnotation(StandardNames.FqNames.mustBeDocumented) || irClass.hasAnnotation(FqName("java.lang.annotation.Documented")) ) return @@ -228,7 +228,7 @@ private fun IrConstructorCall.getValueArgument(name: Name): IrExpression? { private val TARGET_ALLOWED_TARGETS = Name.identifier("allowedTargets") private fun IrClass.applicableTargetSet(): Set? { - val targetEntry = getAnnotation(KotlinBuiltInsNames.FqNames.target) ?: return null + val targetEntry = getAnnotation(StandardNames.FqNames.target) ?: return null return loadAnnotationTargets(targetEntry) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt index e571c5560c9..5162c7de4a9 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.backend.common.lower.* import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.ASSERTIONS_DISABLED_FIELD_NAME import org.jetbrains.kotlin.config.JVMAssertionsMode import org.jetbrains.kotlin.ir.IrElement @@ -129,7 +129,7 @@ private class AssertionLowering(private val context: JvmBackendContext) : } private val IrFunction.isAssert: Boolean - get() = name.asString() == "assert" && getPackageFragment()?.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + get() = name.asString() == "assert" && getPackageFragment()?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME } private fun IrBuilderWithScope.getJavaClass(backendContext: JvmBackendContext, irClass: IrClass) = diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionNVarargBridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionNVarargBridgeLowering.kt index 2f9f860db11..824f46350b0 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionNVarargBridgeLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionNVarargBridgeLowering.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder import org.jetbrains.kotlin.backend.jvm.ir.irArray -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -150,7 +150,7 @@ private class FunctionNVarargBridgeLowering(val context: JvmBackendContext) : val fqName = clazz.parent.safeAs()?.fqName ?: return false return when { name.startsWith("Function") -> - fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME || fqName == FUNCTIONS_PACKAGE_FQ_NAME + fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME || fqName == FUNCTIONS_PACKAGE_FQ_NAME name.startsWith("KFunction") -> fqName == REFLECT_PACKAGE_FQ_NAME else -> false @@ -169,11 +169,11 @@ private class FunctionNVarargBridgeLowering(val context: JvmBackendContext) : } private val FUNCTIONS_PACKAGE_FQ_NAME = - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + StandardNames.BUILT_INS_PACKAGE_FQ_NAME .child(Name.identifier("jvm")) .child(Name.identifier("functions")) private val REFLECT_PACKAGE_FQ_NAME = - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + StandardNames.BUILT_INS_PACKAGE_FQ_NAME .child(Name.identifier("reflect")) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt index d90c8c9c264..472b18b844b 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.* -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.IrStatement @@ -398,7 +398,7 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F ?: return false // Before version 1.4, we cannot rely on the Result.equals-impl0 method - return (leftClass.fqNameWhenAvailable != KotlinBuiltInsNames.RESULT_FQ_NAME) || + return (leftClass.fqNameWhenAvailable != StandardNames.RESULT_FQ_NAME) || context.state.languageVersionSettings.apiVersion >= ApiVersion.KOTLIN_1_4 } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/VarargLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/VarargLowering.kt index 3504c0b3049..bc4f7257844 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/VarargLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/VarargLowering.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.IrArrayBuilder import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder import org.jetbrains.kotlin.backend.jvm.ir.irArray import org.jetbrains.kotlin.backend.jvm.ir.irArrayOf -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.UnsignedType import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET @@ -106,7 +106,7 @@ private class VarargLowering(val context: JvmBackendContext) : FileLoweringPass, private val IrFunctionSymbol.isEmptyArray: Boolean get() = owner.name.asString() == "emptyArray" && - (owner.parent as? IrPackageFragment)?.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME + (owner.parent as? IrPackageFragment)?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME companion object { private val PRIMITIVE_ARRAY_OF_NAMES: Set = @@ -122,7 +122,7 @@ private class VarargLowering(val context: JvmBackendContext) : FileLoweringPass, is IrPackageFragment -> directParent else -> return false } - return parent.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME && + return parent.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME && name.asString().let { it in PRIMITIVE_ARRAY_OF_NAMES || it == ARRAY_OF_NAME } && extensionReceiverParameter == null && dispatchReceiverParameter == null && diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt index 100cec0a6e9..283edd93c3d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.backend.jvm.lower.inlineclasses import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.state.md5base64 import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrStatementOriginImpl @@ -114,7 +114,7 @@ object InlineClassAbi { internal val IrType.requiresMangling: Boolean get() { val irClass = erasedUpperBound - return irClass.isInline && irClass.fqNameWhenAvailable != KotlinBuiltInsNames.RESULT_FQ_NAME + return irClass.isInline && irClass.fqNameWhenAvailable != StandardNames.RESULT_FQ_NAME } internal val IrFunction.fullValueParameterList: List diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/Utils.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/Utils.kt index 2cf3b2155c4..1e0fa463421 100644 --- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/Utils.kt +++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/Utils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.interpreter -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.ir.interpreter.builtins.evaluateIntrinsicAnnotation import org.jetbrains.kotlin.ir.interpreter.stack.Variable @@ -207,7 +207,7 @@ internal fun IrFunction.getCapitalizedFileName() = this.file.name.replace(".kt", internal fun IrType.isUnsigned() = this.isUByte() || this.isUShort() || this.isUInt() || this.isULong() internal fun IrType.isPrimitiveArray(): Boolean { - return this.getClass()?.fqNameWhenAvailable?.toUnsafe()?.let { KotlinBuiltInsNames.isPrimitiveArray(it) } ?: false + return this.getClass()?.fqNameWhenAvailable?.toUnsafe()?.let { StandardNames.isPrimitiveArray(it) } ?: false } internal fun IrType.isFunction() = this.getClass()?.fqNameWhenAvailable?.asString()?.startsWith("kotlin.Function") ?: false diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt index f41c0968ae5..bf63ae9d10d 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.psi2ir.transformations import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.builtins.isSuspendFunctionType import org.jetbrains.kotlin.descriptors.* @@ -452,7 +452,7 @@ internal class InsertImplicitCasts( // There are several such functions (one for each built-in integer type: Byte, Short, Int, Long), // we need one that takes Int. val coercionFunction = targetType.constructor.declarationDescriptor!!.module - .getPackage(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) + .getPackage(StandardNames.BUILT_INS_PACKAGE_FQ_NAME) .memberScope.getContributedFunctions(Name.identifier(coercionFunName), NoLookupLocation.FROM_BACKEND) .find { val extensionReceiver = it.extensionReceiverParameter diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt index 37cc6c0d5e8..5a4c3910cde 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.descriptors -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.descriptors.* diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt index eb05af4c22d..11f7a3f8fae 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.types -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -202,10 +202,10 @@ interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesCon override fun SimpleTypeMarker.asArgumentList() = this as IrSimpleType override fun TypeConstructorMarker.isAnyConstructor(): Boolean = - this is IrClassSymbol && isClassWithFqName(KotlinBuiltInsNames.FqNames.any) + this is IrClassSymbol && isClassWithFqName(StandardNames.FqNames.any) override fun TypeConstructorMarker.isNothingConstructor(): Boolean = - this is IrClassSymbol && isClassWithFqName(KotlinBuiltInsNames.FqNames.nothing) + this is IrClassSymbol && isClassWithFqName(StandardNames.FqNames.nothing) override fun SimpleTypeMarker.isSingleClassifierType() = true @@ -246,7 +246,7 @@ interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesCon override fun SimpleTypeMarker.isExtensionFunction(): Boolean { require(this is IrSimpleType) - return this.hasAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) + return this.hasAnnotation(StandardNames.FqNames.extensionFunctionType) } override fun SimpleTypeMarker.typeDepth(): Int { @@ -364,7 +364,7 @@ interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesCon while (true) { val parent = declaration.parent if (parent is IrPackageFragment) { - return parent.fqName.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME) + return parent.fqName.startsWith(StandardNames.BUILT_INS_PACKAGE_NAME) } declaration = parent as? IrDeclaration ?: return false } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeUtils.kt index 6ea31af707d..03ccaa0ec6e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeUtils.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.types -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns import org.jetbrains.kotlin.ir.symbols.FqNameEqualityChecker import org.jetbrains.kotlin.ir.symbols.IrClassSymbol @@ -47,7 +47,7 @@ fun IrType.isNullable(): Boolean = } val IrType.isBoxedArray: Boolean - get() = classOrNull?.owner?.fqNameWhenAvailable == KotlinBuiltInsNames.FqNames.array.toSafe() + get() = classOrNull?.owner?.fqNameWhenAvailable == StandardNames.FqNames.array.toSafe() fun IrType.getArrayElementType(irBuiltIns: IrBuiltIns): IrType = if (isBoxedArray) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypePredicates.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypePredicates.kt index b149370b6d3..7abb1ca2f51 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypePredicates.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypePredicates.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.types -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol @@ -32,42 +32,42 @@ private fun classFqNameEquals(symbol: IrClassSymbol, fqName: FqNameUnsafe): Bool private fun classFqNameEquals(declaration: IrClass, fqName: FqNameUnsafe): Boolean = declaration.name == fqName.shortName() && fqName == declaration.fqNameWhenAvailable?.toUnsafe() -fun IrType.isAny(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.any) -fun IrType.isNullableAny(): Boolean = isNullableClassType(KotlinBuiltInsNames.FqNames.any) +fun IrType.isAny(): Boolean = isNotNullClassType(StandardNames.FqNames.any) +fun IrType.isNullableAny(): Boolean = isNullableClassType(StandardNames.FqNames.any) -fun IrType.isString(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.string) -fun IrType.isNullableString(): Boolean = isNullableClassType(KotlinBuiltInsNames.FqNames.string) -fun IrType.isStringClassType(): Boolean = isClassType(KotlinBuiltInsNames.FqNames.string) -fun IrType.isArray(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.array) -fun IrType.isNullableArray(): Boolean = isNullableClassType(KotlinBuiltInsNames.FqNames.array) -fun IrType.isCollection(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.collection.toUnsafe()) -fun IrType.isNothing(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.nothing) -fun IrType.isKClass(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.kClass) +fun IrType.isString(): Boolean = isNotNullClassType(StandardNames.FqNames.string) +fun IrType.isNullableString(): Boolean = isNullableClassType(StandardNames.FqNames.string) +fun IrType.isStringClassType(): Boolean = isClassType(StandardNames.FqNames.string) +fun IrType.isArray(): Boolean = isNotNullClassType(StandardNames.FqNames.array) +fun IrType.isNullableArray(): Boolean = isNullableClassType(StandardNames.FqNames.array) +fun IrType.isCollection(): Boolean = isNotNullClassType(StandardNames.FqNames.collection.toUnsafe()) +fun IrType.isNothing(): Boolean = isNotNullClassType(StandardNames.FqNames.nothing) +fun IrType.isKClass(): Boolean = isNotNullClassType(StandardNames.FqNames.kClass) -fun IrType.isPrimitiveType(): Boolean = KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType.keys.any { isNotNullClassType(it) } -fun IrType.isNullablePrimitiveType(): Boolean = KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType.keys.any { isNullableClassType(it) } +fun IrType.isPrimitiveType(): Boolean = StandardNames.FqNames.fqNameToPrimitiveType.keys.any { isNotNullClassType(it) } +fun IrType.isNullablePrimitiveType(): Boolean = StandardNames.FqNames.fqNameToPrimitiveType.keys.any { isNullableClassType(it) } fun IrType.isMarkedNullable() = (this as? IrSimpleType)?.hasQuestionMark ?: false -fun IrType.isUnit() = isNotNullClassType(KotlinBuiltInsNames.FqNames.unit) +fun IrType.isUnit() = isNotNullClassType(StandardNames.FqNames.unit) -fun IrType.isBoolean(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._boolean) -fun IrType.isChar(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._char) -fun IrType.isByte(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._byte) -fun IrType.isShort(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._short) -fun IrType.isInt(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._int) -fun IrType.isLong(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._long) -fun IrType.isUByte(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.uByteFqName.toUnsafe()) -fun IrType.isUShort(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.uShortFqName.toUnsafe()) -fun IrType.isUInt(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.uIntFqName.toUnsafe()) -fun IrType.isULong(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.uLongFqName.toUnsafe()) -fun IrType.isFloat(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._float) -fun IrType.isDouble(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames._double) -fun IrType.isNumber(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.number) +fun IrType.isBoolean(): Boolean = isNotNullClassType(StandardNames.FqNames._boolean) +fun IrType.isChar(): Boolean = isNotNullClassType(StandardNames.FqNames._char) +fun IrType.isByte(): Boolean = isNotNullClassType(StandardNames.FqNames._byte) +fun IrType.isShort(): Boolean = isNotNullClassType(StandardNames.FqNames._short) +fun IrType.isInt(): Boolean = isNotNullClassType(StandardNames.FqNames._int) +fun IrType.isLong(): Boolean = isNotNullClassType(StandardNames.FqNames._long) +fun IrType.isUByte(): Boolean = isNotNullClassType(StandardNames.FqNames.uByteFqName.toUnsafe()) +fun IrType.isUShort(): Boolean = isNotNullClassType(StandardNames.FqNames.uShortFqName.toUnsafe()) +fun IrType.isUInt(): Boolean = isNotNullClassType(StandardNames.FqNames.uIntFqName.toUnsafe()) +fun IrType.isULong(): Boolean = isNotNullClassType(StandardNames.FqNames.uLongFqName.toUnsafe()) +fun IrType.isFloat(): Boolean = isNotNullClassType(StandardNames.FqNames._float) +fun IrType.isDouble(): Boolean = isNotNullClassType(StandardNames.FqNames._double) +fun IrType.isNumber(): Boolean = isNotNullClassType(StandardNames.FqNames.number) -fun IrType.isComparable(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.comparable.toUnsafe()) -fun IrType.isCharSequence(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.charSequence) -fun IrType.isIterable(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.iterable.toUnsafe()) +fun IrType.isComparable(): Boolean = isNotNullClassType(StandardNames.FqNames.comparable.toUnsafe()) +fun IrType.isCharSequence(): Boolean = isNotNullClassType(StandardNames.FqNames.charSequence) +fun IrType.isIterable(): Boolean = isNotNullClassType(StandardNames.FqNames.iterable.toUnsafe()) fun IrType.isSequence(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.sequences.Sequence")) fun IrType.isBooleanArray(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.BooleanArray")) @@ -79,5 +79,5 @@ fun IrType.isLongArray(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.Long fun IrType.isFloatArray(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.FloatArray")) fun IrType.isDoubleArray(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.DoubleArray")) -fun IrType.isKotlinResult(): Boolean = isNotNullClassType(KotlinBuiltInsNames.RESULT_FQ_NAME.toUnsafe()) -fun IrType.isNullableContinuation(): Boolean = isNullableClassType(KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.toUnsafe()) +fun IrType.isKotlinResult(): Boolean = isNotNullClassType(StandardNames.RESULT_FQ_NAME.toUnsafe()) +fun IrType.isNullableContinuation(): Boolean = isNullableClassType(StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.toUnsafe()) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt index 1df2c1edb20..187251cd769 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.asJava.elements.KotlinLightTypeParameterListBuilder import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.psiType import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil @@ -317,7 +317,7 @@ internal fun KtModifierListOwner.isHiddenByDeprecation(support: KtUltraLightSupp annotation.looksLikeDeprecated() } if (annotations.isNotEmpty()) { // some candidates found - val deprecated = support.findAnnotation(this, KotlinBuiltInsNames.FqNames.deprecated)?.second + val deprecated = support.findAnnotation(this, StandardNames.FqNames.deprecated)?.second return (deprecated?.argumentValue("level") as? EnumValue)?.enumEntryName?.asString() == "HIDDEN" } else { return false @@ -362,7 +362,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu val modifierList = this.modifierList ?: return false if (modifierList.annotationEntries.isEmpty()) return false - val deprecatedFqName = KotlinBuiltInsNames.FqNames.deprecated + val deprecatedFqName = StandardNames.FqNames.deprecated val deprecatedName = deprecatedFqName.shortName().asString() for (annotationEntry in modifierList.annotationEntries) { @@ -375,7 +375,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu if (fqName.asString() == deprecatedName) return true } - return support?.findAnnotation(this, KotlinBuiltInsNames.FqNames.deprecated) !== null + return support?.findAnnotation(this, StandardNames.FqNames.deprecated) !== null } private fun toQualifiedName(userType: KtUserType): FqName? { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt index 08d6640199d..30a78d43dac 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt @@ -13,7 +13,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameValuePair import org.jetbrains.kotlin.asJava.classes.KtUltraLightSimpleAnnotation import org.jetbrains.kotlin.asJava.classes.KtUltraLightSupport -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.ArrayValue diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index 9a12e88563c..f2c7dcf2e40 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.KtNodeTypes; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.kdoc.psi.api.KDocElement; import org.jetbrains.kotlin.lexer.KtToken; import org.jetbrains.kotlin.lexer.KtTokens; @@ -178,7 +178,7 @@ public class KtPsiUtil { List annotationEntries = modifierList.getAnnotationEntries(); for (KtAnnotationEntry annotation : annotationEntries) { Name shortName = annotation.getShortName(); - if (KotlinBuiltInsNames.FqNames.deprecated.shortName().equals(shortName)) { + if (StandardNames.FqNames.deprecated.shortName().equals(shortName)) { return true; } } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/PostponedArgumentsAnalyzer.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/PostponedArgumentsAnalyzer.kt index 45c5db83b56..bd7e2d665db 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/PostponedArgumentsAnalyzer.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/PostponedArgumentsAnalyzer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve.calls.components -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.getReceiverTypeFromFunctionType import org.jetbrains.kotlin.builtins.getValueParameterTypesFromFunctionType import org.jetbrains.kotlin.builtins.isBuiltinFunctionalType @@ -130,7 +130,7 @@ class PostponedArgumentsAnalyzer( val convertedAnnotations = lambda.expectedType?.annotations?.let { annotations -> if (receiver != null || expectedReceiver == null) annotations - else FilteredAnnotations(annotations, true) { it != KotlinBuiltInsNames.FqNames.extensionFunctionType } + else FilteredAnnotations(annotations, true) { it != StandardNames.FqNames.extensionFunctionType } } val returnArgumentsAnalysisResult = resolutionCallbacks.analyzeAndGetLambdaReturnArguments( diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt index 20532ed2558..b698c3e8292 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.calls.results import gnu.trove.THashSet import gnu.trove.TObjectHashingStrategy import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor @@ -310,10 +310,10 @@ open class OverloadingConflictResolver( val isGeneralUnsigned = UnsignedTypes.isUnsignedType(general) return when { isSpecificUnsigned && isGeneralUnsigned -> { - val uLong = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uLong)?.defaultType ?: return false - val uInt = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uInt)?.defaultType ?: return false - val uByte = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uByte)?.defaultType ?: return false - val uShort = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uShort)?.defaultType ?: return false + val uLong = module.findClassAcrossModuleDependencies(StandardNames.FqNames.uLong)?.defaultType ?: return false + val uInt = module.findClassAcrossModuleDependencies(StandardNames.FqNames.uInt)?.defaultType ?: return false + val uByte = module.findClassAcrossModuleDependencies(StandardNames.FqNames.uByte)?.defaultType ?: return false + val uShort = module.findClassAcrossModuleDependencies(StandardNames.FqNames.uShort)?.defaultType ?: return false isNonSubtypeNotLessSpecific(specific, general, _double, _float, uLong, uInt, uByte, uShort) } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/isFromStdlibJre7Or8.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/isFromStdlibJre7Or8.kt index 6bf2f9b2420..b02760b36fb 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/isFromStdlibJre7Or8.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/isFromStdlibJre7Or8.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve.calls.util -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.SINCE_KOTLIN_FQ_NAME -private val kotlin: FqName = KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME -private val kotlinText: FqName = KotlinBuiltInsNames.TEXT_PACKAGE_FQ_NAME -private val kotlinCollections: FqName = KotlinBuiltInsNames.COLLECTIONS_PACKAGE_FQ_NAME +private val kotlin: FqName = StandardNames.BUILT_INS_PACKAGE_FQ_NAME +private val kotlinText: FqName = StandardNames.TEXT_PACKAGE_FQ_NAME +private val kotlinCollections: FqName = StandardNames.COLLECTIONS_PACKAGE_FQ_NAME private val kotlinStreams: FqName = kotlin.child(Name.identifier("streams")) private val use: Name = Name.identifier("use") @@ -43,7 +43,7 @@ private val remove: Name = Name.identifier("remove") fun CallableDescriptor.isLowPriorityFromStdlibJre7Or8(): Boolean { val containingPackage = containingDeclaration as? PackageFragmentDescriptor ?: return false val packageFqName = containingPackage.fqName - if (!packageFqName.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME)) return false + if (!packageFqName.startsWith(StandardNames.BUILT_INS_PACKAGE_NAME)) return false val isFromStdlibJre7Or8 = packageFqName == kotlin && name == use || diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/TestHelperGenerator.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/TestHelperGenerator.kt index ae8514561d6..c1fdd97be92 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/TestHelperGenerator.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/TestHelperGenerator.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.test.TargetBackend // Add the directive `// WITH_COROUTINES` to use these helpers in codegen tests (see TestFiles.java). fun createTextForCoroutineHelpers(isReleaseCoroutines: Boolean, checkStateMachine: Boolean, checkTailCallOptimization: Boolean): String { val coroutinesPackage = if (isReleaseCoroutines) - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() + StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() else - KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() val emptyContinuationBody = if (isReleaseCoroutines) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt index 026b4cdd64e..442f21b4fb9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -15,7 +15,7 @@ import junit.framework.TestCase import org.jetbrains.kotlin.TestsCompilerError import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector @@ -127,7 +127,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { val languageVersionSettings = if (coroutinesPackage.isNotEmpty()) { - val isExperimental = coroutinesPackage == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + val isExperimental = coroutinesPackage == StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() CompilerTestLanguageVersionSettings( DEFAULT_DIAGNOSTIC_TESTS_FEATURES, if (isExperimental) ApiVersion.KOTLIN_1_2 else ApiVersion.KOTLIN_1_3, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt index 69e5fca8d52..4ea5ecd7872 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt @@ -4,7 +4,7 @@ */ package org.jetbrains.kotlin.checkers -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.test.ConfigurationKind import java.io.File @@ -16,6 +16,6 @@ abstract class AbstractDiagnosticsTestWithStdLib : AbstractDiagnosticsTest() { override fun shouldValidateFirTestData(testDataFile: File): Boolean { val path = testDataFile.absolutePath - return !path.endsWith(".kts") && coroutinesPackage != KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + return !path.endsWith(".kts") && coroutinesPackage != StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt index 33b8be803e1..1717bd38528 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt @@ -4,7 +4,7 @@ */ package org.jetbrains.kotlin.checkers -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment @@ -86,8 +86,8 @@ abstract class KotlinMultiFileTestWithJava listOf("_ir", "_1_3", "") - coroutinesPackage == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() -> listOf("_1_3", "") + coroutinesPackage == StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() -> listOf("_1_3", "") else -> listOf("") } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java index 7e7ff458ef1..5f6b4f0ff72 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java @@ -22,7 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.analyzer.AnalysisResult; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; @@ -346,7 +346,7 @@ public abstract class ExpectedResolveData { FqName fqName = nameOrFqName.contains(".") ? new FqName(nameOrFqName) - : KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(nameOrFqName)); + : StandardNames.BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(nameOrFqName)); ClassDescriptor expectedClass = DescriptorUtilKt.resolveClassByFqName(module, fqName, NoLookupLocation.FROM_TEST); assertNotNull("Expected class not found: " + nameOrFqName, expectedClass); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt index 495eca1717a..bacc00eaaa1 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.serialization.builtins import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COLLECTIONS_PACKAGE_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.RANGES_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COLLECTIONS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.RANGES_PACKAGE_FQ_NAME import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.renderer.AnnotationArgumentsRenderingPolicy @@ -56,7 +56,7 @@ abstract class AbstractBuiltInsWithJDKMembersTest : KotlinTestWithEnvironment() verbose = true annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.UNLESS_EMPTY modifiers = DescriptorRendererModifier.ALL - excludedTypeAnnotationClasses = setOf(KotlinBuiltInsNames.FqNames.unsafeVariance) + excludedTypeAnnotationClasses = setOf(StandardNames.FqNames.unsafeVariance) } ) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt index e8be3c531a7..04060a7646d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.test import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings import org.jetbrains.kotlin.checkers.parseLanguageVersionSettings import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys @@ -239,12 +239,12 @@ abstract class KotlinBaseTest : KtUsefulTestCase() } if (directives.contains("COMMON_COROUTINES_TEST")) { assert(!directives.contains("COROUTINES_PACKAGE")) { "Must replace COROUTINES_PACKAGE prior to tests compilation" } - if (KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() == coroutinesPackage) { + if (StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() == coroutinesPackage) { disableReleaseCoroutines = true includeCompatExperimentalCoroutines = true } } - if (content.contains(KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString())) { + if (content.contains(StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString())) { includeCompatExperimentalCoroutines = true } val fileLanguageVersionSettings: LanguageVersionSettings? = parseLanguageVersionSettings(directives) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index c6b0581b19d..515a32be755 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -22,7 +22,7 @@ import kotlin.Unit; import kotlin.text.StringsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.contracts.description.*; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SubpackagesScope; @@ -75,7 +75,7 @@ public class RecursiveDescriptorComparator { public static final Predicate SKIP_BUILT_INS_PACKAGES = descriptor -> { if (descriptor instanceof PackageViewDescriptor) { - return !KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.equals(((PackageViewDescriptor) descriptor).getFqName()); + return !StandardNames.BUILT_INS_PACKAGE_FQ_NAME.equals(((PackageViewDescriptor) descriptor).getFqName()); } return true; }; diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 73123f3d919..827fa5ecb97 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import java.io.File; import java.util.Collections; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES; +import static org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAMES; public class LoadBuiltinsTest extends KotlinTestWithEnvironment { @Override diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index bc954b6d2b3..3b02d349020 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -21,7 +21,7 @@ import kotlin.Unit; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.container.ComponentProvider; import org.jetbrains.kotlin.container.DslKt; @@ -68,7 +68,7 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment { module = DslKt.getService(container, ModuleDescriptor.class); builtinsImportingScope = ScopeUtilsKt.chainImportingScopes( - CollectionsKt.map(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES, + CollectionsKt.map(StandardNames.BUILT_INS_PACKAGE_FQ_NAMES, fqName -> ScopeUtilsKt.memberScopeAsImportingScope(module.getPackage(fqName).getMemberScope())), null); typeResolver = DslKt.getService(container, TypeResolver.class); x = createTypeVariable("X"); diff --git a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt index 689e86b9268..e67e1b22691 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.types -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope fun ModuleDescriptor.builtInPackageAsLexicalScope(): LexicalScope.Base { - val packageView = getPackage(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) + val packageView = getPackage(StandardNames.BUILT_INS_PACKAGE_FQ_NAME) return LexicalScope.Base(packageView.memberScope.memberScopeAsImportingScope(), this) } diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt index 76446d0f671..4e95c9deba5 100644 --- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataStringTable.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.backend.common.serialization.metadata -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters import org.jetbrains.kotlin.name.ClassId @@ -25,7 +25,7 @@ class KlibMetadataStringTable : StringTableImpl() { superClassifiers[0].classId } else { val superClass = superClassifiers.find { !DescriptorUtils.isInterface(it) } - superClass?.classId ?: ClassId.topLevel(KotlinBuiltInsNames.FqNames.any.toSafe()) + superClass?.classId ?: ClassId.topLevel(StandardNames.FqNames.any.toSafe()) } } else { super.getLocalClassIdReplacement(descriptor) diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt index 1b236d5fd10..025c51de06f 100644 --- a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt +++ b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt @@ -23,9 +23,9 @@ enum class PrimitiveType(typeName: String) { val arrayTypeName: Name = Name.identifier("${typeName}Array") - val typeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) } + val typeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { StandardNames.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) } - val arrayTypeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) } + val arrayTypeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { StandardNames.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) } companion object { @JvmField diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt similarity index 97% rename from core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt rename to core/descriptors.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt index ad1edfea5e6..608fbd6ba55 100644 --- a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt +++ b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.builtins -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames.reflect +import org.jetbrains.kotlin.builtins.StandardNames.FqNames.reflect import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -15,9 +15,7 @@ import org.jetbrains.kotlin.utils.newHashMapWithExpectedSize import org.jetbrains.kotlin.utils.newHashSetWithExpectedSize @Suppress("Reformat") -object KotlinBuiltInsNames { - // --------------------------- From DescriptorUtils --------------------------- - +object StandardNames { @JvmField val ENUM_VALUES = Name.identifier("values") @JvmField val ENUM_VALUE_OF = Name.identifier("valueOf") @@ -34,7 +32,6 @@ object KotlinBuiltInsNames { @JvmField val RESULT_FQ_NAME = FqName("kotlin.Result") - // --------------------------- From ReflectionTypes --------------------------- @JvmField val KOTLIN_REFLECT_FQ_NAME = FqName("kotlin.reflect") const val K_PROPERTY_PREFIX = "KProperty" const val K_MUTABLE_PROPERTY_PREFIX = "KMutableProperty" @@ -43,8 +40,6 @@ object KotlinBuiltInsNames { @JvmField val PREFIXES = listOf(K_PROPERTY_PREFIX, K_MUTABLE_PROPERTY_PREFIX, K_FUNCTION_PREFIX, K_SUSPEND_FUNCTION_PREFIX) - // --------------------------- From KotlinBuiltIns --------------------------- - @JvmField val BUILT_INS_PACKAGE_NAME = Name.identifier("kotlin") diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt index db69e222b28..4aefcef84e5 100644 --- a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt +++ b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.builtins.functions -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name enum class FunctionClassKind(val packageFqName: FqName, val classNamePrefix: String) { - Function(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, "Function"), - SuspendFunction(KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE, "SuspendFunction"), - KFunction(KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME, "KFunction"), - KSuspendFunction(KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME, "KSuspendFunction"); + Function(StandardNames.BUILT_INS_PACKAGE_FQ_NAME, "Function"), + SuspendFunction(StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE, "SuspendFunction"), + KFunction(StandardNames.KOTLIN_REFLECT_FQ_NAME, "KFunction"), + KSuspendFunction(StandardNames.KOTLIN_REFLECT_FQ_NAME, "KSuspendFunction"); fun numberedClassName(arity: Int) = Name.identifier("$classNamePrefix$arity") diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt index bb4e89c8436..5fc7f25d380 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.builtins.jvm import org.jetbrains.kotlin.builtins.CompanionObjectMapping import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor @@ -87,7 +87,7 @@ object JavaToKotlinClassMap : PlatformToKotlinClassMap { for (jvmType in JvmPrimitiveType.values()) { add( ClassId.topLevel(jvmType.wrapperFqName), - ClassId.topLevel(KotlinBuiltInsNames.getPrimitiveFqName(jvmType.primitiveType)) + ClassId.topLevel(StandardNames.getPrimitiveFqName(jvmType.primitiveType)) ) } @@ -99,7 +99,7 @@ object JavaToKotlinClassMap : PlatformToKotlinClassMap { } for (i in 0 until FunctionInvokeDescriptor.BIG_ARITY) { - add(ClassId.topLevel(FqName("kotlin.jvm.functions.Function$i")), KotlinBuiltInsNames.getFunctionClassId(i)) + add(ClassId.topLevel(FqName("kotlin.jvm.functions.Function$i")), StandardNames.getFunctionClassId(i)) addKotlinToJava(FqName(NUMBERED_K_FUNCTION_PREFIX + i), K_FUNCTION_CLASS_ID) } for (i in 0 until FunctionInvokeDescriptor.BIG_ARITY - 1) { @@ -133,7 +133,7 @@ object JavaToKotlinClassMap : PlatformToKotlinClassMap { fun mapJavaToKotlin(fqName: FqName, builtIns: KotlinBuiltIns, functionTypeArity: Int? = null): ClassDescriptor? { val kotlinClassId = - if (functionTypeArity != null && fqName == FUNCTION_N_FQ_NAME) KotlinBuiltInsNames.getFunctionClassId(functionTypeArity) + if (functionTypeArity != null && fqName == FUNCTION_N_FQ_NAME) StandardNames.getFunctionClassId(functionTypeArity) else mapJavaToKotlin(fqName) return if (kotlinClassId != null) builtIns.getBuiltInClassByFqName(kotlinClassId.asSingleFqName()) else null } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInClassDescriptorFactory.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInClassDescriptorFactory.kt index c7ef337c2dd..941bd0aa23a 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInClassDescriptorFactory.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInClassDescriptorFactory.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.builtins.jvm import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl @@ -49,8 +49,8 @@ class JvmBuiltInClassDescriptorFactory( } companion object { - private val KOTLIN_FQ_NAME = KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME - private val CLONEABLE_NAME = KotlinBuiltInsNames.FqNames.cloneable.shortName() - val CLONEABLE_CLASS_ID = ClassId.topLevel(KotlinBuiltInsNames.FqNames.cloneable.toSafe()) + private val KOTLIN_FQ_NAME = StandardNames.BUILT_INS_PACKAGE_FQ_NAME + private val CLONEABLE_NAME = StandardNames.FqNames.cloneable.shortName() + val CLONEABLE_CLASS_ID = ClassId.topLevel(StandardNames.FqNames.cloneable.toSafe()) } } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt index 26fb8296612..a96509f23ca 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.builtins.jvm import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.createDeprecatedAnnotation @@ -339,7 +339,7 @@ open class JvmBuiltInsSettings( } private fun isArrayOrPrimitiveArray(fqName: FqNameUnsafe): Boolean { - return fqName == KotlinBuiltInsNames.FqNames.array || KotlinBuiltInsNames.isPrimitiveArray(fqName) + return fqName == StandardNames.FqNames.array || StandardNames.isPrimitiveArray(fqName) } val DROP_LIST_METHOD_SIGNATURES: Set = diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt index 01dc35f4c80..5e71bed6347 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.name.FqName object FakePureImplementationsProvider { diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt index efb85f7aebe..00f7a14146b 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java.components -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention @@ -57,8 +57,8 @@ object JavaAnnotationMapper { when (annotation.classId) { ClassId.topLevel(JAVA_TARGET_FQ_NAME) -> JavaTargetAnnotationDescriptor(annotation, c) ClassId.topLevel(JAVA_RETENTION_FQ_NAME) -> JavaRetentionAnnotationDescriptor(annotation, c) - ClassId.topLevel(JAVA_REPEATABLE_FQ_NAME) -> JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.FqNames.repeatable) - ClassId.topLevel(JAVA_DOCUMENTED_FQ_NAME) -> JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.FqNames.mustBeDocumented) + ClassId.topLevel(JAVA_REPEATABLE_FQ_NAME) -> JavaAnnotationDescriptor(c, annotation, StandardNames.FqNames.repeatable) + ClassId.topLevel(JAVA_DOCUMENTED_FQ_NAME) -> JavaAnnotationDescriptor(c, annotation, StandardNames.FqNames.mustBeDocumented) ClassId.topLevel(JAVA_DEPRECATED_FQ_NAME) -> null else -> LazyJavaAnnotationDescriptor(c, annotation) } @@ -68,7 +68,7 @@ object JavaAnnotationMapper { annotationOwner: JavaAnnotationOwner, c: LazyJavaResolverContext ): AnnotationDescriptor? { - if (kotlinName == KotlinBuiltInsNames.FqNames.deprecated) { + if (kotlinName == StandardNames.FqNames.deprecated) { val javaAnnotation = annotationOwner.findAnnotation(JAVA_DEPRECATED_FQ_NAME) if (javaAnnotation != null || annotationOwner.isDeprecatedInJavaDoc) { return JavaDeprecatedAnnotationDescriptor(javaAnnotation, c) @@ -84,19 +84,19 @@ object JavaAnnotationMapper { // kotlin.annotation.annotation is treated separately private val kotlinToJavaNameMap: Map = mapOf( - KotlinBuiltInsNames.FqNames.target to JAVA_TARGET_FQ_NAME, - KotlinBuiltInsNames.FqNames.retention to JAVA_RETENTION_FQ_NAME, - KotlinBuiltInsNames.FqNames.repeatable to JAVA_REPEATABLE_FQ_NAME, - KotlinBuiltInsNames.FqNames.mustBeDocumented to JAVA_DOCUMENTED_FQ_NAME + StandardNames.FqNames.target to JAVA_TARGET_FQ_NAME, + StandardNames.FqNames.retention to JAVA_RETENTION_FQ_NAME, + StandardNames.FqNames.repeatable to JAVA_REPEATABLE_FQ_NAME, + StandardNames.FqNames.mustBeDocumented to JAVA_DOCUMENTED_FQ_NAME ) val javaToKotlinNameMap: Map = mapOf( - JAVA_TARGET_FQ_NAME to KotlinBuiltInsNames.FqNames.target, - JAVA_RETENTION_FQ_NAME to KotlinBuiltInsNames.FqNames.retention, - JAVA_DEPRECATED_FQ_NAME to KotlinBuiltInsNames.FqNames.deprecated, - JAVA_REPEATABLE_FQ_NAME to KotlinBuiltInsNames.FqNames.repeatable, - JAVA_DOCUMENTED_FQ_NAME to KotlinBuiltInsNames.FqNames.mustBeDocumented + JAVA_TARGET_FQ_NAME to StandardNames.FqNames.target, + JAVA_RETENTION_FQ_NAME to StandardNames.FqNames.retention, + JAVA_DEPRECATED_FQ_NAME to StandardNames.FqNames.deprecated, + JAVA_REPEATABLE_FQ_NAME to StandardNames.FqNames.repeatable, + JAVA_DOCUMENTED_FQ_NAME to StandardNames.FqNames.mustBeDocumented ) } @@ -119,7 +119,7 @@ open class JavaAnnotationDescriptor( class JavaDeprecatedAnnotationDescriptor( annotation: JavaAnnotation?, c: LazyJavaResolverContext -) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.FqNames.deprecated) { +) : JavaAnnotationDescriptor(c, annotation, StandardNames.FqNames.deprecated) { override val allValueArguments: Map> by c.storageManager.createLazyValue { mapOf(JavaAnnotationMapper.DEPRECATED_ANNOTATION_MESSAGE to StringValue("Deprecated in Java")) } @@ -128,7 +128,7 @@ class JavaDeprecatedAnnotationDescriptor( class JavaTargetAnnotationDescriptor( annotation: JavaAnnotation, c: LazyJavaResolverContext -) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.FqNames.target) { +) : JavaAnnotationDescriptor(c, annotation, StandardNames.FqNames.target) { override val allValueArguments by c.storageManager.createLazyValue { val targetArgument = when (firstArgument) { is JavaArrayAnnotationArgument -> JavaAnnotationTargetMapper.mapJavaTargetArguments(firstArgument.getElements()) @@ -142,7 +142,7 @@ class JavaTargetAnnotationDescriptor( class JavaRetentionAnnotationDescriptor( annotation: JavaAnnotation, c: LazyJavaResolverContext -) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.FqNames.retention) { +) : JavaAnnotationDescriptor(c, annotation, StandardNames.FqNames.retention) { override val allValueArguments by c.storageManager.createLazyValue { val retentionArgument = JavaAnnotationTargetMapper.mapJavaRetentionArgument(firstArgument) retentionArgument?.let { mapOf(JavaAnnotationMapper.RETENTION_ANNOTATION_VALUE to it) }.orEmpty() @@ -170,12 +170,12 @@ object JavaAnnotationTargetMapper { val kotlinTargets = arguments.filterIsInstance() .flatMap { mapJavaTargetArgumentByName(it.entryName?.asString()) } .map { kotlinTarget -> - EnumValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.annotationTarget), Name.identifier(kotlinTarget.name)) + EnumValue(ClassId.topLevel(StandardNames.FqNames.annotationTarget), Name.identifier(kotlinTarget.name)) } return ArrayValue(kotlinTargets) { module -> val parameterDescriptor = DescriptorResolverUtils.getAnnotationParameterByName( JavaAnnotationMapper.TARGET_ANNOTATION_ALLOWED_TARGETS, - module.builtIns.getBuiltInClassByFqName(KotlinBuiltInsNames.FqNames.target) + module.builtIns.getBuiltInClassByFqName(StandardNames.FqNames.target) ) parameterDescriptor?.type ?: ErrorUtils.createErrorType("Error: AnnotationTarget[]") } @@ -191,7 +191,7 @@ object JavaAnnotationTargetMapper { // Map argument: java.lang.annotation.Retention -> kotlin.annotation.Retention return (element as? JavaEnumValueAnnotationArgument)?.let { retentionNameList[it.entryName?.asString()]?.let { retention -> - EnumValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.annotationRetention), Name.identifier(retention.name)) + EnumValue(ClassId.topLevel(StandardNames.FqNames.annotationRetention), Name.identifier(retention.name)) } } } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt index 2682689aa79..5cb7ed23fbc 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java.lazy -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.load.java.components.JavaAnnotationMapper import org.jetbrains.kotlin.load.java.structure.JavaAnnotation @@ -38,7 +38,7 @@ class LazyJavaAnnotations( override fun iterator() = (annotationOwner.annotations.asSequence().map(annotationDescriptors) + JavaAnnotationMapper.findMappedJavaAnnotation( - KotlinBuiltInsNames.FqNames.deprecated, + StandardNames.FqNames.deprecated, annotationOwner, c )).filterNotNull().iterator() diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index b446d0cc762..ed4629af4a7 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.createMappedTypeParametersSubstitution import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -226,7 +226,7 @@ class LazyJavaClassDescriptor( private fun getPurelyImplementedSupertype(): KotlinType? { val annotatedPurelyImplementedFqName = getPurelyImplementsFqNameFromAnnotation()?.takeIf { fqName -> - !fqName.isRoot && fqName.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME) + !fqName.isRoot && fqName.startsWith(StandardNames.BUILT_INS_PACKAGE_NAME) } val purelyImplementedFqName = diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt index 1da8034b93b..7990760972b 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor @@ -46,7 +46,7 @@ class LazyJavaStaticClassScope( declaredMemberIndex().getMethodNames().toMutableSet().apply { addAll(ownerDescriptor.getParentJavaStaticClassScope()?.getFunctionNames().orEmpty()) if (jClass.isEnum) { - addAll(listOf(KotlinBuiltInsNames.ENUM_VALUE_OF, KotlinBuiltInsNames.ENUM_VALUES)) + addAll(listOf(StandardNames.ENUM_VALUE_OF, StandardNames.ENUM_VALUES)) } } @@ -75,8 +75,8 @@ class LazyJavaStaticClassScope( if (jClass.isEnum) { when (name) { - KotlinBuiltInsNames.ENUM_VALUE_OF -> result.add(createEnumValueOfMethod(ownerDescriptor)) - KotlinBuiltInsNames.ENUM_VALUES -> result.add(createEnumValuesMethod(ownerDescriptor)) + StandardNames.ENUM_VALUE_OF -> result.add(createEnumValueOfMethod(ownerDescriptor)) + StandardNames.ENUM_VALUES -> result.add(createEnumValuesMethod(ownerDescriptor)) } } } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt index ffe24796387..af03b2365ed 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.load.java import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.getSpecialSignatureInfo import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.sameAsBuiltinMethodWithErasedValueParameters diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt index a8e387673f4..dce0b2278bd 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.* @@ -58,7 +58,7 @@ fun forceSingleValueParameterBoxing(f: CallableDescriptor): Boolean { ?: return false val overriddenParameterType = overridden.original.valueParameters.single().type.mapToJvmType() - return overridden.containingDeclaration.fqNameUnsafe == KotlinBuiltInsNames.FqNames.mutableCollection.toUnsafe() + return overridden.containingDeclaration.fqNameUnsafe == StandardNames.FqNames.mutableCollection.toUnsafe() && overriddenParameterType is JvmType.Object && overriddenParameterType.internalName == "java/lang/Object" } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt index 6fc3c44765e..f031e2e1d90 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.resolve.jvm -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe @@ -48,7 +48,7 @@ private fun KotlinType.requiresFunctionNameManglingInParameterTypes() = isInlineClassThatRequiresMangling() || isTypeParameterWithUpperBoundThatRequiresMangling() private fun isDontMangleClass(classDescriptor: ClassDescriptor) = - classDescriptor.fqNameSafe == KotlinBuiltInsNames.RESULT_FQ_NAME + classDescriptor.fqNameSafe == StandardNames.RESULT_FQ_NAME private fun KotlinType.isTypeParameterWithUpperBoundThatRequiresMangling(): Boolean { val descriptor = constructor.declarationDescriptor as? TypeParameterDescriptor ?: return false diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt index 7df0a7cfbf3..7d5c82162f6 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.descriptors.runtime.components -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.runtime.structure.classId import org.jetbrains.kotlin.descriptors.runtime.structure.desc @@ -196,7 +196,7 @@ private object ReflectClassStructure { if (currentClass.isPrimitive) { if (currentClass == Void.TYPE) { // void.class is not representable in Kotlin, we approximate it by Unit::class - return ClassLiteralValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.unit.toSafe()), dimensions) + return ClassLiteralValue(ClassId.topLevel(StandardNames.FqNames.unit.toSafe()), dimensions) } val primitiveType = JvmPrimitiveType.get(currentClass.name).primitiveType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt index fb0fa4b3126..674a9f64999 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.descriptors.runtime.components -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder.Result.KotlinClass @@ -47,7 +47,7 @@ class ReflectKotlinClassFinder(private val classLoader: ClassLoader) : KotlinCla override fun hasMetadataPackage(fqName: FqName): Boolean = false override fun findBuiltInsData(packageFqName: FqName): InputStream? { - if (!packageFqName.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME)) return null + if (!packageFqName.startsWith(StandardNames.BUILT_INS_PACKAGE_NAME)) return null return builtInsResourceLoader.loadResource(BuiltInSerializerProtocol.getBuiltInsFilePath(packageFqName)) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt index 7d8be157c68..b3727c21b5d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt @@ -24,10 +24,10 @@ import java.util.* object CompanionObjectMapping { private val classIds = - (PrimitiveType.NUMBER_TYPES.map(KotlinBuiltInsNames::getPrimitiveFqName) + - KotlinBuiltInsNames.FqNames.string.toSafe() + - KotlinBuiltInsNames.FqNames._boolean.toSafe() + - KotlinBuiltInsNames.FqNames._enum.toSafe()).mapTo(linkedSetOf(), ClassId::topLevel) + (PrimitiveType.NUMBER_TYPES.map(StandardNames::getPrimitiveFqName) + + StandardNames.FqNames.string.toSafe() + + StandardNames.FqNames._boolean.toSafe() + + StandardNames.FqNames._enum.toSafe()).mapTo(linkedSetOf(), ClassId::topLevel) fun allClassesWithIntrinsicCompanions(): Set = Collections.unmodifiableSet(classIds) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index cd48defe42e..415884e612a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.*; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.*; +import static org.jetbrains.kotlin.builtins.StandardNames.*; import static org.jetbrains.kotlin.builtins.PrimitiveType.*; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index c487488d659..ba2c2b3a831 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.builtins -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.K_FUNCTION_PREFIX -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.K_SUSPEND_FUNCTION_PREFIX -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.PREFIXES +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.K_FUNCTION_PREFIX +import org.jetbrains.kotlin.builtins.StandardNames.K_SUSPEND_FUNCTION_PREFIX +import org.jetbrains.kotlin.builtins.StandardNames.PREFIXES import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -112,16 +112,16 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not hasKCallableTypeFqName(type) || type.constructor.supertypes.any { isKCallableType(it) } fun hasKCallableTypeFqName(type: KotlinType): Boolean = - hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kCallable) + hasFqName(type.constructor, StandardNames.FqNames.kCallable) fun hasKMutablePropertyTypeFqName(type: KotlinType): Boolean = - hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kMutablePropertyFqName) + hasFqName(type.constructor, StandardNames.FqNames.kMutablePropertyFqName) fun isNumberedKMutablePropertyType(type: KotlinType): Boolean { val descriptor = type.constructor.declarationDescriptor as? ClassDescriptor ?: return false - return hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty0) || - hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty1) || - hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty2) + return hasFqName(descriptor, StandardNames.FqNames.kMutableProperty0) || + hasFqName(descriptor, StandardNames.FqNames.kMutableProperty1) || + hasFqName(descriptor, StandardNames.FqNames.kMutableProperty2) } fun isNumberedTypeWithOneOrMoreNumber(type: KotlinType): Boolean { @@ -142,13 +142,13 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not } fun hasKPropertyTypeFqName(type: KotlinType): Boolean = - hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kPropertyFqName) + hasFqName(type.constructor, StandardNames.FqNames.kPropertyFqName) fun isNumberedKPropertyType(type: KotlinType): Boolean { val descriptor = type.constructor.declarationDescriptor as? ClassDescriptor ?: return false - return hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty0) || - hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty1) || - hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty2) + return hasFqName(descriptor, StandardNames.FqNames.kProperty0) || + hasFqName(descriptor, StandardNames.FqNames.kProperty1) || + hasFqName(descriptor, StandardNames.FqNames.kProperty2) } fun isNumberedKFunctionOrKSuspendFunction(type: KotlinType): Boolean { @@ -180,7 +180,7 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not } fun createKPropertyStarType(module: ModuleDescriptor): KotlinType? { - val kPropertyClass = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.kProperty) ?: return null + val kPropertyClass = module.findClassAcrossModuleDependencies(StandardNames.FqNames.kProperty) ?: return null return KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, kPropertyClass, listOf(StarProjectionImpl(kPropertyClass.typeConstructor.parameters.single()))) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt index 568e88471ad..3e565bdb624 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt @@ -63,7 +63,7 @@ object UnsignedTypes { fun isUnsignedClass(descriptor: DeclarationDescriptor): Boolean { val container = descriptor.containingDeclaration return container is PackageFragmentDescriptor && - container.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME && + container.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME && descriptor.name in UnsignedTypes.unsignedTypeNames } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt index 367ec52600a..b4e9149bc19 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.builtins -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_NAME import org.jetbrains.kotlin.builtins.functions.BuiltInFictitiousFunctionClassFactory import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -87,7 +87,7 @@ val DeclarationDescriptor.isBuiltinFunctionalClassDescriptor: Boolean } fun isBuiltinFunctionClass(classId: ClassId): Boolean { - if (!classId.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME)) return false + if (!classId.startsWith(StandardNames.BUILT_INS_PACKAGE_NAME)) return false val kind = classId.asSingleFqName().toUnsafe().getFunctionalClassKind() return kind == FunctionClassKind.Function || @@ -104,7 +104,7 @@ val KotlinType.isBuiltinExtensionFunctionalType: Boolean get() = isBuiltinFunctionalType && isTypeAnnotatedWithExtensionFunctionType private val KotlinType.isTypeAnnotatedWithExtensionFunctionType: Boolean - get() = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) != null + get() = annotations.findAnnotation(StandardNames.FqNames.extensionFunctionType) != null /** * @return true if this is an FQ name of a fictitious class representing the function type, @@ -174,7 +174,7 @@ fun KotlinType.getPureArgumentsForFunctionalTypeOrSubtype(): List { } fun KotlinType.extractParameterNameFromFunctionTypeArgument(): Name? { - val annotation = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.parameterName) ?: return null + val annotation = annotations.findAnnotation(StandardNames.FqNames.parameterName) ?: return null val name = (annotation.allValueArguments.values.singleOrNull() as? StringValue) ?.value ?.takeIf { Name.isValidIdentifier(it) } @@ -198,7 +198,7 @@ fun getFunctionTypeArgumentProjections( val typeToUse = if (name != null) { val parameterNameAnnotation = BuiltInAnnotationDescriptor( builtIns, - KotlinBuiltInsNames.FqNames.parameterName, + StandardNames.FqNames.parameterName, mapOf(Name.identifier("name") to StringValue(name.asString())) ) type.replaceAnnotations(Annotations.create(type.annotations + parameterNameAnnotation)) @@ -234,16 +234,16 @@ fun createFunctionType( return KotlinTypeFactory.simpleNotNullType(typeAnnotations, classDescriptor, arguments) } -fun Annotations.hasExtensionFunctionAnnotation() = hasAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) +fun Annotations.hasExtensionFunctionAnnotation() = hasAnnotation(StandardNames.FqNames.extensionFunctionType) fun Annotations.withoutExtensionFunctionAnnotation() = - FilteredAnnotations(this, true) { it != KotlinBuiltInsNames.FqNames.extensionFunctionType } + FilteredAnnotations(this, true) { it != StandardNames.FqNames.extensionFunctionType } fun Annotations.withExtensionFunctionAnnotation(builtIns: KotlinBuiltIns) = - if (hasAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType)) { + if (hasAnnotation(StandardNames.FqNames.extensionFunctionType)) { this } else { - Annotations.create(this + BuiltInAnnotationDescriptor(builtIns, KotlinBuiltInsNames.FqNames.extensionFunctionType, emptyMap())) + Annotations.create(this + BuiltInAnnotationDescriptor(builtIns, StandardNames.FqNames.extensionFunctionType, emptyMap())) } fun getFunctionDescriptor(builtIns: KotlinBuiltIns, parameterCount: Int, isSuspendFunction: Boolean) = diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt index e683b5f416e..6b3914df55a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.builtins.functions -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.AbstractClassDescriptor diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt index 891140fa872..def75377a9f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.builtins.functions import org.jetbrains.kotlin.builtins.FunctionInterfacePackageFragment -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.BUILT_INS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt index fe75879d644..f559cb8aa4d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.builtins -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL +import org.jetbrains.kotlin.builtins.StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL +import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.SourceElement diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt index d56cbb08136..5de5f592c0d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.descriptors.annotations import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.AnnotationValue @@ -33,7 +33,7 @@ fun KotlinBuiltIns.createDeprecatedAnnotation( ): AnnotationDescriptor { val replaceWithAnnotation = BuiltInAnnotationDescriptor( this, - KotlinBuiltInsNames.FqNames.replaceWith, + StandardNames.FqNames.replaceWith, mapOf( REPLACE_WITH_EXPRESSION_NAME to StringValue(replaceWith), REPLACE_WITH_IMPORTS_NAME to ArrayValue(emptyList()) { module -> @@ -44,12 +44,12 @@ fun KotlinBuiltIns.createDeprecatedAnnotation( return BuiltInAnnotationDescriptor( this, - KotlinBuiltInsNames.FqNames.deprecated, + StandardNames.FqNames.deprecated, mapOf( DEPRECATED_MESSAGE_NAME to StringValue(message), DEPRECATED_REPLACE_WITH_NAME to AnnotationValue(replaceWithAnnotation), DEPRECATED_LEVEL_NAME to EnumValue( - ClassId.topLevel(KotlinBuiltInsNames.FqNames.deprecationLevel), + ClassId.topLevel(StandardNames.FqNames.deprecationLevel), Name.identifier(level) ) ) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt index 14c449a165c..bbbbc99f3d4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.descriptors -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE +import org.jetbrains.kotlin.builtins.StandardNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL +import org.jetbrains.kotlin.builtins.StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 5029ef41ac1..3286f00cd60 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -36,7 +36,7 @@ internal class DescriptorRendererImpl( private val functionTypeAnnotationsRenderer: DescriptorRendererImpl by lazy { withOptions { - excludedTypeAnnotationClasses += listOf(KotlinBuiltInsNames.FqNames.extensionFunctionType) + excludedTypeAnnotationClasses += listOf(StandardNames.FqNames.extensionFunctionType) annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.ALWAYS_PARENTHESIZED } as DescriptorRendererImpl } @@ -424,7 +424,7 @@ internal class DescriptorRendererImpl( } private fun AnnotationDescriptor.isParameterName(): Boolean { - return fqName == KotlinBuiltInsNames.FqNames.parameterName + return fqName == StandardNames.FqNames.parameterName } override fun renderAnnotation(annotation: AnnotationDescriptor, target: AnnotationUseSiteTarget?): String { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java index 16d304aac08..56c16f15ebc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.types.Variance; import java.util.Collections; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.ENUM_VALUES; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.ENUM_VALUE_OF; +import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES; +import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getDefaultConstructorVisibility; import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 8a7f71d72c7..0fe0bd76345 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.resolve.descriptorUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.ENUM_VALUE_OF +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.ClassKind.* import org.jetbrains.kotlin.descriptors.annotations.Annotated @@ -202,14 +202,14 @@ fun ValueParameterDescriptor.declaresOrInheritsDefaultValue(): Boolean { } fun Annotated.isRepeatableAnnotation(): Boolean = - annotations.findAnnotation(KotlinBuiltInsNames.FqNames.repeatable) != null + annotations.findAnnotation(StandardNames.FqNames.repeatable) != null fun Annotated.isDocumentedAnnotation(): Boolean = - annotations.findAnnotation(KotlinBuiltInsNames.FqNames.mustBeDocumented) != null + annotations.findAnnotation(StandardNames.FqNames.mustBeDocumented) != null fun Annotated.getAnnotationRetention(): KotlinRetention? { val retentionArgumentValue = - annotations.findAnnotation(KotlinBuiltInsNames.FqNames.retention)?.allValueArguments?.get(RETENTION_PARAMETER_NAME) + annotations.findAnnotation(StandardNames.FqNames.retention)?.allValueArguments?.get(RETENTION_PARAMETER_NAME) as? EnumValue ?: return null val retentionArgumentValueName = retentionArgumentValue.enumEntryName.asString() @@ -405,7 +405,7 @@ fun computeSealedSubclasses(sealedClass: ClassDescriptor): Collection get() = listOf(builtIns.intType, builtIns.longType, builtIns.byteType, builtIns.shortType) @@ -59,8 +59,8 @@ internal val ModuleDescriptor.allSignedLiteralTypes: Collection internal val ModuleDescriptor.allUnsignedLiteralTypes: Collection get() = if (hasUnsignedTypesInModuleDependencies(this)) { listOf( - unsignedType(KotlinBuiltInsNames.FqNames.uInt), unsignedType(KotlinBuiltInsNames.FqNames.uLong), - unsignedType(KotlinBuiltInsNames.FqNames.uByte), unsignedType(KotlinBuiltInsNames.FqNames.uShort) + unsignedType(StandardNames.FqNames.uInt), unsignedType(StandardNames.FqNames.uLong), + unsignedType(StandardNames.FqNames.uByte), unsignedType(StandardNames.FqNames.uShort) ) } else { emptyList() diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt index ac78360e0a2..0590d3e8dfd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve.constants import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor @@ -219,7 +219,7 @@ class KClassValue(value: Value) : ConstantValue(value) { // In JVM class file, we can't represent such literal properly, so we're writing java.lang.Object instead. // This has no effect on the compiler front-end or other back-ends, so we use kotlin.Any for simplicity here. // See LanguageFeature.ProhibitTypeParametersInClassLiteralsInAnnotationArguments - KClassValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.any.toSafe()), 0) + KClassValue(ClassId.topLevel(StandardNames.FqNames.any.toSafe()), 0) } else -> null } @@ -259,7 +259,7 @@ class StringValue(value: String) : ConstantValue(value) { class UByteValue(byteValue: Byte) : UnsignedValueConstant(byteValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uByte)?.defaultType + return module.findClassAcrossModuleDependencies(StandardNames.FqNames.uByte)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UByte not found") } @@ -272,7 +272,7 @@ class UByteValue(byteValue: Byte) : UnsignedValueConstant(byteValue) { class UShortValue(shortValue: Short) : UnsignedValueConstant(shortValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uShort)?.defaultType + return module.findClassAcrossModuleDependencies(StandardNames.FqNames.uShort)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UShort not found") } @@ -285,7 +285,7 @@ class UShortValue(shortValue: Short) : UnsignedValueConstant(shortValue) class UIntValue(intValue: Int) : UnsignedValueConstant(intValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uInt)?.defaultType + return module.findClassAcrossModuleDependencies(StandardNames.FqNames.uInt)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UInt not found") } @@ -298,7 +298,7 @@ class UIntValue(intValue: Int) : UnsignedValueConstant(intValue) { class ULongValue(longValue: Long) : UnsignedValueConstant(longValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uLong)?.defaultType + return module.findClassAcrossModuleDependencies(StandardNames.FqNames.uLong)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type ULong not found") } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java index 1d4343749bb..5997d1fed3e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -20,7 +20,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.annotations.CompositeAnnotations; @@ -252,7 +252,7 @@ public class TypeSubstitutor implements TypeSubstitutorMarker { @Nullable TypeParameterDescriptor typeParameter, @NotNull TypeProjection originalProjection ) { - if (!originalType.getAnnotations().hasAnnotation(KotlinBuiltInsNames.FqNames.unsafeVariance)) return substituted; + if (!originalType.getAnnotations().hasAnnotation(StandardNames.FqNames.unsafeVariance)) return substituted; TypeConstructor constructor = substituted.getType().getConstructor(); if (!(constructor instanceof NewCapturedTypeConstructor)) return substituted; @@ -278,11 +278,11 @@ public class TypeSubstitutor implements TypeSubstitutorMarker { @NotNull private static Annotations filterOutUnsafeVariance(@NotNull Annotations annotations) { - if (!annotations.hasAnnotation(KotlinBuiltInsNames.FqNames.unsafeVariance)) return annotations; + if (!annotations.hasAnnotation(StandardNames.FqNames.unsafeVariance)) return annotations; return new FilteredAnnotations(annotations, new Function1() { @Override public Boolean invoke(@NotNull FqName name) { - return !name.equals(KotlinBuiltInsNames.FqNames.unsafeVariance); + return !name.equals(StandardNames.FqNames.unsafeVariance); } }); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index e6a17caaadc..c60dc0756eb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -10,7 +10,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; @@ -500,10 +500,10 @@ public class TypeUtils { return longType; } - KotlinType uIntType = findByFqName(supertypes, KotlinBuiltInsNames.FqNames.uIntFqName); + KotlinType uIntType = findByFqName(supertypes, StandardNames.FqNames.uIntFqName); if (uIntType != null) return uIntType; - KotlinType uLongType = findByFqName(supertypes, KotlinBuiltInsNames.FqNames.uLongFqName); + KotlinType uLongType = findByFqName(supertypes, StandardNames.FqNames.uLongFqName); if (uLongType != null) return uLongType; return null; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt b/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt index 57a401b5285..b407539b4dd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.types.checker import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.isBuiltinFunctionalTypeOrSubtype import org.jetbrains.kotlin.descriptors.* diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt index de284b45285..6bdcf35830f 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.serialization.deserialization -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.metadata.deserialization.TypeTable import org.jetbrains.kotlin.metadata.deserialization.VersionRequirementTable @@ -83,7 +83,7 @@ class ClassDeserializer(private val components: DeserializationComponents) { * but the metadata is still serialized for kotlin-reflect 1.0 to work (see BuiltInsSerializer.kt). */ val BLACK_LIST = setOf( - ClassId.topLevel(KotlinBuiltInsNames.FqNames.cloneable.toSafe()) + ClassId.topLevel(StandardNames.FqNames.cloneable.toSafe()) ) } } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsLoaderImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsLoaderImpl.kt index 17444622cdb..a9c3b542206 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsLoaderImpl.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInsLoaderImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.serialization.deserialization.builtins import org.jetbrains.kotlin.builtins.BuiltInsLoader -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.NotFoundClasses import org.jetbrains.kotlin.descriptors.PackageFragmentProvider @@ -35,7 +35,7 @@ class BuiltInsLoaderImpl : BuiltInsLoader { return createBuiltInPackageFragmentProvider( storageManager, builtInsModule, - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAMES, + StandardNames.BUILT_INS_PACKAGE_FQ_NAMES, classDescriptorFactories, platformDependentDeclarationFilter, additionalClassPartsProvider, diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index 47d19e28bab..857483a8b6d 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -16,7 +16,7 @@ package kotlin.reflect.jvm.internal -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.jvm.CloneableClassScope import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap @@ -259,15 +259,15 @@ internal object RuntimeTypeMapper { fun mapJvmClassToKotlinClassId(klass: Class<*>): ClassId { if (klass.isArray) { klass.componentType.primitiveType?.let { - return ClassId(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName) + return ClassId(StandardNames.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName) } - return ClassId.topLevel(KotlinBuiltInsNames.FqNames.array.toSafe()) + return ClassId.topLevel(StandardNames.FqNames.array.toSafe()) } if (klass == Void.TYPE) return JAVA_LANG_VOID klass.primitiveType?.let { - return ClassId(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, it.typeName) + return ClassId(StandardNames.BUILT_INS_PACKAGE_FQ_NAME, it.typeName) } val classId = klass.classId diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt index eb87364e8f7..e278758636e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForMod import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForScriptDependenciesName import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSdkName import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSpecialInfoName -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.context.GlobalContext @@ -518,7 +518,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService { } private companion object { - private val SUPPRESS_ANNOTATION_SHORT_NAME = KotlinBuiltInsNames.FqNames.suppress.shortName().identifier + private val SUPPRESS_ANNOTATION_SHORT_NAME = StandardNames.FqNames.suppress.shortName().identifier } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java index 1d0fc8c94ad..f147fa9d972 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java @@ -24,7 +24,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; @@ -75,7 +75,7 @@ public class MemberMatching { @Override public String visitFunctionType(@NotNull KtFunctionType type, Void data) { - return KotlinBuiltInsNames.getFunctionName(type.getParameters().size() + (type.getReceiverTypeReference() != null ? 1 : 0)); + return StandardNames.getFunctionName(type.getParameters().size() + (type.getReceiverTypeReference() != null ? 1 : 0)); } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index c96f793e19e..eb70c83ee5a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isNumberedFunctionClassFqName import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.* @@ -64,7 +64,7 @@ private class ClassClsStubBuilder( private val supertypeIds = run { val supertypeIds = classProto.supertypes(c.typeTable).map { c.nameResolver.getClassId(it.className) } //empty supertype list if single supertype is Any - if (supertypeIds.singleOrNull()?.let { KotlinBuiltInsNames.FqNames.any == it.asSingleFqName().toUnsafe() } == true) { + if (supertypeIds.singleOrNull()?.let { StandardNames.FqNames.any == it.asSingleFqName().toUnsafe() } == true) { listOf() } else { supertypeIds diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt index e9e62288e58..87e1a86ca6a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isBuiltinFunctionClass import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.lexer.KtTokens @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.utils.doNothing import java.util.* // TODO: see DescriptorRendererOptions.excludedTypeAnnotationClasses for decompiler -private val ANNOTATIONS_NOT_LOADED_FOR_TYPES = setOf(KotlinBuiltInsNames.FqNames.parameterName) +private val ANNOTATIONS_NOT_LOADED_FOR_TYPES = setOf(StandardNames.FqNames.parameterName) class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { fun createTypeReferenceStub( @@ -95,7 +95,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { val shouldBuildAsFunctionType = isBuiltinFunctionClass(classId) && type.argumentList.none { it.projection == Projection.STAR } if (shouldBuildAsFunctionType) { val (extensionAnnotations, notExtensionAnnotations) = annotations.partition { - it.classId.asSingleFqName() == KotlinBuiltInsNames.FqNames.extensionFunctionType + it.classId.asSingleFqName() == StandardNames.FqNames.extensionFunctionType } val isExtension = extensionAnnotations.isNotEmpty() @@ -194,8 +194,8 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { val classId = c.nameResolver.getClassId(parameterType.className) val fqName = classId.asSingleFqName() assert( - fqName == KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL - || fqName == KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE + fqName == StandardNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL + || fqName == StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE ) { "Last parameter type of suspend function must be Continuation, but it is $fqName" } @@ -337,7 +337,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { private fun Type.isDefaultUpperBound(): Boolean { return this.hasClassName() && - c.nameResolver.getClassId(className).let { KotlinBuiltInsNames.FqNames.any == it.asSingleFqName().toUnsafe() } && + c.nameResolver.getClassId(className).let { StandardNames.FqNames.any == it.asSingleFqName().toUnsafe() } && this.nullable } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index c2a81917f6c..c2b895f5b21 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.FlagsToModifiers import org.jetbrains.kotlin.idea.stubindex.KotlinFileStubForIde @@ -139,7 +139,7 @@ fun createStubForTypeName( ): KotlinUserTypeStub { val substituteWithAny = typeClassId.isLocal - val fqName = if (substituteWithAny) KotlinBuiltInsNames.FqNames.any + val fqName = if (substituteWithAny) StandardNames.FqNames.any else typeClassId.asSingleFqName().toUnsafe() val segments = fqName.pathSegments().asReversed() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt index 91960639b32..678c0acf7e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt @@ -21,7 +21,7 @@ import com.intellij.codeInspection.SuppressIntentionAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.util.addAnnotation @@ -63,7 +63,7 @@ class KotlinSuppressIntentionAction private constructor( val id = "\"$suppressKey\"" when (suppressAt) { is KtModifierListOwner -> suppressAt.addAnnotation( - KotlinBuiltInsNames.FqNames.suppress, + StandardNames.FqNames.suppress, id, whiteSpaceText = if (kind.newLineNeeded) "\n" else " ", addToExistingAnnotation = { entry -> @@ -150,7 +150,7 @@ class KotlinSuppressIntentionAction private constructor( } private fun suppressAnnotationText(id: String, withAt: Boolean = true) = - "${if (withAt) "@" else ""}${KotlinBuiltInsNames.FqNames.suppress.shortName()}($id)" + "${if (withAt) "@" else ""}${StandardNames.FqNames.suppress.shortName()}($id)" private fun findSuppressAnnotation(annotated: KtAnnotated): KtAnnotationEntry? { val context = annotated.analyze() @@ -164,7 +164,7 @@ class KotlinSuppressIntentionAction private constructor( private fun findSuppressAnnotation(context: BindingContext, annotationEntries: List): KtAnnotationEntry? { return annotationEntries.firstOrNull { entry -> - context.get(BindingContext.ANNOTATION, entry)?.fqName == KotlinBuiltInsNames.FqNames.suppress + context.get(BindingContext.ANNOTATION, entry)?.fqName == StandardNames.FqNames.suppress } } } diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt index c4919f9b2b3..6361cd0eb6a 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt @@ -232,7 +232,7 @@ private fun PropertyDescriptor.formatReadFromParcel(parcelName: String): String? fun KotlinType.formatJavaClassloader() = "${this.constructor.declarationDescriptor?.fqNameSafe}::class.java.classLoader" // There is no read/write short array methods - if (KotlinBuiltInsNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) { + if (StandardNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) { return "$parcelName.create${type.getName()}()" } @@ -271,7 +271,7 @@ private fun PropertyDescriptor.formatWriteToParcel(parcelName: String, flagsName val type = returnType ?: return null // There is no read/write short array methods - if (KotlinBuiltInsNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) { + if (StandardNames.isPrimitiveArray(type) && KotlinBuiltIns.getPrimitiveArrayElementType(type) != PrimitiveType.SHORT) { return "$parcelName.write${type.getName()}($name)" } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt index 84b1e123e61..f5c62a5ad57 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt @@ -9,7 +9,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiDocCommentOwner import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject @@ -75,7 +75,7 @@ fun isDeprecatedAtCallSite(descriptor: DeclarationDescriptor, languageVersionSet if (!isDeprecatedAtDeclarationSite) return false return computeLevelForDeprecatedSinceKotlin( - descriptor.original.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecatedSinceKotlin) ?: return true, + descriptor.original.annotations.findAnnotation(StandardNames.FqNames.deprecatedSinceKotlin) ?: return true, languageVersionSettings.apiVersion ) != null } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RuntimeLibraryUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RuntimeLibraryUtils.kt index 338cfc30288..8d3410df39c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RuntimeLibraryUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/RuntimeLibraryUtils.kt @@ -9,14 +9,14 @@ import com.intellij.openapi.project.Project import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled fun getKotlinJvmRuntimeMarkerClass(project: Project, scope: GlobalSearchScope): PsiClass? { return runReadAction { project.runWithAlternativeResolveEnabled { - JavaPsiFacade.getInstance(project).findClass(KotlinBuiltInsNames.FqNames.unit.asString(), scope) + JavaPsiFacade.getInstance(project).findClass(StandardNames.FqNames.unit.asString(), scope) } } } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/ktTypeUtils.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/ktTypeUtils.kt index f1628c529d9..6a93477f552 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/ktTypeUtils.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/types/ktTypeUtils.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.types import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.name.ClassId val KtType.isUnit: Boolean get() = isClassTypeWithClassId(DefaultTypeClassIds.UNIT) @@ -17,5 +17,5 @@ fun KtType.isClassTypeWithClassId(classId: ClassId): Boolean { } private object DefaultTypeClassIds { - val UNIT = ClassId.topLevel(KotlinBuiltInsNames.FqNames.unit.toSafe()) + val UNIT = ClassId.topLevel(StandardNames.FqNames.unit.toSafe()) } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt index a7e3738574e..ca1370daded 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt @@ -6,8 +6,7 @@ package org.jetbrains.kotlin.idea.fir import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.declarations.FirClass @@ -70,9 +69,9 @@ object KtDeclarationAndFirDeclarationEqualityChecker { } is FirFunctionTypeRef -> { val classId = if (isSuspend) { - KotlinBuiltInsNames.getSuspendFunctionClassId(parametersCount) + StandardNames.getSuspendFunctionClassId(parametersCount) } else { - KotlinBuiltInsNames.getFunctionClassId(parametersCount) + StandardNames.getFunctionClassId(parametersCount) } buildString { append(classId.asSingleFqName().toString()) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt index a9813117ffe..d702d3fe0a0 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt @@ -6,14 +6,16 @@ package org.jetbrains.kotlin.idea.frontend.api.fir import org.jetbrains.kotlin.fir.resolve.firSymbolProvider -import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.idea.fir.low.level.api.FirModuleResolveState import org.jetbrains.kotlin.idea.fir.low.level.api.LowLevelFirApiFacade import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.ReadActionConfinementValidityToken import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.assertIsValid -import org.jetbrains.kotlin.idea.frontend.api.components.* +import org.jetbrains.kotlin.idea.frontend.api.components.KtCallResolver +import org.jetbrains.kotlin.idea.frontend.api.components.KtDiagnosticProvider +import org.jetbrains.kotlin.idea.frontend.api.components.KtSmartCastProvider +import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeProvider import org.jetbrains.kotlin.idea.frontend.api.fir.components.* import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbolProvider import org.jetbrains.kotlin.idea.frontend.api.fir.utils.threadLocal diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt index 00cad81c94c..0f1db372efe 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.components -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.fir.declarations.isSuspend import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -88,8 +88,8 @@ internal class KtFirCallResolver( companion object { private val kotlinFunctionInvokeCallableIds = (0..23).flatMapTo(hashSetOf()) { arity -> listOf( - CallableId(KotlinBuiltInsNames.getFunctionClassId(arity), Name.identifier("invoke")), - CallableId(KotlinBuiltInsNames.getSuspendFunctionClassId(arity), Name.identifier("invoke")) + CallableId(StandardNames.getFunctionClassId(arity), Name.identifier("invoke")), + CallableId(StandardNames.getSuspendFunctionClassId(arity), Name.identifier("invoke")) ) } } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index 927abc62c6d..fd78e8a8f25 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -24,7 +24,7 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.psi.search.FileTypeIndex import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.annotations.CalledInBackground -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinJvmBundle import org.jetbrains.kotlin.idea.core.util.getKotlinJvmRuntimeMarkerClass @@ -290,7 +290,7 @@ fun hasKotlinJsRuntimeInScope(module: Module): Boolean { } fun hasKotlinCommonRuntimeInScope(scope: GlobalSearchScope): Boolean { - return IDEVirtualFileFinder(scope).hasMetadataPackage(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) + return IDEVirtualFileFinder(scope).hasMetadataPackage(StandardNames.BUILT_INS_PACKAGE_FQ_NAME) } class LibraryKindSearchScope( diff --git a/idea/jvm-debugger/jvm-debugger-sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinSequenceTypes.kt b/idea/jvm-debugger/jvm-debugger-sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinSequenceTypes.kt index d35e611a817..97690faedb2 100644 --- a/idea/jvm-debugger/jvm-debugger-sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinSequenceTypes.kt +++ b/idea/jvm-debugger/jvm-debugger-sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/dsl/KotlinSequenceTypes.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl import com.intellij.debugger.streams.trace.dsl.Types import com.intellij.debugger.streams.trace.impl.handler.type.* -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames object KotlinSequenceTypes : Types { override val ANY: GenericType = ClassTypeImpl(FqNames.any.asString(), "kotlin.Any()") diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/JavaContextDeclarationRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/JavaContextDeclarationRenderer.kt index 21a3371db46..4fc9d4e5915 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/JavaContextDeclarationRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/JavaContextDeclarationRenderer.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.conversion.copy import com.intellij.psi.util.parents -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -119,7 +119,7 @@ class JavaContextDeclarationRenderer { private fun StringBuilder.renderFqName(fqName: FqNameUnsafe) { val stringFqName = when (fqName) { - KotlinBuiltInsNames.FqNames.unit -> "void" + StandardNames.FqNames.unit -> "void" else -> JavaToKotlinClassMap.mapKotlinToJava(fqName)?.asSingleFqName() ?: fqName.asString() } append(stringFqName) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt index 4ea1d945f75..d538f6fdb06 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.inspections import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -110,7 +110,7 @@ class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedIns val descriptor = resolvedCall.resultingDescriptor.containingDeclaration val descriptorFqName = DescriptorUtils.getFqName(descriptor).toSafe() - if (descriptorFqName != KotlinBuiltInsNames.FqNames.deprecated) continue + if (descriptorFqName != StandardNames.FqNames.deprecated) continue val args = resolvedCall.valueArguments.mapKeys { it.key.name.asString() } val replaceWithArguments = args["replaceWith"] /*TODO: kotlin.deprecated::replaceWith.name*/ @@ -231,6 +231,6 @@ class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedIns } companion object { - val DEPRECATED_NAME = KotlinBuiltInsNames.FqNames.deprecated.shortName() + val DEPRECATED_NAME = StandardNames.FqNames.deprecated.shortName() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt index 5213d8c3d1b..61d90a70baa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt @@ -12,7 +12,7 @@ import com.intellij.codeInspection.ProblemsHolder import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementVisitor -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze @@ -88,14 +88,14 @@ class JavaCollectionsStaticMethodInspection : AbstractKotlinInspection() { } private fun KotlinType.isMutableList() = - constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.mutableList + constructor.declarationDescriptor?.fqNameSafe == StandardNames.FqNames.mutableList private fun KotlinType.isMutableListOrSubtype(): Boolean { return isMutableList() || constructor.supertypes.reversed().any { it.isMutableList() } } private fun KotlinType.isList() = - constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.list + constructor.declarationDescriptor?.fqNameSafe == StandardNames.FqNames.list private fun KotlinType.isListOrSubtype(): Boolean { return isList() || constructor.supertypes.reversed().any { it.isList() } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt index 7f315209f33..03c3f326079 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt @@ -12,7 +12,7 @@ import com.intellij.codeInspection.ProblemsHolder import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.MainFunctionDetector @@ -77,7 +77,7 @@ private class ChangeMainFunctionReturnTypeToUnitFix(private val hasExplicitRetur if (function.hasBlockBody()) { function.typeReference = null } else { - function.setType(KotlinBuiltInsNames.FqNames.unit.asString()) + function.setType(StandardNames.FqNames.unit.asString()) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/MigrateDiagnosticSuppressionInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/MigrateDiagnosticSuppressionInspection.kt index 423c042f6b6..d2bbd64e584 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/MigrateDiagnosticSuppressionInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MigrateDiagnosticSuppressionInspection.kt @@ -10,7 +10,7 @@ import com.intellij.codeInspection.* import com.intellij.openapi.project.Project import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElementVisitor -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.idea.KotlinBundle @@ -27,7 +27,7 @@ class MigrateDiagnosticSuppressionInspection : AbstractKotlinInspection(), Clean if (annotationEntry.calleeExpression?.text != "Suppress") return val context = annotationEntry.analyze(BodyResolveMode.PARTIAL) val descriptor = context[BindingContext.ANNOTATION, annotationEntry] ?: return - if (descriptor.fqName != KotlinBuiltInsNames.FqNames.suppress) return + if (descriptor.fqName != StandardNames.FqNames.suppress) return for (argument in annotationEntry.valueArguments) { val expression = argument.getArgumentExpression() as? KtStringTemplateExpression ?: continue diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitExpressionInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitExpressionInspection.kt index 530d93d3c47..6b3f38360dc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitExpressionInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitExpressionInspection.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.inspections import com.intellij.codeInspection.* import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementVisitor -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall @@ -43,7 +43,7 @@ class RedundantUnitExpressionInspection : AbstractKotlinInspection(), CleanupLoc val parent = referenceExpression.parent ?: return false if (parent is KtReturnExpression) { val expectedReturnType = parent.expectedReturnType() ?: return false - return expectedReturnType.nameIfStandardType != KotlinBuiltInsNames.FqNames.any.shortName() && !expectedReturnType.isMarkedNullable + return expectedReturnType.nameIfStandardType != StandardNames.FqNames.any.shortName() && !expectedReturnType.isMarkedNullable } if (parent is KtBlockExpression) { @@ -73,7 +73,7 @@ class RedundantUnitExpressionInspection : AbstractKotlinInspection(), CleanupLoc } private fun KtExpression.isUnitLiteral(): Boolean = - KotlinBuiltInsNames.FqNames.unit.shortName() == (this as? KtNameReferenceExpression)?.getReferencedNameAsName() + StandardNames.FqNames.unit.shortName() == (this as? KtNameReferenceExpression)?.getReferencedNameAsName() private fun KtReturnExpression.expectedReturnType(): KotlinType? { val functionDescriptor = getTargetFunctionDescriptor(analyze()) ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt index c4696d72e1e..72479208134 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt @@ -16,7 +16,7 @@ import com.intellij.openapi.project.Project import com.intellij.profile.codeInspection.ProjectInspectionProfileManager import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.canOmitDeclaredType @@ -169,7 +169,7 @@ class UseExpressionBodyInspection(private val convertEmptyToUnit: Boolean) : Abs if (!declaration.hasDeclaredReturnType() && declaration is KtNamedFunction && block.statements.isNotEmpty()) { val valueType = value.analyze().getType(value) if (valueType == null || !KotlinBuiltIns.isUnit(valueType)) { - declaration.setType(KotlinBuiltInsNames.FqNames.unit.asString(), shortenReferences = true) + declaration.setType(StandardNames.FqNames.unit.asString(), shortenReferences = true) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt index 5dfaf26cf27..7ec31f10321 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnCollectionInspection.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.inspections.collections import com.intellij.codeInspection.ProblemHighlightType import com.intellij.openapi.util.TextRange -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.quickfix.ReplaceSelectorOfQualifiedExpressionFix import org.jetbrains.kotlin.psi.KtExpression @@ -96,5 +96,5 @@ class UselessCallOnCollectionInspection : AbstractUselessCallInspection() { } } - private fun KotlinType?.isList() = this?.constructor?.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.list + private fun KotlinType?.isList() = this?.constructor?.declarationDescriptor?.fqNameSafe == StandardNames.FqNames.list } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt index 5c4aaa9caad..17ab2198691 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt index cf21228af6b..cc3a41aee29 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt @@ -14,7 +14,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiComment import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.idea.KotlinBundle @@ -225,7 +225,7 @@ class SpecifyTypeExplicitlyIntention : SelfTargetingRangeIntention.lastWithPersistedElementOrNull(elementShouldPe } fun KotlinType.reflectToRegularFunctionType(): KotlinType { - val isTypeAnnotatedWithExtensionFunctionType = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) != null + val isTypeAnnotatedWithExtensionFunctionType = annotations.findAnnotation(StandardNames.FqNames.extensionFunctionType) != null val parameterCount = if (isTypeAnnotatedWithExtensionFunctionType) arguments.size - 2 else arguments.size - 1 val classDescriptor = if (isKSuspendFunctionType) builtIns.getSuspendFunction(parameterCount) else builtIns.getFunction(parameterCount) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt index a10c9eaedde..7187b8bc6d1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.intentions.loopToCallChain.result -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -138,7 +138,7 @@ class AddToCollectionTransformation( when (collectionKind) { CollectionKind.LIST -> { when { - canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.FqNames.list, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, StandardNames.FqNames.list, state.outerLoop) -> { return if (argumentIsInputVariable) { val assignToList = AssignToListTransformation(state.outerLoop, collectionInitialization, state.lazySequence) TransformationMatch.Result(assignToList) @@ -156,7 +156,7 @@ class AddToCollectionTransformation( } } - canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.FqNames.mutableList, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, StandardNames.FqNames.mutableList, state.outerLoop) -> { if (argumentIsInputVariable) { val transformation = AssignToMutableListTransformation(state.outerLoop, collectionInitialization) return TransformationMatch.Result(transformation) @@ -167,11 +167,11 @@ class AddToCollectionTransformation( CollectionKind.SET -> { val assignToSetTransformation = when { - canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.FqNames.set, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, StandardNames.FqNames.set, state.outerLoop) -> { AssignToSetTransformation(state.outerLoop, collectionInitialization) } - canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.FqNames.mutableSet, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, StandardNames.FqNames.mutableSet, state.outerLoop) -> { AssignToMutableSetTransformation(state.outerLoop, collectionInitialization) } @@ -214,13 +214,13 @@ class AddToCollectionTransformation( private fun KtExpression?.isRangeLiteral() = this is KtBinaryExpression && operationToken == KtTokens.RANGE private fun DeclarationDescriptor.isCollectionAdd(): Boolean { - if ((containingDeclaration as? ClassDescriptor)?.fqNameSafe == KotlinBuiltInsNames.FqNames.mutableCollection) { + if ((containingDeclaration as? ClassDescriptor)?.fqNameSafe == StandardNames.FqNames.mutableCollection) { return true } val overrides = (this as? CallableDescriptor)?.overriddenTreeUniqueAsSequence(true) ?: return false return overrides.any { - (it.containingDeclaration as? ClassDescriptor)?.fqNameSafe == KotlinBuiltInsNames.FqNames.mutableCollection + (it.containingDeclaration as? ClassDescriptor)?.fqNameSafe == StandardNames.FqNames.mutableCollection } } diff --git a/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt b/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt index 695d7270bf2..610dfbd9672 100644 --- a/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.kdoc -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.resolve.DescriptorUtils diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt index 6c384b19d39..b9d52d37725 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt @@ -11,7 +11,7 @@ import com.intellij.psi.* import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ReferencesSearch import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.diagnostics.Diagnostic @@ -151,11 +151,11 @@ private fun KtAnnotationEntry.getActualTargetList(): List { } private fun KtClass.addAnnotationTargets(annotationTargets: List, psiFactory: KtPsiFactory) { - val retentionAnnotationName = KotlinBuiltInsNames.FqNames.retention.shortName().asString() + val retentionAnnotationName = StandardNames.FqNames.retention.shortName().asString() if (annotationTargets.any { it == KotlinTarget.EXPRESSION }) { val retentionEntry = annotationEntries.firstOrNull { it.typeReference?.text == retentionAnnotationName } val newRetentionEntry = psiFactory.createAnnotationEntry( - "@$retentionAnnotationName(${KotlinBuiltInsNames.FqNames.annotationRetention.shortName()}.${AnnotationRetention.SOURCE.name})" + "@$retentionAnnotationName(${StandardNames.FqNames.annotationRetention.shortName()}.${AnnotationRetention.SOURCE.name})" ) if (retentionEntry == null) { addAnnotationEntry(newRetentionEntry) @@ -164,7 +164,7 @@ private fun KtClass.addAnnotationTargets(annotationTargets: List, } } - val targetAnnotationName = KotlinBuiltInsNames.FqNames.target.shortName().asString() + val targetAnnotationName = StandardNames.FqNames.target.shortName().asString() val targetAnnotationEntry = annotationEntries.find { it.typeReference?.text == targetAnnotationName } ?: run { val text = "@$targetAnnotationName${annotationTargets.toArgumentListString()}" addAnnotationEntry(psiFactory.createAnnotationEntry(text)) @@ -185,4 +185,4 @@ private fun KtClass.addAnnotationTargets(annotationTargets: List, private fun List.toArgumentListString() = joinToString(separator = ", ", prefix = "(", postfix = ")") { it.asNameString() } -private fun KotlinTarget.asNameString() = "${KotlinBuiltInsNames.FqNames.annotationTarget.shortName().asString()}.$name" +private fun KotlinTarget.asNameString() = "${StandardNames.FqNames.annotationTarget.shortName().asString()}.$name" diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RestrictedRetentionForExpressionAnnotationFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RestrictedRetentionForExpressionAnnotationFactory.kt index 249961a7307..3ff4a17ccaf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RestrictedRetentionForExpressionAnnotationFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RestrictedRetentionForExpressionAnnotationFactory.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.idea.KotlinBundle @@ -22,14 +22,14 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe object RestrictedRetentionForExpressionAnnotationFactory : KotlinIntentionActionsFactory() { - private val sourceRetention = "${KotlinBuiltInsNames.FqNames.annotationRetention.asString()}.${AnnotationRetention.SOURCE.name}" - private val sourceRetentionAnnotation = "@${KotlinBuiltInsNames.FqNames.retention.asString()}($sourceRetention)" + private val sourceRetention = "${StandardNames.FqNames.annotationRetention.asString()}.${AnnotationRetention.SOURCE.name}" + private val sourceRetentionAnnotation = "@${StandardNames.FqNames.retention.asString()}($sourceRetention)" override fun doCreateActions(diagnostic: Diagnostic): List { val annotationEntry = diagnostic.psiElement as? KtAnnotationEntry ?: return emptyList() val containingClass = annotationEntry.containingClass() ?: return emptyList() - val retentionAnnotation = containingClass.annotation(KotlinBuiltInsNames.FqNames.retention) - val targetAnnotation = containingClass.annotation(KotlinBuiltInsNames.FqNames.target) + val retentionAnnotation = containingClass.annotation(StandardNames.FqNames.retention) + val targetAnnotation = containingClass.annotation(StandardNames.FqNames.target) val expressionTargetArgument = if (targetAnnotation != null) findExpressionTargetArgument(targetAnnotation) else null return listOfNotNull( diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt index dd2d0542b3d..8bbb71a3797 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.idea.KotlinBundle @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.types.typeUtil.isUnsignedNumberType import kotlin.math.floor private val valueRanges = mapOf( - KotlinBuiltInsNames.FqNames._byte to Byte.MIN_VALUE.toLong()..Byte.MAX_VALUE.toLong(), - KotlinBuiltInsNames.FqNames._short to Short.MIN_VALUE.toLong()..Short.MAX_VALUE.toLong(), - KotlinBuiltInsNames.FqNames._int to Int.MIN_VALUE.toLong()..Int.MAX_VALUE.toLong(), - KotlinBuiltInsNames.FqNames._long to Long.MIN_VALUE..Long.MAX_VALUE + StandardNames.FqNames._byte to Byte.MIN_VALUE.toLong()..Byte.MAX_VALUE.toLong(), + StandardNames.FqNames._short to Short.MIN_VALUE.toLong()..Short.MAX_VALUE.toLong(), + StandardNames.FqNames._int to Int.MIN_VALUE.toLong()..Int.MAX_VALUE.toLong(), + StandardNames.FqNames._long to Long.MIN_VALUE..Long.MAX_VALUE ) class WrongPrimitiveLiteralFix(element: KtConstantExpression, type: KotlinType) : KotlinQuickFixAction(element) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt index 7f9f116c5b3..ddcc288a603 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt @@ -9,7 +9,7 @@ import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.idea.KotlinBundle @@ -200,7 +200,7 @@ class MigrateExternalExtensionFix(declaration: KtNamedDeclaration) : KotlinQuick } if (declaration is KtFunction) { - declaration.addAnnotation(KotlinBuiltInsNames.FqNames.suppress, "\"NOTHING_TO_INLINE\"") + declaration.addAnnotation(StandardNames.FqNames.suppress, "\"NOTHING_TO_INLINE\"") } convertNativeAnnotationToJsName(declaration, annotations) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt index dbf4cba7033..a9d6f0f42d4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt @@ -12,7 +12,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ReferencesSearch import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.diagnostics.Diagnostic @@ -80,7 +80,7 @@ abstract class DeprecatedSymbolUsageFixBase( contextElement: KtReferenceExpression?, replaceInWholeProject: Boolean ): ReplaceWith? { - val annotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecated) ?: return null + val annotation = descriptor.annotations.findAnnotation(StandardNames.FqNames.deprecated) ?: return null val replaceWithValue = annotation.argumentValue(Deprecated::replaceWith.name)?.safeAs()?.value ?: return null val pattern = replaceWithValue.argumentValue(kotlin.ReplaceWith::expression.name)?.safeAs()?.value ?: return null diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt index 95feab6cd9b..d092a33cdc6 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.psi.* import com.intellij.psi.util.PsiMethodUtil import org.jetbrains.kotlin.asJava.classes.KtLightClass -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.j2k.ast.* import org.jetbrains.kotlin.types.expressions.OperatorConventions @@ -143,32 +143,32 @@ fun Converter.convertToKotlinAnalogIdentifier(classQualifiedName: String?, mutab } val toKotlinTypesMap: Map = mapOf( - CommonClassNames.JAVA_LANG_OBJECT to KotlinBuiltInsNames.FqNames.any.asString(), - CommonClassNames.JAVA_LANG_BYTE to KotlinBuiltInsNames.FqNames._byte.asString(), - CommonClassNames.JAVA_LANG_CHARACTER to KotlinBuiltInsNames.FqNames._char.asString(), - CommonClassNames.JAVA_LANG_DOUBLE to KotlinBuiltInsNames.FqNames._double.asString(), - CommonClassNames.JAVA_LANG_FLOAT to KotlinBuiltInsNames.FqNames._float.asString(), - CommonClassNames.JAVA_LANG_INTEGER to KotlinBuiltInsNames.FqNames._int.asString(), - CommonClassNames.JAVA_LANG_LONG to KotlinBuiltInsNames.FqNames._long.asString(), - CommonClassNames.JAVA_LANG_SHORT to KotlinBuiltInsNames.FqNames._short.asString(), - CommonClassNames.JAVA_LANG_BOOLEAN to KotlinBuiltInsNames.FqNames._boolean.asString(), - CommonClassNames.JAVA_LANG_ITERABLE to KotlinBuiltInsNames.FqNames.iterable.asString(), - CommonClassNames.JAVA_UTIL_ITERATOR to KotlinBuiltInsNames.FqNames.iterator.asString(), - CommonClassNames.JAVA_UTIL_LIST to KotlinBuiltInsNames.FqNames.list.asString(), - CommonClassNames.JAVA_UTIL_COLLECTION to KotlinBuiltInsNames.FqNames.collection.asString(), - CommonClassNames.JAVA_UTIL_SET to KotlinBuiltInsNames.FqNames.set.asString(), - CommonClassNames.JAVA_UTIL_MAP to KotlinBuiltInsNames.FqNames.map.asString(), - CommonClassNames.JAVA_UTIL_MAP_ENTRY to KotlinBuiltInsNames.FqNames.mapEntry.asString(), - java.util.ListIterator::class.java.canonicalName to KotlinBuiltInsNames.FqNames.listIterator.asString() + CommonClassNames.JAVA_LANG_OBJECT to StandardNames.FqNames.any.asString(), + CommonClassNames.JAVA_LANG_BYTE to StandardNames.FqNames._byte.asString(), + CommonClassNames.JAVA_LANG_CHARACTER to StandardNames.FqNames._char.asString(), + CommonClassNames.JAVA_LANG_DOUBLE to StandardNames.FqNames._double.asString(), + CommonClassNames.JAVA_LANG_FLOAT to StandardNames.FqNames._float.asString(), + CommonClassNames.JAVA_LANG_INTEGER to StandardNames.FqNames._int.asString(), + CommonClassNames.JAVA_LANG_LONG to StandardNames.FqNames._long.asString(), + CommonClassNames.JAVA_LANG_SHORT to StandardNames.FqNames._short.asString(), + CommonClassNames.JAVA_LANG_BOOLEAN to StandardNames.FqNames._boolean.asString(), + CommonClassNames.JAVA_LANG_ITERABLE to StandardNames.FqNames.iterable.asString(), + CommonClassNames.JAVA_UTIL_ITERATOR to StandardNames.FqNames.iterator.asString(), + CommonClassNames.JAVA_UTIL_LIST to StandardNames.FqNames.list.asString(), + CommonClassNames.JAVA_UTIL_COLLECTION to StandardNames.FqNames.collection.asString(), + CommonClassNames.JAVA_UTIL_SET to StandardNames.FqNames.set.asString(), + CommonClassNames.JAVA_UTIL_MAP to StandardNames.FqNames.map.asString(), + CommonClassNames.JAVA_UTIL_MAP_ENTRY to StandardNames.FqNames.mapEntry.asString(), + java.util.ListIterator::class.java.canonicalName to StandardNames.FqNames.listIterator.asString() ) val toKotlinMutableTypesMap: Map = mapOf( - CommonClassNames.JAVA_UTIL_ITERATOR to KotlinBuiltInsNames.FqNames.mutableIterator.asString(), - CommonClassNames.JAVA_UTIL_LIST to KotlinBuiltInsNames.FqNames.mutableList.asString(), - CommonClassNames.JAVA_UTIL_COLLECTION to KotlinBuiltInsNames.FqNames.mutableCollection.asString(), - CommonClassNames.JAVA_UTIL_SET to KotlinBuiltInsNames.FqNames.mutableSet.asString(), - CommonClassNames.JAVA_UTIL_MAP to KotlinBuiltInsNames.FqNames.mutableMap.asString(), - CommonClassNames.JAVA_UTIL_MAP_ENTRY to KotlinBuiltInsNames.FqNames.mutableMapEntry.asString(), - java.util.ListIterator::class.java.canonicalName to KotlinBuiltInsNames.FqNames.mutableListIterator.asString() + CommonClassNames.JAVA_UTIL_ITERATOR to StandardNames.FqNames.mutableIterator.asString(), + CommonClassNames.JAVA_UTIL_LIST to StandardNames.FqNames.mutableList.asString(), + CommonClassNames.JAVA_UTIL_COLLECTION to StandardNames.FqNames.mutableCollection.asString(), + CommonClassNames.JAVA_UTIL_SET to StandardNames.FqNames.mutableSet.asString(), + CommonClassNames.JAVA_UTIL_MAP to StandardNames.FqNames.mutableMap.asString(), + CommonClassNames.JAVA_UTIL_MAP_ENTRY to StandardNames.FqNames.mutableMapEntry.asString(), + java.util.ListIterator::class.java.canonicalName to StandardNames.FqNames.mutableListIterator.asString() ) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExternalChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExternalChecker.kt index fcc61eee32a..fe333e7cbc8 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExternalChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExternalChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.js.resolve.diagnostics -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0 @@ -78,9 +78,9 @@ object JsExternalChecker : DeclarationChecker { if (descriptor is ClassDescriptor && descriptor.kind != ClassKind.ANNOTATION_CLASS) { val superClasses = (listOfNotNull(descriptor.getSuperClassNotAny()) + descriptor.getSuperInterfaces()).toMutableSet() if (descriptor.kind == ClassKind.ENUM_CLASS || descriptor.kind == ClassKind.ENUM_ENTRY) { - superClasses.removeAll { it.fqNameUnsafe == KotlinBuiltInsNames.FqNames._enum } + superClasses.removeAll { it.fqNameUnsafe == StandardNames.FqNames._enum } } - if (superClasses.any { !AnnotationsUtils.isNativeObject(it) && it.fqNameSafe != KotlinBuiltInsNames.FqNames.throwable }) { + if (superClasses.any { !AnnotationsUtils.isNativeObject(it) && it.fqNameSafe != StandardNames.FqNames.throwable }) { trace.report(ErrorsJs.EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE.on(declaration)) } } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt index cf4e2d79a4a..5137db0ea8a 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JavaScriptStringTable.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.serialization.js -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters import org.jetbrains.kotlin.name.ClassId @@ -36,7 +36,7 @@ class JavaScriptStringTable : StringTableImpl() { superClassifiers[0].classId } else { val superClass = superClassifiers.find { !DescriptorUtils.isInterface(it) } - superClass?.classId ?: ClassId.topLevel(KotlinBuiltInsNames.FqNames.any.toSafe()) + superClass?.classId ?: ClassId.topLevel(StandardNames.FqNames.any.toSafe()) } } else { super.getLocalClassIdReplacement(descriptor) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index a44495c47b3..6054d7af253 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isFunctionTypeOrSubtype import org.jetbrains.kotlin.builtins.isSuspendFunctionTypeOrSubtype import org.jetbrains.kotlin.descriptors.CallableDescriptor @@ -177,10 +177,10 @@ private fun mayBeMarkByRangeMetadata(resolvedCall: ResolvedCall when (resolvedCall.resultingDescriptor.returnType?.constructor?.declarationDescriptor?.fqNameUnsafe) { - KotlinBuiltInsNames.FqNames.intRange -> { + StandardNames.FqNames.intRange -> { callExpression.range = Pair(RangeType.INT, RangeKind.UNTIL) } - KotlinBuiltInsNames.FqNames.longRange -> { + StandardNames.FqNames.longRange -> { callExpression.range = Pair(RangeType.LONG, RangeKind.UNTIL) } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt index d389c50eb88..4eddd449d92 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/EnumTranslator.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.declaration import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.backend.ast.* @@ -40,7 +40,7 @@ class EnumTranslator( } private fun generateValuesFunction() { - val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUES)) + val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, StandardNames.ENUM_VALUES)) val values = entries.map { JsInvocation(JsAstUtils.pureFqn(context().getNameForObjectInstance(it), null)).source(psi) @@ -49,7 +49,7 @@ class EnumTranslator( } private fun generateValueOfFunction() { - val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUE_OF)) + val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, StandardNames.ENUM_VALUE_OF)) val nameParam = JsScope.declareTemporaryName("name") function.parameters += JsParameter(nameParam) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt index 366721bd5ed..5d4c10e472f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.expression import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator @@ -316,7 +316,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont } fun findCollection() = - context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(KotlinBuiltInsNames.FqNames.collection))!! + context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(StandardNames.FqNames.collection))!! fun translateForOverCollectionIndices(info: WithIndexInfo): JsStatement { val range = context.cacheExpressionIfNeeded(info.range) @@ -337,7 +337,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont } fun findIterable() = - context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(KotlinBuiltInsNames.FqNames.iterable))!! + context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(StandardNames.FqNames.iterable))!! fun findSequence() = context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(sequenceFqName))!! diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.kt index 98229373695..4d7c269d809 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.kt @@ -141,7 +141,7 @@ object ArrayFIF : CompositeFIF() { } init { - val arrayName = KotlinBuiltInsNames.FqNames.array.shortName() + val arrayName = StandardNames.FqNames.array.shortName() val arrayTypeNames = mutableListOf(arrayName) PrimitiveType.values().mapTo(arrayTypeNames) { it.arrayTypeName } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ThrowableConstructorIntrinsicFactory.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ThrowableConstructorIntrinsicFactory.kt index 21e86248cfc..f31df10f517 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ThrowableConstructorIntrinsicFactory.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ThrowableConstructorIntrinsicFactory.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.backend.ast.JsExpression @@ -42,7 +42,7 @@ object ThrowableConstructorIntrinsicFactory : FunctionIntrinsicFactory { val constructor = callInfo.resolvedCall.resultingDescriptor val argumentsToPass = arguments.toMutableList() val hasCauseParameter = constructor.valueParameters.any { - it.type.constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.throwable + it.type.constructor.declarationDescriptor?.fqNameSafe == StandardNames.FqNames.throwable } if (constructor.valueParameters.size == 1 && hasCauseParameter) { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index 0fc3c10255b..0ea1ae8fee5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.types.KotlinType; import java.util.List; import java.util.Map; -import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames; +import static org.jetbrains.kotlin.builtins.StandardNames.FqNames; import static org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern; public final class TopLevelFIF extends CompositeFIF { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt index 05609454e4b..65c926e9c57 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects import org.jetbrains.kotlin.builtins.CompanionObjectMapping -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.js.translate.context.TranslationContext @@ -41,7 +41,7 @@ class ObjectIntrinsics { } private fun createIntrinsic(classDescriptor: ClassDescriptor): ObjectIntrinsic? { - if (classDescriptor.fqNameUnsafe == KotlinBuiltInsNames.FqNames._enum || + if (classDescriptor.fqNameUnsafe == StandardNames.FqNames._enum || !CompanionObjectMapping.isMappedIntrinsicCompanionObject(classDescriptor) ) { return null diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index fb424bd43b4..64ac2546ac0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.reference; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.js.backend.ast.JsExpression; @@ -52,7 +52,7 @@ public final class ReferenceTranslator { private static final Set DECLARATIONS_WITHOUT_SIDE_EFFECTS = new HashSet<>(Arrays.asList( new FqNameUnsafe("kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED"), new FqNameUnsafe("kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED"), - KotlinBuiltInsNames.FqNames.unit + StandardNames.FqNames.unit )); private ReferenceTranslator() { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java index ee3217e0809..e9bcf1b7ab5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java @@ -20,7 +20,7 @@ import com.intellij.util.SmartList; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.SourceElement; import org.jetbrains.kotlin.js.backend.ast.*; @@ -227,25 +227,25 @@ public final class JsAstUtils { @NotNull public static JsExpression byteToUByte(byte value, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uByte); + return toUnsignedNumber(new JsIntLiteral(value), context, StandardNames.FqNames.uByte); } @NotNull public static JsExpression shortToUShort(short value, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uShort); + return toUnsignedNumber(new JsIntLiteral(value), context, StandardNames.FqNames.uShort); } @NotNull public static JsExpression intToUInt(int value, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uInt); + return toUnsignedNumber(new JsIntLiteral(value), context, StandardNames.FqNames.uInt); } @NotNull public static JsExpression longToULong(@NotNull JsExpression expression, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(expression, context, KotlinBuiltInsNames.FqNames.uLong); + return toUnsignedNumber(expression, context, StandardNames.FqNames.uLong); } private static JsExpression toUnsignedNumber( diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java index 93b58edfc03..258abbda5af 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java @@ -20,7 +20,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -42,7 +42,7 @@ import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; public final class JsDescriptorUtils { // TODO: maybe we should use external annotations or something else. private static final Set FAKE_CLASSES = ContainerUtil.immutableSet( - KotlinBuiltInsNames.FqNames.any.asString() + StandardNames.FqNames.any.asString() ); private JsDescriptorUtils() { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java index 6705a0adc6c..0755b8401e6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.FunctionTypesKt; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; +import org.jetbrains.kotlin.builtins.StandardNames; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.config.CoroutineLanguageVersionSettingsUtilKt; import org.jetbrains.kotlin.descriptors.*; @@ -60,7 +60,7 @@ public final class TranslationUtils { new FqNameUnsafe("kotlin.ranges.CharProgression"), new FqNameUnsafe("kotlin.js.internal.CharCompanionObject"), new FqNameUnsafe("kotlin.Char.Companion"), - KotlinBuiltInsNames.FqNames.charSequence, KotlinBuiltInsNames.FqNames.number + StandardNames.FqNames.charSequence, StandardNames.FqNames.number )); private TranslationUtils() { @@ -453,7 +453,7 @@ public final class TranslationUtils { FqNameUnsafe containingClassName = DescriptorUtilsKt.getFqNameUnsafe(containingClass); if (!CLASSES_WITH_NON_BOXED_CHARS.contains(containingClassName) && !KotlinBuiltIns.isPrimitiveType(containingClass.getDefaultType()) && - !KotlinBuiltInsNames.isPrimitiveArray(containingClassName) + !StandardNames.isPrimitiveArray(containingClassName) ) { return getAnyTypeFromSameModule(descriptor); } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt index c11bf20a28c..297df4f80ed 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.utils -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames 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 = listOf( - KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.intern(), + StandardNames.BUILT_INS_PACKAGE_FQ_NAME.intern(), FqName("kotlinx").intern() ) diff --git a/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt b/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt index acbee77ada4..8cdb5b47a1d 100644 --- a/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt +++ b/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt @@ -7,7 +7,7 @@ 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.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeThrowsChecker.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeThrowsChecker.kt index 8e404231e82..6eb39c3cbf3 100644 --- a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeThrowsChecker.kt +++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeThrowsChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.resolve.konan.diagnostics -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames 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( - KotlinBuiltInsNames.FqNames.throwable, + StandardNames.FqNames.throwable, FqName("kotlin.Exception"), FqName("kotlin.RuntimeException"), FqName("kotlin.IllegalStateException"), diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityBoundTypeCalculator.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityBoundTypeCalculator.kt index 37b4da7de13..2acb96720da 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityBoundTypeCalculator.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityBoundTypeCalculator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k.inference.mutability -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.nj2k.inference.common.BoundType diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityConstraintsCollector.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityConstraintsCollector.kt index ab9dca8987e..e2038ab2015 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityConstraintsCollector.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityConstraintsCollector.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k.inference.mutability -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames +import org.jetbrains.kotlin.builtins.StandardNames.FqNames import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.nj2k.inference.common.* diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityStateUpdater.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityStateUpdater.kt index d20d36046fb..ff7874f74fe 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityStateUpdater.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/mutability/MutabilityStateUpdater.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k.inference.mutability -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.nj2k.inference.common.State import org.jetbrains.kotlin.nj2k.inference.common.StateUpdater @@ -54,13 +54,13 @@ class MutabilityStateUpdater : StateUpdater() { } val mutableToImmutable = mapOf( - KotlinBuiltInsNames.FqNames.mutableIterator to KotlinBuiltInsNames.FqNames.iterator, - KotlinBuiltInsNames.FqNames.mutableCollection to KotlinBuiltInsNames.FqNames.collection, - KotlinBuiltInsNames.FqNames.mutableList to KotlinBuiltInsNames.FqNames.list, - KotlinBuiltInsNames.FqNames.mutableListIterator to KotlinBuiltInsNames.FqNames.listIterator, - KotlinBuiltInsNames.FqNames.mutableSet to KotlinBuiltInsNames.FqNames.set, - KotlinBuiltInsNames.FqNames.mutableMap to KotlinBuiltInsNames.FqNames.map, - KotlinBuiltInsNames.FqNames.mutableMapEntry to KotlinBuiltInsNames.FqNames.mapEntry + StandardNames.FqNames.mutableIterator to StandardNames.FqNames.iterator, + StandardNames.FqNames.mutableCollection to StandardNames.FqNames.collection, + StandardNames.FqNames.mutableList to StandardNames.FqNames.list, + StandardNames.FqNames.mutableListIterator to StandardNames.FqNames.listIterator, + StandardNames.FqNames.mutableSet to StandardNames.FqNames.set, + StandardNames.FqNames.mutableMap to StandardNames.FqNames.map, + StandardNames.FqNames.mutableMapEntry to StandardNames.FqNames.mapEntry ) val immutableToMutable = mutableToImmutable.map { (key, value) -> value to key }.toMap() diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt index e4c9c2c9ca9..1e8164912b2 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k.conversions -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.nj2k.NewJ2kConverterContext @@ -80,7 +80,7 @@ class ArrayInitializerConversion(context: NewJ2kConverterContext) : RecursiveApp ) for (i in 0 until dimensions.size - 2) { resultType = JKClassType( - symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.array.toSafe()), + symbolProvider.provideClassSymbol(StandardNames.FqNames.array.toSafe()), listOf(resultType), Nullability.Default ) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt index 51ed2b299f5..0cf0fcf91c0 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.nj2k.conversions -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.nj2k.* import org.jetbrains.kotlin.nj2k.symbols.JKMethodSymbol import org.jetbrains.kotlin.nj2k.symbols.JKUnresolvedField @@ -499,7 +499,7 @@ class BuiltinMembersConversion(context: NewJ2kConverterContext) : RecursiveAppli }, Method("java.lang.String.format") convertTo CustomExpression { expression -> JKClassAccessExpression( - symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.string) + symbolProvider.provideClassSymbol(StandardNames.FqNames.string) ).callOn( symbolProvider.provideMethodSymbol("kotlin.text.String.format"), (expression as JKCallExpression).arguments::arguments.detached() diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt index 57c59d9b54d..83e5e315a8d 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt @@ -9,7 +9,7 @@ package org.jetbrains.kotlin.nj2k.symbols import com.intellij.psi.PsiMethod import com.intellij.psi.PsiReference import org.jetbrains.kotlin.asJava.elements.KtLightMethod -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.nj2k.tree.JKClass @@ -72,7 +72,7 @@ class JKMultiverseFunctionSymbol( type?.let { if (parameter.isVarArg) { JKClassType( - symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.array.toSafe()), + symbolProvider.provideClassSymbol(StandardNames.FqNames.array.toSafe()), listOf(it) ) } else it diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/types/JKTypeFactory.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/types/JKTypeFactory.kt index 934d8818f98..2c034cc8998 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/types/JKTypeFactory.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/types/JKTypeFactory.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.nj2k.types import com.intellij.psi.* -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName @@ -36,24 +36,24 @@ class JKTypeFactory(val symbolProvider: JKSymbolProvider) { nullability ) - val boolean = typeByFqName(KotlinBuiltInsNames.FqNames._boolean) - val char = typeByFqName(KotlinBuiltInsNames.FqNames._char) - val byte = typeByFqName(KotlinBuiltInsNames.FqNames._byte) - val short = typeByFqName(KotlinBuiltInsNames.FqNames._short) - val int = typeByFqName(KotlinBuiltInsNames.FqNames._int) - val float = typeByFqName(KotlinBuiltInsNames.FqNames._float) - val long = typeByFqName(KotlinBuiltInsNames.FqNames._long) - val double = typeByFqName(KotlinBuiltInsNames.FqNames._double) + val boolean = typeByFqName(StandardNames.FqNames._boolean) + val char = typeByFqName(StandardNames.FqNames._char) + val byte = typeByFqName(StandardNames.FqNames._byte) + val short = typeByFqName(StandardNames.FqNames._short) + val int = typeByFqName(StandardNames.FqNames._int) + val float = typeByFqName(StandardNames.FqNames._float) + val long = typeByFqName(StandardNames.FqNames._long) + val double = typeByFqName(StandardNames.FqNames._double) - val string = typeByFqName(KotlinBuiltInsNames.FqNames.string) - val possiblyNullString = typeByFqName(KotlinBuiltInsNames.FqNames.string, nullability = Nullability.Default) + val string = typeByFqName(StandardNames.FqNames.string) + val possiblyNullString = typeByFqName(StandardNames.FqNames.string, nullability = Nullability.Default) - val unit = typeByFqName(KotlinBuiltInsNames.FqNames.unit) - val nothing = typeByFqName(KotlinBuiltInsNames.FqNames.nothing) - val nullableAny = typeByFqName(KotlinBuiltInsNames.FqNames.any, nullability = Nullability.Nullable) + val unit = typeByFqName(StandardNames.FqNames.unit) + val nothing = typeByFqName(StandardNames.FqNames.nothing) + val nullableAny = typeByFqName(StandardNames.FqNames.any, nullability = Nullability.Nullable) val javaKlass = typeByFqName(FqNameUnsafe(CommonClassNames.JAVA_LANG_CLASS)) - val kotlinClass = typeByFqName(KotlinBuiltInsNames.FqNames.kClass) + val kotlinClass = typeByFqName(StandardNames.FqNames.kClass) } fun fromPrimitiveType(primitiveType: JKJavaPrimitiveType) = when (primitiveType.jvmPrimitiveType) { diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt index 98db4f672d0..0bedd111177 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt @@ -9,7 +9,7 @@ import com.intellij.psi.CommonClassNames import com.intellij.psi.PsiClass import com.intellij.psi.PsiClassType import com.intellij.psi.PsiType -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName @@ -119,7 +119,7 @@ fun JKType.isStringType(): Boolean = fun JKClassSymbol.isStringType(): Boolean = fqName == CommonClassNames.JAVA_LANG_STRING - || fqName == KotlinBuiltInsNames.FqNames.string.asString() + || fqName == StandardNames.FqNames.string.asString() fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? = when (this) { @@ -137,14 +137,14 @@ fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? = fun JKType.asPrimitiveType(): JKJavaPrimitiveType? = if (this is JKJavaPrimitiveType) this else when ((this as? JKClassType)?.classReference?.fqName) { - KotlinBuiltInsNames.FqNames._char.asString(), CommonClassNames.JAVA_LANG_CHARACTER -> JKJavaPrimitiveType.CHAR - KotlinBuiltInsNames.FqNames._boolean.asString(), CommonClassNames.JAVA_LANG_BOOLEAN -> JKJavaPrimitiveType.BOOLEAN - KotlinBuiltInsNames.FqNames._int.asString(), CommonClassNames.JAVA_LANG_INTEGER -> JKJavaPrimitiveType.INT - KotlinBuiltInsNames.FqNames._long.asString(), CommonClassNames.JAVA_LANG_LONG -> JKJavaPrimitiveType.LONG - KotlinBuiltInsNames.FqNames._float.asString(), CommonClassNames.JAVA_LANG_FLOAT -> JKJavaPrimitiveType.FLOAT - KotlinBuiltInsNames.FqNames._double.asString(), CommonClassNames.JAVA_LANG_DOUBLE -> JKJavaPrimitiveType.DOUBLE - KotlinBuiltInsNames.FqNames._byte.asString(), CommonClassNames.JAVA_LANG_BYTE -> JKJavaPrimitiveType.BYTE - KotlinBuiltInsNames.FqNames._short.asString(), CommonClassNames.JAVA_LANG_SHORT -> JKJavaPrimitiveType.SHORT + StandardNames.FqNames._char.asString(), CommonClassNames.JAVA_LANG_CHARACTER -> JKJavaPrimitiveType.CHAR + StandardNames.FqNames._boolean.asString(), CommonClassNames.JAVA_LANG_BOOLEAN -> JKJavaPrimitiveType.BOOLEAN + StandardNames.FqNames._int.asString(), CommonClassNames.JAVA_LANG_INTEGER -> JKJavaPrimitiveType.INT + StandardNames.FqNames._long.asString(), CommonClassNames.JAVA_LANG_LONG -> JKJavaPrimitiveType.LONG + StandardNames.FqNames._float.asString(), CommonClassNames.JAVA_LANG_FLOAT -> JKJavaPrimitiveType.FLOAT + StandardNames.FqNames._double.asString(), CommonClassNames.JAVA_LANG_DOUBLE -> JKJavaPrimitiveType.DOUBLE + StandardNames.FqNames._byte.asString(), CommonClassNames.JAVA_LANG_BYTE -> JKJavaPrimitiveType.BYTE + StandardNames.FqNames._short.asString(), CommonClassNames.JAVA_LANG_SHORT -> JKJavaPrimitiveType.SHORT else -> null } @@ -170,7 +170,7 @@ val primitiveTypes = fun JKType.arrayFqName(): String = if (this is JKJavaPrimitiveType) PrimitiveType.valueOf(jvmPrimitiveType.name).arrayTypeFqName.asString() - else KotlinBuiltInsNames.FqNames.array.asString() + else StandardNames.FqNames.array.asString() fun JKClassSymbol.isArrayType(): Boolean = fqName in arrayFqNames @@ -178,7 +178,7 @@ fun JKClassSymbol.isArrayType(): Boolean = @OptIn(ExperimentalStdlibApi::class) private val arrayFqNames = buildList { JKJavaPrimitiveType.ALL.mapTo(this) { PrimitiveType.valueOf(it.jvmPrimitiveType.name).arrayTypeFqName.asString() } - add(KotlinBuiltInsNames.FqNames.array.asString()) + add(StandardNames.FqNames.array.asString()) } fun JKType.isArrayType() = @@ -189,19 +189,19 @@ fun JKType.isArrayType() = } fun JKType.isUnit() = - safeAs()?.classReference?.fqName == KotlinBuiltInsNames.FqNames.unit.asString() + safeAs()?.classReference?.fqName == StandardNames.FqNames.unit.asString() val JKType.isCollectionType: Boolean get() = safeAs()?.classReference?.fqName in collectionFqNames private val collectionFqNames = setOf( - KotlinBuiltInsNames.FqNames.mutableIterator.asString(), - KotlinBuiltInsNames.FqNames.mutableList.asString(), - KotlinBuiltInsNames.FqNames.mutableCollection.asString(), - KotlinBuiltInsNames.FqNames.mutableSet.asString(), - KotlinBuiltInsNames.FqNames.mutableMap.asString(), - KotlinBuiltInsNames.FqNames.mutableMapEntry.asString(), - KotlinBuiltInsNames.FqNames.mutableListIterator.asString() + StandardNames.FqNames.mutableIterator.asString(), + StandardNames.FqNames.mutableList.asString(), + StandardNames.FqNames.mutableCollection.asString(), + StandardNames.FqNames.mutableSet.asString(), + StandardNames.FqNames.mutableMap.asString(), + StandardNames.FqNames.mutableMapEntry.asString(), + StandardNames.FqNames.mutableListIterator.asString() ) fun JKType.arrayInnerType(): JKType? = @@ -231,7 +231,7 @@ fun JKType.replaceJavaClassWithKotlinClassType(symbolProvider: JKSymbolProvider) applyRecursive { type -> if (type is JKClassType && type.classReference.fqName == "java.lang.Class") { JKClassType( - symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.kClass.toSafe()), + symbolProvider.provideClassSymbol(StandardNames.FqNames.kClass.toSafe()), type.parameters.map { it.replaceJavaClassWithKotlinClassType(symbolProvider) }, Nullability.NotNull ) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 0ed69bbe01c..0b085442198 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -25,7 +25,7 @@ import com.sun.tools.javac.tree.TreeMaker import com.sun.tools.javac.tree.TreeScanner import kotlinx.kapt.KaptIgnored import org.jetbrains.kotlin.base.kapt3.KaptFlag -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_PARAMETER_NAME import org.jetbrains.kotlin.codegen.needsExperimentalCoroutinesWrapper @@ -945,8 +945,8 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati && kaptContext.generationState.languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) return when (areCoroutinesReleased) { - true -> KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE - false -> KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL + true -> StandardNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE + false -> StandardNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL } } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt index dfdb0f48fe5..dfa7745a657 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForEnumsGenerator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.ir -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.ir.builders.* @@ -57,7 +57,7 @@ class SerializerForEnumsGenerator( val serialDescGetter = irGet(descriptorGetterSymbol.owner.returnType, irThis(), descriptorGetterSymbol) val serializableIrClass = requireNotNull(serializableIrClass) { "Enums do not support external serialization" } - val valuesF = serializableIrClass.functions.single { it.name == KotlinBuiltInsNames.ENUM_VALUES } + val valuesF = serializableIrClass.functions.single { it.name == StandardNames.ENUM_VALUES } val getValues = irInvoke(dispatchReceiver = null, callee = valuesF.symbol) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt index bd783610212..4f15584aaf4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/JsCodegenUtil.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.js -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi @@ -172,7 +172,7 @@ internal fun AbstractSerialGenerator.serializerInstance( context.getInnerNameForDescriptor( DescriptorUtils.getFunctionByName( kType.toClassDescriptor!!.staticScope, - KotlinBuiltInsNames.ENUM_VALUES + StandardNames.ENUM_VALUES ) ).makeRef() ) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/SerializerForEnumsTranslator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/SerializerForEnumsTranslator.kt index a0a9a28fd02..71b5ea0c83e 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/SerializerForEnumsTranslator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/js/SerializerForEnumsTranslator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.js -import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -38,7 +38,7 @@ class SerializerForEnumsTranslator( val decoderClass = serializerDescriptor.getClassFromSerializationPackage(SerialEntityNames.DECODER_CLASS) val serialClassDescRef = JsNameRef(context.getNameForDescriptor(anySerialDescProperty!!), JsThisRef()) val decodeEnumF = ctx.getNameForDescriptor(decoderClass.getFuncDesc(CallingConventions.decodeEnum).single()) - val valuesFunc = DescriptorUtils.getFunctionByName(serializableDescriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUES) + val valuesFunc = DescriptorUtils.getFunctionByName(serializableDescriptor.staticScope, StandardNames.ENUM_VALUES) val decodeEnumCall = JsInvocation(JsNameRef(decodeEnumF, JsNameRef(jsFun.parameters[0].name)), serialClassDescRef) val resultCall = JsArrayAccess(JsInvocation(ctx.getInnerNameForDescriptor(valuesFunc).makeRef()), decodeEnumCall) +JsReturn(resultCall)