From 7a7fe77b8e81c5ed9055fd5f3b40a8b353be3f2e Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Sun, 16 Aug 2020 22:57:12 +0300 Subject: [PATCH] Move static constants with builtin names to :core:descriptors.common module --- .../codegen/ImplementationBodyCodegen.java | 2 + .../kotlin/codegen/JvmCodegenUtil.java | 3 +- .../coroutines/coroutineCodegenUtil.kt | 8 +- .../kotlin/codegen/inline/InlineCodegen.kt | 4 +- .../kotlin/codegen/inline/inlineIntrinsics.kt | 3 +- .../codegen/intrinsics/IntrinsicMethods.java | 36 +-- .../kotlin/codegen/intrinsics/IteratorNext.kt | 2 +- .../codegen/intrinsics/TypeIntrinsics.kt | 23 +- .../kotlin/codegen/range/RangeCodegenUtil.kt | 5 +- .../kotlin/codegen/state/KotlinTypeMapper.kt | 1 + .../kotlin/codegen/state/typeMappingUtil.kt | 8 +- .../builtins/BuiltInsSerializer.kt | 6 +- .../CoroutineLanguageVersionSettingsUtil.kt | 12 +- .../fir/backend/Fir2IrDeclarationStorage.kt | 2 +- .../deserialization/ClassDeserialization.kt | 4 +- .../fir/deserialization/suspendTypeUtils.kt | 5 +- .../kotlin/fir/resolve/ResolveUtils.kt | 4 +- .../impl/FirBuiltinSymbolProvider.kt | 4 +- .../impl/FirCloneableSymbolProvider.kt | 4 +- .../kotlin/fir/types/ConeTypeContext.kt | 6 +- .../kotlin/asJava/SyntheticElementUtils.kt | 4 +- .../JavaActualAnnotationArgumentExtractor.kt | 4 +- .../kotlin/resolve/AnnotationChecker.kt | 6 +- .../resolve/CollectionLiteralResolver.kt | 4 +- .../kotlin/resolve/DeclarationsChecker.kt | 3 +- .../resolve/DelegatedPropertyResolver.kt | 3 +- .../resolve/FunctionDescriptorResolver.kt | 7 +- .../kotlin/resolve/VarianceChecker.kt | 4 +- .../AbstractReflectionApiCallChecker.kt | 3 +- .../resolve/calls/checkers/TypeOfChecker.kt | 2 +- .../calls/checkers/coroutineCallChecker.kt | 13 +- ...nnotationClassTargetAndRetentionChecker.kt | 8 +- .../DeprecatedSinceKotlinAnnotationChecker.kt | 8 +- ...entalMarkerDeclarationAnnotationChecker.kt | 4 +- .../checkers/PublishedApiUsageChecker.kt | 4 +- .../ResultClassInReturnTypeChecker.kt | 7 +- .../evaluate/ConstantExpressionEvaluator.kt | 3 +- .../deprecation/DeprecationResolver.kt | 5 +- .../diagnostics/KotlinSuppressCache.kt | 4 +- .../jetbrains/kotlin/backend/common/ir/Ir.kt | 3 +- .../FlattenStringConcatenationLowering.kt | 8 +- .../common/lower/SpecialBridgeMethods.kt | 50 +-- .../jetbrains/kotlin/ir/util/IrTypeUtils.kt | 6 +- .../backend/jvm/JvmGeneratorExtensions.kt | 6 +- .../kotlin/backend/jvm/JvmSymbols.kt | 9 +- .../backend/jvm/codegen/AnnotationCodegen.kt | 6 +- .../jvm/codegen/MethodSignatureMapper.kt | 8 +- .../backend/jvm/codegen/irCodegenUtils.kt | 6 +- .../jvm/intrinsics/IrIntrinsicMethods.kt | 37 ++- .../backend/jvm/intrinsics/IteratorNext.kt | 4 +- .../AdditionalClassAnnotationLowering.kt | 8 +- .../backend/jvm/lower/AssertionLowering.kt | 4 +- .../lower/FunctionNVarargBridgeLowering.kt | 8 +- .../jvm/lower/JvmInlineClassLowering.kt | 4 +- .../backend/jvm/lower/VarargLowering.kt | 6 +- .../jvm/lower/inlineclasses/InlineClassAbi.kt | 4 +- .../transformations/InsertImplicitCasts.kt | 3 +- .../ir/descriptors/IrFunctionFactory.kt | 2 +- .../kotlin/ir/types/IrTypeSystemContext.kt | 10 +- .../jetbrains/kotlin/ir/types/IrTypeUtils.kt | 4 +- .../kotlin/ir/types/irTypePredicates.kt | 65 ++-- .../kotlin/asJava/classes/ultraLightUtils.kt | 9 +- .../elements/KtToJvmAnnotationsConverter.kt | 10 +- .../org/jetbrains/kotlin/psi/KtPsiUtil.java | 4 +- .../components/PostponedArgumentsAnalyzer.kt | 6 +- .../results/OverloadingConflictResolver.kt | 9 +- .../resolve/calls/util/isFromStdlibJre7Or8.kt | 10 +- .../jetbrains/kotlin/TestHelperGenerator.kt | 8 +- .../checkers/AbstractDiagnosticsTest.kt | 3 +- .../AbstractDiagnosticsTestWithStdLib.kt | 6 +- .../checkers/KotlinMultiFileTestWithJava.kt | 8 +- .../codegen/AbstractBlackBoxCodegenTest.java | 4 +- .../codegen/AbstractBytecodeListingTest.kt | 4 +- .../kotlin/resolve/ExpectedResolveData.java | 4 +- .../AbstractBuiltInsWithJDKMembersTest.kt | 7 +- .../jetbrains/kotlin/test/KotlinBaseTest.kt | 8 +- .../util/RecursiveDescriptorComparator.java | 4 +- .../builtins/LoadBuiltinsTest.java | 2 +- .../kotlin/types/TypeUnifierTest.java | 4 +- .../jetbrains/kotlin/types/typeTestUtils.kt | 4 +- .../metadata/KlibMetadataStringTable.kt | 4 +- .../kotlin/builtins/KotlinBuiltInsNames.kt | 208 ++++++++++++ .../kotlin/builtins/PrimitiveType.kt | 19 +- .../builtins/jvm/JavaToKotlinClassMap.kt | 38 +-- .../jvm/JvmBuiltInClassDescriptorFactory.kt | 8 +- .../builtins/jvm/JvmBuiltInsSettings.kt | 3 +- .../java/FakePureImplementationsProvider.kt | 8 +- .../java/components/JavaAnnotationMapper.kt | 38 +-- .../load/java/lazy/LazyJavaAnnotations.kt | 4 +- .../descriptors/LazyJavaClassDescriptor.kt | 3 +- .../descriptors/LazyJavaStaticClassScope.kt | 8 +- .../kotlin/load/java/specialBuiltinMembers.kt | 18 +- .../load/kotlin/methodSignatureMapping.kt | 4 +- .../resolve/jvm/inlineClassManglingRules.kt | 3 +- .../runtime/components/ReflectKotlinClass.kt | 10 +- .../components/ReflectKotlinClassFinder.kt | 4 +- .../kotlin/builtins/CompanionObjectMapping.kt | 6 +- .../kotlin/builtins/KotlinBuiltIns.java | 298 +++++------------- .../kotlin/builtins/ReflectionTypes.kt | 38 +-- .../jetbrains/kotlin/builtins/UnsignedType.kt | 2 +- .../kotlin/builtins/functionTypes.kt | 23 +- .../functions/FunctionClassDescriptor.kt | 6 +- .../functions/FunctionInterfaceFactory.kt | 8 +- .../kotlin/builtins/suspendFunctionTypes.kt | 17 +- .../descriptors/annotations/annotationUtil.kt | 17 +- .../kotlin/descriptors/descriptorUtil.kt | 9 +- .../kotlin/renderer/DescriptorRendererImpl.kt | 4 +- .../kotlin/resolve/DescriptorFactory.java | 10 +- .../kotlin/resolve/DescriptorUtils.java | 13 - .../kotlin/resolve/DescriptorUtils.kt | 12 +- .../resolve/constants/CompileTimeConstant.kt | 8 +- .../constants/IntegerValueTypeConstructor.kt | 9 +- .../resolve/constants/PrimitiveTypeUtil.kt | 13 +- .../resolve/constants/constantValues.kt | 11 +- .../kotlin/types/TypeSubstitutor.java | 7 +- .../org/jetbrains/kotlin/types/TypeUtils.java | 5 +- .../types/checker/ClassicTypeSystemContext.kt | 12 +- .../deserialization/ClassDeserializer.kt | 4 +- .../builtins/BuiltInsLoaderImpl.kt | 4 +- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 8 +- .../caches/resolve/KotlinCacheServiceImpl.kt | 6 +- .../stubBuilder/ClassClsStubBuilder.kt | 4 +- .../stubBuilder/TypeClsStubBuilder.kt | 13 +- .../decompiler/stubBuilder/clsStubBuilding.kt | 4 +- .../quickfix/KotlinSuppressIntentionAction.kt | 8 +- .../completion/DeclarationLookupObjectImpl.kt | 3 +- .../idea/core/util/RuntimeLibraryUtils.kt | 6 +- .../idea/frontend/api/types/ktTypeUtils.kt | 5 +- .../ConfigureKotlinInProjectUtils.kt | 4 +- .../DebugLabelPropertyDescriptorProvider.kt | 3 +- .../sequence/trace/dsl/KotlinSequenceTypes.kt | 26 +- .../copy/JavaContextDeclarationRenderer.kt | 6 +- ...recatedCallableAddReplaceWithInspection.kt | 8 +- .../JavaCollectionsStaticMethodInspection.kt | 6 +- .../MainFunctionReturnUnitInspection.kt | 3 +- .../MigrateDiagnosticSuppressionInspection.kt | 4 +- .../RedundantUnitExpressionInspection.kt | 6 +- .../UseExpressionBodyInspection.kt | 5 +- .../UselessCallOnCollectionInspection.kt | 8 +- .../ConvertReferenceToLambdaIntention.kt | 4 +- .../SpecifyTypeExplicitlyIntention.kt | 3 +- .../jetbrains/kotlin/idea/intentions/Utils.kt | 5 +- .../result/AddToCollectionTransformation.kt | 14 +- .../kotlin/idea/kdoc/kdocBoringClassifiers.kt | 28 +- .../idea/quickfix/AddAnnotationTargetFix.kt | 10 +- ...RetentionForExpressionAnnotationFactory.kt | 12 +- .../idea/quickfix/WrongPrimitiveLiteralFix.kt | 9 +- .../migration/MigrateExternalExtensionFix.kt | 4 +- .../DeprecatedSymbolUsageFixBase.kt | 3 +- .../org/jetbrains/kotlin/j2k/TypeVisitor.kt | 1 - j2k/src/org/jetbrains/kotlin/j2k/Utils.kt | 50 +-- .../resolve/diagnostics/JsExternalChecker.kt | 6 +- .../serialization/js/JavaScriptStringTable.kt | 4 +- .../callTranslator/CallTranslator.kt | 6 +- .../kotlin/js/translate/context/Namer.java | 5 - .../translate/declaration/EnumTranslator.kt | 7 +- .../js/translate/expression/LoopTranslator.kt | 8 +- .../intrinsic/functions/factories/ArrayFIF.kt | 7 +- .../ThrowableConstructorIntrinsicFactory.kt | 6 +- .../functions/factories/TopLevelFIF.java | 8 +- .../intrinsic/objects/objectsIntrinsics.kt | 4 +- .../reference/ReferenceTranslator.java | 4 +- .../kotlin/js/translate/utils/JsAstUtils.java | 10 +- .../js/translate/utils/JsDescriptorUtils.java | 3 +- .../js/translate/utils/TranslationUtils.java | 3 +- .../descriptors/commonizer/utils/fqName.kt | 4 +- .../kotlin/builtins/konan/KonanBuiltIns.kt | 4 +- .../konan/diagnostics/NativeThrowsChecker.kt | 4 +- .../MutabilityBoundTypeCalculator.kt | 14 +- .../MutabilityConstraintsCollector.kt | 54 ++-- .../mutability/MutabilityStateUpdater.kt | 18 +- .../conversions/ArrayInitializerConversion.kt | 6 +- .../conversions/BuiltinMembersConversion.kt | 5 +- .../kotlin/nj2k/symbols/JKMethodSymbol.kt | 11 +- .../kotlin/nj2k/types/JKTypeFactory.kt | 32 +- .../jetbrains/kotlin/nj2k/types/typesUtils.kt | 47 +-- .../stubs/ClassFileToSourceStubConverter.kt | 6 +- .../backend/ir/SerializerForEnumsGenerator.kt | 6 +- .../compiler/backend/js/JsCodegenUtil.kt | 5 +- .../js/SerializerForEnumsTranslator.kt | 5 +- 180 files changed, 1085 insertions(+), 1025 deletions(-) create mode 100644 core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt rename core/{descriptors => descriptors.common}/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt (66%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 73372272c86..d25471e410f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -62,6 +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.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 2f8f629c6e5..e92fd6c8021 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -12,6 +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.functions.FunctionInvokeDescriptor; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.context.CodegenContext; @@ -404,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(DescriptorUtils.RESULT_FQ_NAME)) { + if (DescriptorUtils.getFqNameSafe(classDescriptor).equals(KotlinBuiltInsNames.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 307e8286b7e..2306309710d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt @@ -8,8 +8,8 @@ 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.isBuiltinFunctionalClassDescriptor -import org.jetbrains.kotlin.builtins.isBuiltinFunctionalType import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding import org.jetbrains.kotlin.codegen.inline.addFakeContinuationMarker @@ -312,7 +312,7 @@ private fun FunctionDescriptor.getContinuationParameterTypeOfSuspendFunction(isR fun ModuleDescriptor.getResult(kotlinType: KotlinType) = module.resolveTopLevelClass( - DescriptorUtils.RESULT_FQ_NAME, + KotlinBuiltInsNames.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 = DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.topLevelClassAsmType() +val EXPERIMENTAL_CONTINUATION_ASM_TYPE = KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.topLevelClassAsmType() @JvmField -val RELEASE_CONTINUATION_ASM_TYPE = DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.topLevelClassAsmType() +val RELEASE_CONTINUATION_ASM_TYPE = KotlinBuiltInsNames.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 8d9e6fb63f9..8585073b981 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + container is PackageFragmentDescriptor && container.fqName == KotlinBuiltInsNames.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 7da12a4e9a3..4afc4aa2de2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineIntrinsics.kt @@ -8,6 +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.codegen.AsmUtil import org.jetbrains.kotlin.codegen.coroutines.createMethodNodeForCoroutineContext import org.jetbrains.kotlin.codegen.coroutines.createMethodNodeForIntercepted @@ -54,7 +55,7 @@ internal fun generateInlineIntrinsic( private fun isSpecialEnumMethod(descriptor: FunctionDescriptor): Boolean { val containingDeclaration = descriptor.containingDeclaration as? PackageFragmentDescriptor ?: return false - if (containingDeclaration.fqName != KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) { + if (containingDeclaration.fqName != KotlinBuiltInsNames.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 e66dd8879d6..a2443fba38b 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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.KotlinBuiltIns.*; +import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.*; 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, KotlinBuiltIns.FQ_NAMES.kClass, "java", -1, new KClassJavaProperty()); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltIns.FQ_NAMES.kClass, "javaObjectType", -1, new KClassJavaObjectTypeProperty()); - intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltIns.FQ_NAMES.kClass, "javaPrimitiveType", -1, new KClassJavaPrimitiveTypeProperty()); - intrinsicsMap.registerIntrinsic(KotlinBuiltIns.FQ_NAMES.kCallable.toSafe(), null, "name", -1, new KCallableNameProperty()); + 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(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, KotlinBuiltIns.FQ_NAMES.array, "isArrayOf", 0, new IsArrayOf()); + intrinsicsMap.registerIntrinsic(KOTLIN_JVM, KotlinBuiltInsNames.FqNames.array, "isArrayOf", 0, new IsArrayOf()); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.FQ_NAMES.kProperty0, "isInitialized", -1, LateinitIsInitialized.INSTANCE); + intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltInsNames.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(FQ_NAMES.number, methodName, 0, NUMBER_CAST); + declareIntrinsicFunction(KotlinBuiltInsNames.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(FQ_NAMES._boolean, "not", 0, new Not()); + declareIntrinsicFunction(KotlinBuiltInsNames.FqNames._boolean, "not", 0, new Not()); - declareIntrinsicFunction(FQ_NAMES.string, "plus", 1, new Concat()); - declareIntrinsicFunction(FQ_NAMES.string, "get", 1, new StringGetChar()); + declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.string, "plus", 1, new Concat()); + declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.string, "get", 1, new StringGetChar()); if (canReplaceStdlibRuntimeApiBehavior) { - intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, FQ_NAMES.string, "trimMargin", 1, new TrimMargin()); - intrinsicsMap.registerIntrinsic(TEXT_PACKAGE_FQ_NAME, FQ_NAMES.string, "trimIndent", 0, new TrimIndent()); + 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()); } - declareIntrinsicFunction(FQ_NAMES.cloneable, "clone", 0, CLONE); + declareIntrinsicFunction(KotlinBuiltInsNames.FqNames.cloneable, "clone", 0, CLONE); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.FQ_NAMES.any, "toString", 0, TO_STRING); - intrinsicsMap.registerIntrinsic(BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.FQ_NAMES.string, "plus", 1, STRING_PLUS); + 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, null, "arrayOfNulls", 1, new NewArray()); for (PrimitiveType type : PrimitiveType.values()) { @@ -197,7 +197,7 @@ public class IntrinsicMethods { for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) { declareArrayMethods(jvmPrimitiveType.getPrimitiveType().getArrayTypeFqName()); } - declareArrayMethods(FQ_NAMES.array.toSafe()); + declareArrayMethods(FqNames.array.toSafe()); } private void declareArrayMethods(@NotNull FqName arrayTypeFqName) { 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 42737865690..7b0ff612bdb 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.KotlinBuiltIns.COLLECTIONS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.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 9de076fbff9..773d66ebb1f 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.AsmTypes @@ -16,7 +16,6 @@ import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.org.objectweb.asm.tree.* -import kotlin.text.Regex object TypeIntrinsics { @JvmStatic @@ -134,20 +133,20 @@ object TypeIntrinsics { private val MUTABLE_COLLECTION_TYPE_FQ_NAMES = setOf( - FQ_NAMES.mutableIterator, - FQ_NAMES.mutableIterable, - FQ_NAMES.mutableCollection, - FQ_NAMES.mutableList, - FQ_NAMES.mutableListIterator, - FQ_NAMES.mutableMap, - FQ_NAMES.mutableSet, - FQ_NAMES.mutableMapEntry + FqNames.mutableIterator, + FqNames.mutableIterable, + FqNames.mutableCollection, + FqNames.mutableList, + FqNames.mutableListIterator, + FqNames.mutableMap, + FqNames.mutableSet, + FqNames.mutableMapEntry ) private fun getMutableCollectionMethodName(prefix: String, jetType: KotlinType): String? { val fqName = getClassFqName(jetType) if (fqName == null || fqName !in MUTABLE_COLLECTION_TYPE_FQ_NAMES) return null - val baseName = if (fqName == FQ_NAMES.mutableMapEntry) "MutableMapEntry" else fqName.shortName().asString() + val baseName = if (fqName == FqNames.mutableMapEntry) "MutableMapEntry" else fqName.shortName().asString() return prefix + baseName } @@ -200,4 +199,4 @@ object TypeIntrinsics { private val BEFORE_CHECKCAST_TO_FUNCTION_OF_ARITY_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE, OBJECT_TYPE, Type.INT_TYPE) -} \ No newline at end of file +} 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 8b7cfde114a..d6f9de7050c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/range/RangeCodegenUtil.kt @@ -6,6 +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.UnsignedTypes import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor import org.jetbrains.kotlin.descriptors.* @@ -83,10 +84,10 @@ fun getRangeOrProgressionElementType(rangeType: KotlinType): KotlinType? { COMPARABLE_RANGE_FQN -> rangeType.arguments.singleOrNull()?.type UINT_RANGE_FQN, UINT_PROGRESSION_FQN -> - rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltIns.FQ_NAMES.uIntFqName) + rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltInsNames.FqNames.uIntFqName) ULONG_RANGE_FQN, ULONG_PROGRESSION_FQN -> - rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltIns.FQ_NAMES.uLongFqName) + rangeClassDescriptor.findTypeInModuleByTopLevelClassFqName(KotlinBuiltInsNames.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 e8c028913ae..9716de3f3ce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -8,6 +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.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.* 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 662c77bfe26..f86c9bad0a8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen.state +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -37,7 +38,6 @@ import org.jetbrains.kotlin.types.checker.convertVariance import org.jetbrains.kotlin.types.getEffectiveVariance import org.jetbrains.kotlin.types.model.KotlinTypeMarker import org.jetbrains.kotlin.types.model.TypeParameterMarker -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES as BUILTIN_NAMES // TODO: probably class upper bound should be used @Suppress("UNUSED_PARAMETER") @@ -81,9 +81,9 @@ val FqName?.isMethodWithDeclarationSiteWildcardsFqName: Boolean private fun FqName.child(name: String): FqName = child(Name.identifier(name)) private val METHODS_WITH_DECLARATION_SITE_WILDCARDS = setOf( - BUILTIN_NAMES.mutableCollection.child("addAll"), - BUILTIN_NAMES.mutableList.child("addAll"), - BUILTIN_NAMES.mutableMap.child("putAll") + FqNames.mutableCollection.child("addAll"), + FqNames.mutableList.child("addAll"), + FqNames.mutableMap.child("putAll") ) fun TypeMappingMode.updateArgumentModeFromAnnotations( 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 ce4ba8d2e52..9aa8e00497c 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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, KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) + EmptyPackageFragmentDescriptor(module, KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) } - return factory.createClass(ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.cloneable.toSafe())) + return factory.createClass(ClassId.topLevel(KotlinBuiltInsNames.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 3cd95bcb15a..954539c481e 100644 --- a/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt +++ b/compiler/config/src/org/jetbrains/kotlin/config/CoroutineLanguageVersionSettingsUtil.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.config +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils fun LanguageVersionSettings.coroutinesPackageFqName(): FqName { return coroutinesPackageFqName(isReleaseCoroutines()) @@ -17,9 +17,9 @@ fun LanguageVersionSettings.isReleaseCoroutines() = supportsFeature(LanguageFeat private fun coroutinesPackageFqName(isReleaseCoroutines: Boolean): FqName { return if (isReleaseCoroutines) - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE + KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE else - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL + KotlinBuiltInsNames.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 == DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) + this == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) else - this == DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) || - this == DescriptorUtils.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + this == KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) || + this == KotlinBuiltInsNames.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 568fdde2789..aad22940653 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.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.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 048c275d708..9708df408b5 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) return + if (classId.packageFqName != KotlinBuiltInsNames.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 10259bca0c3..bd70b4976b6 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,9 +5,8 @@ package org.jetbrains.kotlin.fir.deserialization +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.resolve.DescriptorUtils - -val CONTINUATION_INTERFACE_CLASS_ID = ClassId.topLevel(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE) \ No newline at end of file +val CONTINUATION_INTERFACE_CLASS_ID = ClassId.topLevel(KotlinBuiltInsNames.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 7b73a6a39c6..1badc654ab5 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + && packageName == KotlinBuiltInsNames.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 d4dcc32d94b..db1b3d4b866 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor 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 = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES + val packageFqNames = KotlinBuiltInsNames.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 0aa032fd94c..bf3d5c9dbe3 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE) + val CLONEABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE) val CLONE: Name = Name.identifier("clone") } 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 c8a1b30f0ba..401cd4c9264 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.fqNameToPrimitiveType::get) + getClassFqNameUnsafe()?.let(KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType::get) override fun TypeConstructorMarker.getPrimitiveArrayType() = - getClassFqNameUnsafe()?.let(KotlinBuiltIns.FQ_NAMES.arrayClassFqNameToPrimitiveType::get) + getClassFqNameUnsafe()?.let(KotlinBuiltInsNames.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 59b8734bb52..1e9d9e4def9 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.resolve.DescriptorUtils +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames fun isSyntheticValuesOrValueOfMethod(method: PsiMethod): Boolean { if (method !is SyntheticElement) return false - return DescriptorUtils.ENUM_VALUE_OF.asString() == method.name || DescriptorUtils.ENUM_VALUES.asString() == method.name + return KotlinBuiltInsNames.ENUM_VALUE_OF.asString() == method.name || KotlinBuiltInsNames.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 91f7877e571..75748d417fc 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.unit.toSafe()), 0) + ?: return KClassValue(ClassId.topLevel(KotlinBuiltInsNames.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 b90171f1acf..e037d5cee16 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.target) ?: return null + val targetEntryDescriptor = classDescriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.target) ?: return null return loadAnnotationTargets(targetEntryDescriptor) } @@ -436,4 +436,4 @@ class AnnotationChecker( interface AdditionalAnnotationChecker { fun checkEntries(entries: List, actualTargets: List, trace: BindingTrace) -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CollectionLiteralResolver.kt index a5ee84e5001..1e30553aa02 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.PrimitiveType +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME).memberScope + val memberScopeOfKotlinPackage = module.getPackage(KotlinBuiltInsNames.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 2daf1596a72..b2a8d57c816 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt @@ -19,6 +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.UnsignedTypes import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -975,7 +976,7 @@ class DeclarationsChecker( if (containingDeclaration !is ClassDescriptor) continue if (visitedClasses.contains(containingDeclaration)) continue - if (DescriptorUtils.getFqName(containingDeclaration) == KotlinBuiltIns.FQ_NAMES.any) { + if (DescriptorUtils.getFqName(containingDeclaration) == KotlinBuiltInsNames.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 d05476d5756..d4d93a5fcae 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt @@ -7,6 +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.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -174,7 +175,7 @@ class DelegatedPropertyResolver( } private fun KtPsiFactory.createExpressionForProperty(): KtExpression { - return createExpression("null as ${KotlinBuiltIns.FQ_NAMES.kPropertyFqName.asString()}<*>") + return createExpression("null as ${KotlinBuiltInsNames.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 6c7752f2524..0202a6f275b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -19,10 +19,7 @@ package org.jetbrains.kotlin.resolve import com.intellij.openapi.util.ThrowableComputable import com.intellij.psi.PsiElement import com.intellij.util.AstLoadingFilter -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.getReceiverTypeFromFunctionType -import org.jetbrains.kotlin.builtins.getValueParameterTypesFromFunctionType -import org.jetbrains.kotlin.builtins.isBuiltinFunctionalType +import org.jetbrains.kotlin.builtins.* import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.contracts.description.ContractProviderKey @@ -309,7 +306,7 @@ class FunctionDescriptorResolver( private fun KotlinType.removeParameterNameAnnotation(): KotlinType { if (this is TypeUtils.SpecialType) return this - val parameterNameAnnotation = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.parameterName) ?: return this + val parameterNameAnnotation = annotations.findAnnotation(KotlinBuiltInsNames.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 41da5b642c7..e63b410a230 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.unsafeVariance) + && !type.annotations.hasAnnotation(KotlinBuiltInsNames.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 7d978be0e29..c5e0f2c4c47 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.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.getValue -import org.jetbrains.kotlin.util.OperatorNameConventions private val ALLOWED_MEMBER_NAMES = setOf( "equals", "hashCode", "toString", "invoke", "name" 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 c9be403310f..c83f4065549 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.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.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 220c9e959ec..73cadeb4a03 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,16 +6,19 @@ package org.jetbrains.kotlin.resolve.calls.checkers import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.coroutines.hasSuspendFunctionType import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.KtCodeFragment +import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.psi.KtExpression +import org.jetbrains.kotlin.psi.KtThisExpression import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.calls.callUtil.isCallableReference import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall @@ -33,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 = - DescriptorUtils.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + KotlinBuiltInsNames.COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) val COROUTINE_CONTEXT_1_2_30_FQ_NAME = - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) + KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("coroutineContext")) val COROUTINE_CONTEXT_1_3_FQ_NAME = - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("coroutineContext")) + KotlinBuiltInsNames.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 1ff0b50d898..b835175ab4f 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.retention) - val targetAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.target) + val retentionAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.retention) + val targetAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.target) val diagnostics = if (context.languageVersionSettings.supportsFeature(LanguageFeature.RestrictRetentionForExpressionAnnotations)) @@ -45,4 +45,4 @@ class AnnotationClassTargetAndRetentionChecker : DeclarationChecker { private val AnnotationDescriptor.psi: PsiElement? get() = DescriptorToSourceUtils.getSourceFromAnnotation(this) -} \ No newline at end of file +} 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 8f1e19158c6..7eb60c2a383 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin) ?: return + val deprecatedSinceAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecatedSinceKotlin) ?: return val deprecatedSinceAnnotationPsi = deprecatedSinceAnnotation.source.getPsi() as? KtAnnotationEntry ?: return - val deprecatedAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) + val deprecatedAnnotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecated) val deprecatedSinceAnnotationName = deprecatedSinceAnnotationPsi.typeReference ?: return - if (descriptor.fqNameOrNull()?.isSubpackageOf(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) == false) { + if (descriptor.fqNameOrNull()?.isSubpackageOf(KotlinBuiltInsNames.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 91ff45e0983..15cac15d7c8 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.target } + .firstOrNull { (_, descriptor) -> descriptor != null && descriptor.fqName == KotlinBuiltInsNames.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 1d9047d8a3a..e6716ca7ba0 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.publishedApi) { + if (annotationDescriptor.fqName == KotlinBuiltInsNames.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 d904b1e2886..de6a5f514f0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt @@ -5,16 +5,15 @@ package org.jetbrains.kotlin.resolve.checkers +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtProperty -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.types.KotlinType class ResultClassInReturnTypeChecker : DeclarationChecker { @@ -60,6 +59,6 @@ internal fun KotlinType.isResultType(): Boolean { private fun DeclarationDescriptor.isResultClass(): Boolean { val container = containingDeclaration ?: return false return container is PackageFragmentDescriptor && - container.fqName == DescriptorUtils.RESULT_FQ_NAME.parent() && - name == DescriptorUtils.RESULT_FQ_NAME.shortName() + container.fqName == KotlinBuiltInsNames.RESULT_FQ_NAME.parent() && + name == KotlinBuiltInsNames.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 4889500e35d..1f9ea4261dd 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,6 +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.UnsignedTypes import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -1017,7 +1018,7 @@ private class ConstantExpressionEvaluatorVisitor( } private fun checkAccessibilityOfUnsignedTypes(): Boolean { - val uInt = constantExpressionEvaluator.module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uInt) ?: return false + val uInt = constantExpressionEvaluator.module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.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 f059ee3b150..5e74865d949 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecation/DeprecationResolver.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.resolve.deprecation import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.LanguageVersionSettings @@ -200,11 +201,11 @@ class DeprecationResolver( } private fun DeclarationDescriptor.addDeprecationIfPresent(result: MutableList) { - val annotation = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED) + val annotation = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED) if (annotation != null) { val deprecatedByAnnotation = DeprecatedByAnnotation.create( - annotation, annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin), + annotation, annotations.findAnnotation(KotlinBuiltInsNames.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 5f8a65595c8..04b963e4ab7 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.FQ_NAMES.suppress) return + if (annotationDescriptor.fqName != KotlinBuiltInsNames.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 1fb393a6eb2..d8374d237a3 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,6 +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.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies @@ -317,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() == KotlinBuiltIns.FQ_NAMES.kProperty0 + receiverClass?.fqNameWhenAvailable?.toUnsafe() == KotlinBuiltInsNames.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 37bcbce91f1..66ab00b0f67 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, - KotlinBuiltIns.FQ_NAMES.string.toSafe() + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltInsNames.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() == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + && fqNameWhenAvailable?.parent() == KotlinBuiltInsNames.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 d68b25eeb52..8f8c25536dd 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.collection, "contains", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.collection, "contains", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltIns.FQ_NAMES.mutableCollection, "remove", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.mutableCollection, "remove", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1, needsArgumentBoxing = true), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "containsKey", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.map, "containsKey", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "containsValue", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.map, "containsValue", 1) to SpecialMethodWithDefaultInfo(::constFalse, 1), - makeDescription(KotlinBuiltIns.FQ_NAMES.mutableMap, "remove", 2) to + makeDescription(KotlinBuiltInsNames.FqNames.mutableMap, "remove", 2) to SpecialMethodWithDefaultInfo(::constFalse, 2), - makeDescription(KotlinBuiltIns.FQ_NAMES.list, "indexOf", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.list, "indexOf", 1) to SpecialMethodWithDefaultInfo(::constMinusOne, 1), - makeDescription(KotlinBuiltIns.FQ_NAMES.list, "lastIndexOf", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.list, "lastIndexOf", 1) to SpecialMethodWithDefaultInfo(::constMinusOne, 1), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "getOrDefault", 2) to + makeDescription(KotlinBuiltInsNames.FqNames.map, "getOrDefault", 2) to SpecialMethodWithDefaultInfo(::getSecondArg, 1, needsGenericSignature = true), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "get", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.map, "get", 1) to SpecialMethodWithDefaultInfo(::constNull, 1, needsGenericSignature = true), - makeDescription(KotlinBuiltIns.FQ_NAMES.mutableMap, "remove", 1) to + makeDescription(KotlinBuiltInsNames.FqNames.mutableMap, "remove", 1) to SpecialMethodWithDefaultInfo(::constNull, 1, needsGenericSignature = true) ) private val specialProperties = mapOf( - makeDescription(KotlinBuiltIns.FQ_NAMES.collection, "size") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "size") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.charSequence.toSafe(), "length") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "keys") to BuiltInWithDifferentJvmName(needsGenericSignature = true), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "values") to BuiltInWithDifferentJvmName(needsGenericSignature = true), - makeDescription(KotlinBuiltIns.FQ_NAMES.map, "entries") to BuiltInWithDifferentJvmName(needsGenericSignature = true) + 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) ) private val specialMethods = mapOf( - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toByte") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toShort") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toInt") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toLong") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toFloat") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.number.toSafe(), "toDouble") to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.charSequence.toSafe(), "get", 1) to BuiltInWithDifferentJvmName(), - makeDescription(KotlinBuiltIns.FQ_NAMES.mutableList, "removeAt", 1) to BuiltInWithDifferentJvmName(needsGenericSignature = true) + 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) ) 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 8e1e333acea..f254cf47734 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.ir.declarations.IrClass @@ -70,10 +70,10 @@ private inline fun IrType.isTypeFromKotlinPackage(namePredicate: (Name) -> Boole } else return false } -fun IrType.isPrimitiveArray() = isTypeFromKotlinPackage { it in FQ_NAMES.primitiveArrayTypeShortNames } +fun IrType.isPrimitiveArray() = isTypeFromKotlinPackage { it in FqNames.primitiveArrayTypeShortNames } fun IrType.getPrimitiveArrayElementType() = (this as? IrSimpleType)?.let { - (it.classifier.owner as? IrClass)?.fqNameWhenAvailable?.toUnsafe()?.let { fqn -> FQ_NAMES.arrayClassFqNameToPrimitiveType[fqn] } + (it.classifier.owner as? IrClass)?.fqNameWhenAvailable?.toUnsafe()?.let { fqn -> FqNames.arrayClassFqNameToPrimitiveType[fqn] } } fun IrType.substitute(params: List, arguments: List): IrType = 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 a497efd142f..b1d6ab77737 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(), KotlinBuiltIns.ANNOTATION_PACKAGE_FQ_NAME) + IrExternalPackageFragmentImpl(DescriptorlessExternalPackageFragmentSymbol(), KotlinBuiltInsNames.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 = - KotlinBuiltIns.ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier("FlexibleNullability")) + KotlinBuiltInsNames.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 b9215932775..63fb8053148 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.types.Variance @@ -201,7 +200,7 @@ class JvmSymbols( get() = TODO("not implemented") private val kDeclarationContainer: IrClassSymbol = - createClass(KotlinBuiltIns.FQ_NAMES.kDeclarationContainer.toSafe(), ClassKind.INTERFACE, Modality.ABSTRACT) + createClass(KotlinBuiltInsNames.FqNames.kDeclarationContainer.toSafe(), ClassKind.INTERFACE, Modality.ABSTRACT) val javaLangClass: IrClassSymbol = createClass(FqName("java.lang.Class")) { klass -> @@ -226,12 +225,12 @@ class JvmSymbols( val assertionErrorConstructor = javaLangAssertionError.constructors.single() val continuationClass: IrClassSymbol = - createClass(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE, ClassKind.INTERFACE) { klass -> + createClass(KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE, ClassKind.INTERFACE) { klass -> klass.addTypeParameter("T", irBuiltIns.anyNType, Variance.IN_VARIANCE) } private val resultClassStub: IrClassSymbol = - createClass(DescriptorUtils.RESULT_FQ_NAME, classIsInline = true) { klass -> + createClass(KotlinBuiltInsNames.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 a11366b0a32..560c640cca4 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.retention)?.getValueArgument(RETENTION_PARAMETER_NAME) + getAnnotation(KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.target) ?: return null + val targetEntry = getAnnotation(KotlinBuiltInsNames.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 afbb2de025e..16d344bd82a 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.publishedApi) + propertyIfAccessor.annotations.hasAnnotation(KotlinBuiltInsNames.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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME || + get() = getPackageFragment()?.fqName == KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME || parent.safeAs()?.fqNameWhenAvailable?.toUnsafe()?.let(JavaToKotlinClassMap::mapKotlinToJava) != null // From BuiltinMethodsWithDifferentJvmName.isBuiltinFunctionWithDifferentNameInJvm, BuiltinMethodsWithDifferentJvmName.getJvmName @@ -424,4 +424,4 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { } return null } -} \ No newline at end of file +} 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 42b62d0fc60..39c5424972c 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.inline.SourceMapper @@ -105,7 +105,7 @@ fun JvmBackendContext.getSourceMapper(declaration: IrClass): SourceMapper { } val IrType.isExtensionFunctionType: Boolean - get() = isFunctionTypeOrSubtype() && hasAnnotation(FQ_NAMES.extensionFunctionType) + get() = isFunctionTypeOrSubtype() && hasAnnotation(FqNames.extensionFunctionType) /* Borrowed with modifications from MemberCodegen.java */ @@ -409,7 +409,7 @@ fun IrClass.isOptionalAnnotationClass(): Boolean = val IrAnnotationContainer.deprecationFlags: Int get() { - val annotation = annotations.findAnnotation(FQ_NAMES.deprecated) + val annotation = annotations.findAnnotation(FqNames.deprecated) ?: return if ((this as? IrDeclaration)?.origin?.let { it == JvmLoweredDeclarationOrigin.DEFAULT_IMPLS_BRIDGE_FOR_COMPATIBILITY } == true 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 b4355e3119a..82d7d58614e 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,9 +17,12 @@ package org.jetbrains.kotlin.backend.jvm.intrinsics import org.jetbrains.kotlin.backend.jvm.JvmSymbols -import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.PrimitiveType -import org.jetbrains.kotlin.ir.declarations.* +import org.jetbrains.kotlin.ir.declarations.IrClass +import org.jetbrains.kotlin.ir.declarations.IrPackageFragment +import org.jetbrains.kotlin.ir.declarations.IrTypeParameter +import org.jetbrains.kotlin.ir.declarations.IrValueParameter import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol @@ -43,11 +46,11 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { private val intrinsicsMap = ( listOf( Key(kotlinJvm, FqName("T"), "", emptyList()) to JavaClassProperty, - Key(kotlinJvm, KotlinBuiltIns.FQ_NAMES.kClass.toSafe(), "", emptyList()) to GetJavaObjectType, - Key(kotlinJvm, KotlinBuiltIns.FQ_NAMES.kClass.toSafe(), "", emptyList()) to GetJavaPrimitiveType, + Key(kotlinJvm, KotlinBuiltInsNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaObjectType, + Key(kotlinJvm, KotlinBuiltInsNames.FqNames.kClass.toSafe(), "", emptyList()) to GetJavaPrimitiveType, Key( kotlinJvm, - KotlinBuiltIns.FQ_NAMES.kClass.toSafe(), + KotlinBuiltInsNames.FqNames.kClass.toSafe(), "", emptyList() ) to KClassJavaProperty, @@ -55,49 +58,49 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { kotlinJvmInternalUnsafe, null, "access\$monitorEnter", - listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + listOf(KotlinBuiltInsNames.FqNames.any.toSafe()) ) to MonitorInstruction.MONITOR_ENTER, Key( kotlinJvmInternalUnsafe, null, "access\$monitorExit", - listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + listOf(KotlinBuiltInsNames.FqNames.any.toSafe()) ) to MonitorInstruction.MONITOR_EXIT, Key( kotlinJvm, - KotlinBuiltIns.FQ_NAMES.array.toSafe(), + KotlinBuiltInsNames.FqNames.array.toSafe(), "isArrayOf", emptyList() ) to IsArrayOf, Key( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, null, "arrayOfNulls", - listOf(KotlinBuiltIns.FQ_NAMES._int.toSafe()) + listOf(KotlinBuiltInsNames.FqNames._int.toSafe()) ) to NewArray, Key( - KotlinBuiltIns.FQ_NAMES.cloneable.toSafe(), + KotlinBuiltInsNames.FqNames.cloneable.toSafe(), null, "clone", emptyList() ) to Clone, Key( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, null, "enumValues", listOf() ) to EnumValues, Key( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, null, "enumValueOf", - listOf(KotlinBuiltIns.FQ_NAMES.string.toSafe()) + listOf(KotlinBuiltInsNames.FqNames.string.toSafe()) ) to EnumValueOf, Key( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, - KotlinBuiltIns.FQ_NAMES.string.toSafe(), + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltInsNames.FqNames.string.toSafe(), "plus", - listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + listOf(KotlinBuiltInsNames.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 6a4f0f7f59e..b4fb1d599fa 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,12 +17,10 @@ package org.jetbrains.kotlin.backend.jvm.intrinsics import org.jetbrains.kotlin.backend.jvm.JvmBackendContext -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.COLLECTIONS_PACKAGE_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COLLECTIONS_PACKAGE_FQ_NAME import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression -import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression -import org.jetbrains.kotlin.ir.types.isPrimitiveType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType 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 1d10f7a411c..d3695fdaa6e 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.mustBeDocumented) || + if (!irClass.hasAnnotation(KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.target) ?: return null + val targetEntry = getAnnotation(KotlinBuiltInsNames.FqNames.target) ?: return null return loadAnnotationTargets(targetEntry) } @@ -238,4 +238,4 @@ private fun loadAnnotationTargets(targetEntry: IrConstructorCall): Set().mapNotNull { KotlinTarget.valueOrNull(it.symbol.owner.name.asString()) }.toSet() -} \ No newline at end of file +} 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 025d3e04d0c..e571c5560c9 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + get() = name.asString() == "assert" && getPackageFragment()?.fqName == KotlinBuiltInsNames.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 96d20895147..2f9f860db11 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME || fqName == FUNCTIONS_PACKAGE_FQ_NAME + fqName == KotlinBuiltInsNames.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 = - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME .child(Name.identifier("jvm")) .child(Name.identifier("functions")) private val REFLECT_PACKAGE_FQ_NAME = - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + KotlinBuiltInsNames.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 65f3cd10d56..d90c8c9c264 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,6 +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.config.ApiVersion import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.IrStatement @@ -40,7 +41,6 @@ import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.utils.addToStdlib.safeAs val jvmInlineClassPhase = makeIrFilePhase( @@ -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 != DescriptorUtils.RESULT_FQ_NAME) || + return (leftClass.fqNameWhenAvailable != KotlinBuiltInsNames.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 985acc9de83..3504c0b3049 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME + (owner.parent as? IrPackageFragment)?.fqName == KotlinBuiltInsNames.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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME && + return parent.fqName == KotlinBuiltInsNames.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 9444b78b178..100cec0a6e9 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,6 +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.codegen.state.md5base64 import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrStatementOriginImpl @@ -13,7 +14,6 @@ import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils /** * Replace inline classes by their underlying types. @@ -114,7 +114,7 @@ object InlineClassAbi { internal val IrType.requiresMangling: Boolean get() { val irClass = erasedUpperBound - return irClass.isInline && irClass.fqNameWhenAvailable != DescriptorUtils.RESULT_FQ_NAME + return irClass.isInline && irClass.fqNameWhenAvailable != KotlinBuiltInsNames.RESULT_FQ_NAME } internal val IrFunction.fullValueParameterList: List 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 c35ee66b0cd..f41c0968ae5 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,6 +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.isFunctionType import org.jetbrains.kotlin.builtins.isSuspendFunctionType import org.jetbrains.kotlin.descriptors.* @@ -451,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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) + .getPackage(KotlinBuiltInsNames.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 495c0950cac..e5d9e19eb4e 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.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation 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 21a166d82ae..eb05af4c22d 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.any) + this is IrClassSymbol && isClassWithFqName(KotlinBuiltInsNames.FqNames.any) override fun TypeConstructorMarker.isNothingConstructor(): Boolean = - this is IrClassSymbol && isClassWithFqName(KotlinBuiltIns.FQ_NAMES.nothing) + this is IrClassSymbol && isClassWithFqName(KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.extensionFunctionType) + return this.hasAnnotation(KotlinBuiltInsNames.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(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME) + return parent.fqName.startsWith(KotlinBuiltInsNames.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 8ba04f6d589..6ea31af707d 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.array.toSafe() + get() = classOrNull?.owner?.fqNameWhenAvailable == KotlinBuiltInsNames.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 92b2e0a37ee..b149370b6d3 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,13 +5,12 @@ package org.jetbrains.kotlin.ir.types -import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable import org.jetbrains.kotlin.name.FqNameUnsafe -import org.jetbrains.kotlin.resolve.DescriptorUtils private fun IrType.isNotNullClassType(fqName: FqNameUnsafe) = isClassType(fqName, hasQuestionMark = false) private fun IrType.isNullableClassType(fqName: FqNameUnsafe) = isClassType(fqName, hasQuestionMark = true) @@ -33,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(KotlinBuiltIns.FQ_NAMES.any) -fun IrType.isNullableAny(): Boolean = isNullableClassType(KotlinBuiltIns.FQ_NAMES.any) +fun IrType.isAny(): Boolean = isNotNullClassType(KotlinBuiltInsNames.FqNames.any) +fun IrType.isNullableAny(): Boolean = isNullableClassType(KotlinBuiltInsNames.FqNames.any) -fun IrType.isString(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.string) -fun IrType.isNullableString(): Boolean = isNullableClassType(KotlinBuiltIns.FQ_NAMES.string) -fun IrType.isStringClassType(): Boolean = isClassType(KotlinBuiltIns.FQ_NAMES.string) -fun IrType.isArray(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.array) -fun IrType.isNullableArray(): Boolean = isNullableClassType(KotlinBuiltIns.FQ_NAMES.array) -fun IrType.isCollection(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.collection.toUnsafe()) -fun IrType.isNothing(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.nothing) -fun IrType.isKClass(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.kClass) +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.isPrimitiveType(): Boolean = KotlinBuiltIns.FQ_NAMES.fqNameToPrimitiveType.keys.any { isNotNullClassType(it) } -fun IrType.isNullablePrimitiveType(): Boolean = KotlinBuiltIns.FQ_NAMES.fqNameToPrimitiveType.keys.any { isNullableClassType(it) } +fun IrType.isPrimitiveType(): Boolean = KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType.keys.any { isNotNullClassType(it) } +fun IrType.isNullablePrimitiveType(): Boolean = KotlinBuiltInsNames.FqNames.fqNameToPrimitiveType.keys.any { isNullableClassType(it) } fun IrType.isMarkedNullable() = (this as? IrSimpleType)?.hasQuestionMark ?: false -fun IrType.isUnit() = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.unit) +fun IrType.isUnit() = isNotNullClassType(KotlinBuiltInsNames.FqNames.unit) -fun IrType.isBoolean(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._boolean) -fun IrType.isChar(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._char) -fun IrType.isByte(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._byte) -fun IrType.isShort(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._short) -fun IrType.isInt(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._int) -fun IrType.isLong(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._long) -fun IrType.isUByte(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.uByteFqName.toUnsafe()) -fun IrType.isUShort(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.uShortFqName.toUnsafe()) -fun IrType.isUInt(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.uIntFqName.toUnsafe()) -fun IrType.isULong(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.uLongFqName.toUnsafe()) -fun IrType.isFloat(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._float) -fun IrType.isDouble(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES._double) -fun IrType.isNumber(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.number) +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.isComparable(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.comparable.toUnsafe()) -fun IrType.isCharSequence(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.charSequence) -fun IrType.isIterable(): Boolean = isNotNullClassType(KotlinBuiltIns.FQ_NAMES.iterable.toUnsafe()) +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.isSequence(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.sequences.Sequence")) fun IrType.isBooleanArray(): Boolean = isNotNullClassType(FqNameUnsafe("kotlin.BooleanArray")) @@ -80,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(DescriptorUtils.RESULT_FQ_NAME.toUnsafe()) -fun IrType.isNullableContinuation(): Boolean = isNullableClassType(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.toUnsafe()) +fun IrType.isKotlinResult(): Boolean = isNotNullClassType(KotlinBuiltInsNames.RESULT_FQ_NAME.toUnsafe()) +fun IrType.isNullableContinuation(): Boolean = isNullableClassType(KotlinBuiltInsNames.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 a45bb3975ce..1df2c1edb20 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,6 +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.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil @@ -35,8 +36,8 @@ import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.psi.* @@ -316,7 +317,7 @@ internal fun KtModifierListOwner.isHiddenByDeprecation(support: KtUltraLightSupp annotation.looksLikeDeprecated() } if (annotations.isNotEmpty()) { // some candidates found - val deprecated = support.findAnnotation(this, KotlinBuiltIns.FQ_NAMES.deprecated)?.second + val deprecated = support.findAnnotation(this, KotlinBuiltInsNames.FqNames.deprecated)?.second return (deprecated?.argumentValue("level") as? EnumValue)?.enumEntryName?.asString() == "HIDDEN" } else { return false @@ -361,7 +362,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu val modifierList = this.modifierList ?: return false if (modifierList.annotationEntries.isEmpty()) return false - val deprecatedFqName = KotlinBuiltIns.FQ_NAMES.deprecated + val deprecatedFqName = KotlinBuiltInsNames.FqNames.deprecated val deprecatedName = deprecatedFqName.shortName().asString() for (annotationEntry in modifierList.annotationEntries) { @@ -374,7 +375,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu if (fqName.asString() == deprecatedName) return true } - return support?.findAnnotation(this, KotlinBuiltIns.FQ_NAMES.deprecated) !== null + return support?.findAnnotation(this, KotlinBuiltInsNames.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 790f94ab9e5..08d6640199d 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.ArrayValue @@ -64,7 +64,7 @@ private val targetMapping = hashMapOf( internal fun PsiAnnotation.tryConvertAsTarget(support: KtUltraLightSupport): KtLightAbstractAnnotation? { - if (FQ_NAMES.target.asString() != qualifiedName) return null + if (FqNames.target.asString() != qualifiedName) return null val attributeValues = extractArrayAnnotationFqNames("allowedTargets") ?: extractAnnotationFqName("value")?.let { listOf(it) } @@ -101,7 +101,7 @@ internal fun createRetentionRuntimeAnnotation(support: KtUltraLightSupport, pare internal fun PsiAnnotation.tryConvertAsRetention(support: KtUltraLightSupport): KtLightAbstractAnnotation? { - if (FQ_NAMES.retention.asString() != qualifiedName) return null + if (FqNames.retention.asString() != qualifiedName) return null val convertedValue = extractAnnotationFqName("value") ?.let { retentionMapping[it] } @@ -118,7 +118,7 @@ internal fun PsiAnnotation.tryConvertAsRetention(support: KtUltraLightSupport): internal fun PsiAnnotation.tryConvertAsMustBeDocumented(support: KtUltraLightSupport): KtLightAbstractAnnotation? { - if (FQ_NAMES.mustBeDocumented.asString() != qualifiedName) return null + if (FqNames.mustBeDocumented.asString() != qualifiedName) return null return KtUltraLightSimpleAnnotation( JAVA_LANG_ANNOTATION_DOCUMENTED, @@ -126,4 +126,4 @@ internal fun PsiAnnotation.tryConvertAsMustBeDocumented(support: KtUltraLightSup support, parent ) -} \ No newline at end of file +} diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index 67b7a99d193..9a12e88563c 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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 (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName)) { + if (KotlinBuiltInsNames.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 17ab0a172bc..45c5db83b56 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.FQ_NAMES.extensionFunctionType } + else FilteredAnnotations(annotations, true) { it != KotlinBuiltInsNames.FqNames.extensionFunctionType } } val returnArgumentsAnalysisResult = resolutionCallbacks.analyzeAndGetLambdaReturnArguments( @@ -218,4 +218,4 @@ class PostponedArgumentsAnalyzer( private inline fun UnwrappedType?.forFunctionalType(f: UnwrappedType.() -> T?): T? { return if (this?.isBuiltinFunctionalType == true) f(this) else null } -} \ No newline at end of file +} 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 3958762e7e3..20532ed2558 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,6 +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.UnsignedTypes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor @@ -309,10 +310,10 @@ open class OverloadingConflictResolver( val isGeneralUnsigned = UnsignedTypes.isUnsignedType(general) return when { isSpecificUnsigned && isGeneralUnsigned -> { - val uLong = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uLong)?.defaultType ?: return false - val uInt = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uInt)?.defaultType ?: return false - val uByte = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uByte)?.defaultType ?: return false - val uShort = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uShort)?.defaultType ?: return false + 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 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 8b5f919cb41..6bf2f9b2420 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME -private val kotlinText: FqName = KotlinBuiltIns.TEXT_PACKAGE_FQ_NAME -private val kotlinCollections: FqName = KotlinBuiltIns.COLLECTIONS_PACKAGE_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 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(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME)) return false + if (!packageFqName.startsWith(KotlinBuiltInsNames.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 aa631b4b0c7..ae8514561d6 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.resolve.DescriptorUtils +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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) - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() + KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() else - DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() val emptyContinuationBody = if (isReleaseCoroutines) @@ -197,4 +197,4 @@ fun createTextForCodegenTestHelpers(backend: TargetBackend) = |package helpers | |fun isIR() = ${backend.isIR} - """.trimMargin() \ No newline at end of file + """.trimMargin() 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 551f3880b3e..abeb6646b99 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -15,6 +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.jvm.JvmBuiltIns import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector @@ -125,7 +126,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { val languageVersionSettings = if (coroutinesPackage.isNotEmpty()) { - val isExperimental = coroutinesPackage == DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + val isExperimental = coroutinesPackage == KotlinBuiltInsNames.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 b443807ca83..69e5fca8d52 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.resolve.DescriptorUtils +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() + return !path.endsWith(".kts") && coroutinesPackage != KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() } -} \ No newline at end of file +} 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 3871f0bad29..33b8be803e1 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt @@ -4,6 +4,7 @@ */ package org.jetbrains.kotlin.checkers +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment @@ -11,7 +12,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment.Companion.cre import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.parsing.KotlinParserDefinition -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.script.loadScriptingPlugin import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.TestFiles.TestFileFactory @@ -86,8 +86,8 @@ abstract class KotlinMultiFileTestWithJava listOf("_ir", "_1_3", "") - coroutinesPackage == DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE.asString() -> listOf("_1_3", "") + coroutinesPackage == KotlinBuiltInsNames.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 02395c79d82..7e7ff458ef1 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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) - : KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(nameOrFqName)); + : KotlinBuiltInsNames.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 f0873a54140..495eca1717a 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,7 +6,10 @@ package org.jetbrains.kotlin.serialization.builtins import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.* +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.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.renderer.AnnotationArgumentsRenderingPolicy @@ -53,7 +56,7 @@ abstract class AbstractBuiltInsWithJDKMembersTest : KotlinTestWithEnvironment() verbose = true annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.UNLESS_EMPTY modifiers = DescriptorRendererModifier.ALL - excludedTypeAnnotationClasses = setOf(FQ_NAMES.unsafeVariance) + excludedTypeAnnotationClasses = setOf(KotlinBuiltInsNames.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 0791b7c45b0..e8be3c531a7 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt @@ -7,6 +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.checkers.CompilerTestLanguageVersionSettings import org.jetbrains.kotlin.checkers.parseLanguageVersionSettings import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys @@ -15,7 +16,6 @@ import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.JvmTarget.Companion.fromString -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import java.io.File import java.lang.reflect.Field @@ -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 (DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() == coroutinesPackage) { + if (KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString() == coroutinesPackage) { disableReleaseCoroutines = true includeCompatExperimentalCoroutines = true } } - if (content.contains(DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString())) { + if (content.contains(KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.asString())) { includeCompatExperimentalCoroutines = true } val fileLanguageVersionSettings: LanguageVersionSettings? = parseLanguageVersionSettings(directives) @@ -319,4 +319,4 @@ abstract class KotlinBaseTest : KtUsefulTestCase() return TestJdkKind.MOCK_JDK } } -} \ No newline at end of file +} 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 c29d706b432..c6b0581b19d 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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 !KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(((PackageViewDescriptor) descriptor).getFqName()); + return !KotlinBuiltInsNames.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 d7493dffcd8..73123f3d919 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.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES; +import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.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 31bffbf9d56..bc954b6d2b3 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES, + CollectionsKt.map(KotlinBuiltInsNames.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 b71206e5283..689e86b9268 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) + val packageView = getPackage(KotlinBuiltInsNames.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 af739eb19f1..76446d0f671 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + superClass?.classId ?: ClassId.topLevel(KotlinBuiltInsNames.FqNames.any.toSafe()) } } else { super.getLocalClassIdReplacement(descriptor) diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt new file mode 100644 index 00000000000..8b862a07607 --- /dev/null +++ b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/KotlinBuiltInsNames.kt @@ -0,0 +1,208 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.builtins + +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.FqNameUnsafe +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.utils.newHashMapWithExpectedSize +import org.jetbrains.kotlin.utils.newHashSetWithExpectedSize + +@Suppress("Reformat") +object KotlinBuiltInsNames { + // --------------------------- From DescriptorUtils --------------------------- + + @JvmField val ENUM_VALUES = Name.identifier("values") + + @JvmField val ENUM_VALUE_OF = Name.identifier("valueOf") + + @JvmField val COROUTINES_PACKAGE_FQ_NAME_RELEASE = FqName("kotlin.coroutines") + + @JvmField val COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL = COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("experimental")) + + @JvmField val COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL = COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("intrinsics")) + + @JvmField val CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL = COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("Continuation")) + + @JvmField val CONTINUATION_INTERFACE_FQ_NAME_RELEASE = COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("Continuation")) + + @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" + const val K_FUNCTION_PREFIX = "KFunction" + const val K_SUSPEND_FUNCTION_PREFIX = "KSuspendFunction" + + @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") + + @JvmField + val BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME) + + @JvmField + val ANNOTATION_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("annotation")) + + @JvmField + val COLLECTIONS_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("collections")) + + @JvmField + val RANGES_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("ranges")) + + @JvmField + val TEXT_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("text")) + + @JvmField + val BUILT_INS_PACKAGE_FQ_NAMES = setOf( + BUILT_INS_PACKAGE_FQ_NAME, + COLLECTIONS_PACKAGE_FQ_NAME, + RANGES_PACKAGE_FQ_NAME, + ANNOTATION_PACKAGE_FQ_NAME, + KOTLIN_REFLECT_FQ_NAME, + BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("internal")), + COROUTINES_PACKAGE_FQ_NAME_RELEASE + ) + + object FqNames { + @JvmField val any: FqNameUnsafe = fqNameUnsafe("Any") + @JvmField val nothing: FqNameUnsafe = fqNameUnsafe("Nothing") + @JvmField val cloneable: FqNameUnsafe = fqNameUnsafe("Cloneable") + @JvmField val suppress: FqName = fqName("Suppress") + @JvmField val unit: FqNameUnsafe = fqNameUnsafe("Unit") + @JvmField val charSequence: FqNameUnsafe = fqNameUnsafe("CharSequence") + @JvmField val string: FqNameUnsafe = fqNameUnsafe("String") + @JvmField val array: FqNameUnsafe = fqNameUnsafe("Array") + + @JvmField val _boolean: FqNameUnsafe = fqNameUnsafe("Boolean") + @JvmField val _char: FqNameUnsafe = fqNameUnsafe("Char") + @JvmField val _byte: FqNameUnsafe = fqNameUnsafe("Byte") + @JvmField val _short: FqNameUnsafe = fqNameUnsafe("Short") + @JvmField val _int: FqNameUnsafe = fqNameUnsafe("Int") + @JvmField val _long: FqNameUnsafe = fqNameUnsafe("Long") + @JvmField val _float: FqNameUnsafe = fqNameUnsafe("Float") + @JvmField val _double: FqNameUnsafe = fqNameUnsafe("Double") + @JvmField val number: FqNameUnsafe = fqNameUnsafe("Number") + + @JvmField val _enum: FqNameUnsafe = fqNameUnsafe("Enum") + + @JvmField val functionSupertype: FqNameUnsafe = fqNameUnsafe("Function") + + @JvmField val throwable: FqName = fqName("Throwable") + @JvmField val comparable: FqName = fqName("Comparable") + + @JvmField val intRange: FqNameUnsafe = rangesFqName("IntRange") + @JvmField val longRange: FqNameUnsafe = rangesFqName("LongRange") + + @JvmField val deprecated: FqName = fqName("Deprecated") + @JvmField val deprecatedSinceKotlin: FqName = fqName("DeprecatedSinceKotlin") + @JvmField val deprecationLevel: FqName = fqName("DeprecationLevel") + @JvmField val replaceWith: FqName = fqName("ReplaceWith") + @JvmField val extensionFunctionType: FqName = fqName("ExtensionFunctionType") + @JvmField val parameterName: FqName = fqName("ParameterName") + @JvmField val annotation: FqName = fqName("Annotation") + @JvmField val target: FqName = annotationName("Target") + @JvmField val annotationTarget: FqName = annotationName("AnnotationTarget") + @JvmField val annotationRetention: FqName = annotationName("AnnotationRetention") + @JvmField val retention: FqName = annotationName("Retention") + @JvmField val repeatable: FqName = annotationName("Repeatable") + @JvmField val mustBeDocumented: FqName = annotationName("MustBeDocumented") + @JvmField val unsafeVariance: FqName = fqName("UnsafeVariance") + @JvmField val publishedApi: FqName = fqName("PublishedApi") + + @JvmField val iterator: FqName = collectionsFqName("Iterator") + @JvmField val iterable: FqName = collectionsFqName("Iterable") + @JvmField val collection: FqName = collectionsFqName("Collection") + @JvmField val list: FqName = collectionsFqName("List") + @JvmField val listIterator: FqName = collectionsFqName("ListIterator") + @JvmField val set: FqName = collectionsFqName("Set") + @JvmField val map: FqName = collectionsFqName("Map") + @JvmField val mapEntry: FqName = map.child(Name.identifier("Entry")) + @JvmField val mutableIterator: FqName = collectionsFqName("MutableIterator") + @JvmField val mutableIterable: FqName = collectionsFqName("MutableIterable") + @JvmField val mutableCollection: FqName = collectionsFqName("MutableCollection") + @JvmField val mutableList: FqName = collectionsFqName("MutableList") + @JvmField val mutableListIterator: FqName = collectionsFqName("MutableListIterator") + @JvmField val mutableSet: FqName = collectionsFqName("MutableSet") + @JvmField val mutableMap: FqName = collectionsFqName("MutableMap") + @JvmField val mutableMapEntry: FqName = mutableMap.child(Name.identifier("MutableEntry")) + + @JvmField val kClass: FqNameUnsafe = reflect("KClass") + @JvmField val kCallable: FqNameUnsafe = reflect("KCallable") + @JvmField val kProperty0: FqNameUnsafe = reflect("KProperty0") + @JvmField val kProperty1: FqNameUnsafe = reflect("KProperty1") + @JvmField val kProperty2: FqNameUnsafe = reflect("KProperty2") + @JvmField val kMutableProperty0: FqNameUnsafe = reflect("KMutableProperty0") + @JvmField val kMutableProperty1: FqNameUnsafe = reflect("KMutableProperty1") + @JvmField val kMutableProperty2: FqNameUnsafe = reflect("KMutableProperty2") + @JvmField val kPropertyFqName: FqNameUnsafe = reflect("KProperty") + @JvmField val kMutablePropertyFqName: FqNameUnsafe = reflect("KMutableProperty") + @JvmField val kProperty: ClassId = ClassId.topLevel(kPropertyFqName.toSafe()) + @JvmField val kDeclarationContainer: FqNameUnsafe = reflect("KDeclarationContainer") + + @JvmField val uByteFqName: FqName = fqName("UByte") + @JvmField val uShortFqName: FqName = fqName("UShort") + @JvmField val uIntFqName: FqName = fqName("UInt") + @JvmField val uLongFqName: FqName = fqName("ULong") + @JvmField val uByte: ClassId = ClassId.topLevel(uByteFqName) + @JvmField val uShort: ClassId = ClassId.topLevel(uShortFqName) + @JvmField val uInt: ClassId = ClassId.topLevel(uIntFqName) + @JvmField val uLong: ClassId = ClassId.topLevel(uLongFqName) + + @JvmField val primitiveTypeShortNames: Set = newHashSetWithExpectedSize(PrimitiveType.values().size).apply { + PrimitiveType.values().mapTo(this) { it.typeName } + } + + @JvmField val primitiveArrayTypeShortNames: Set = newHashSetWithExpectedSize(PrimitiveType.values().size).apply { + PrimitiveType.values().mapTo(this) { it.arrayTypeName } + } + + @JvmField val fqNameToPrimitiveType: Map = + newHashMapWithExpectedSize(PrimitiveType.values().size).apply { + for (primitiveType in PrimitiveType.values()) { + this[fqNameUnsafe(primitiveType.typeName.asString())] = primitiveType + } + } + + @JvmField val arrayClassFqNameToPrimitiveType: MutableMap = + newHashMapWithExpectedSize(PrimitiveType.values().size).apply { + for (primitiveType in PrimitiveType.values()) { + this[fqNameUnsafe(primitiveType.arrayTypeName.asString())] = primitiveType + } + } + + + private fun fqNameUnsafe(simpleName: String): FqNameUnsafe { + return fqName(simpleName).toUnsafe() + } + + private fun fqName(simpleName: String): FqName { + return BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)) + } + + private fun collectionsFqName(simpleName: String): FqName { + return COLLECTIONS_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)) + } + + private fun rangesFqName(simpleName: String): FqNameUnsafe { + return RANGES_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)).toUnsafe() + } + + @JvmStatic + fun reflect(simpleName: String): FqNameUnsafe { + return KOTLIN_REFLECT_FQ_NAME.child(Name.identifier(simpleName)).toUnsafe() + } + + private fun annotationName(simpleName: String): FqName { + return ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)) + } + } +} diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt similarity index 66% rename from core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt rename to core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt index f835fa9d000..1b236d5fd10 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt +++ b/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.builtins @@ -34,9 +23,9 @@ enum class PrimitiveType(typeName: String) { val arrayTypeName: Name = Name.identifier("${typeName}Array") - val typeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) } + val typeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.child(this.typeName) } - val arrayTypeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) } + val arrayTypeFqName: FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME.child(arrayTypeName) } companion object { @JvmField 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 7f960b0dff3..f17a80cdacc 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,7 +7,7 @@ package org.jetbrains.kotlin.builtins.jvm import org.jetbrains.kotlin.builtins.CompanionObjectMapping import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor @@ -56,28 +56,28 @@ object JavaToKotlinClassMap : PlatformToKotlinClassMap { } val mutabilityMappings = listOf( - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.iterable), FQ_NAMES.mutableIterable), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.iterator), FQ_NAMES.mutableIterator), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.collection), FQ_NAMES.mutableCollection), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.list), FQ_NAMES.mutableList), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.set), FQ_NAMES.mutableSet), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.listIterator), FQ_NAMES.mutableListIterator), - mutabilityMapping>(ClassId.topLevel(FQ_NAMES.map), FQ_NAMES.mutableMap), + mutabilityMapping>(ClassId.topLevel(FqNames.iterable), FqNames.mutableIterable), + mutabilityMapping>(ClassId.topLevel(FqNames.iterator), FqNames.mutableIterator), + mutabilityMapping>(ClassId.topLevel(FqNames.collection), FqNames.mutableCollection), + mutabilityMapping>(ClassId.topLevel(FqNames.list), FqNames.mutableList), + mutabilityMapping>(ClassId.topLevel(FqNames.set), FqNames.mutableSet), + mutabilityMapping>(ClassId.topLevel(FqNames.listIterator), FqNames.mutableListIterator), + mutabilityMapping>(ClassId.topLevel(FqNames.map), FqNames.mutableMap), mutabilityMapping>( - ClassId.topLevel(FQ_NAMES.map).createNestedClassId(FQ_NAMES.mapEntry.shortName()), FQ_NAMES.mutableMapEntry + ClassId.topLevel(FqNames.map).createNestedClassId(FqNames.mapEntry.shortName()), FqNames.mutableMapEntry ) ) init { - addTopLevel(Any::class.java, FQ_NAMES.any) - addTopLevel(String::class.java, FQ_NAMES.string) - addTopLevel(CharSequence::class.java, FQ_NAMES.charSequence) - addTopLevel(Throwable::class.java, FQ_NAMES.throwable) - addTopLevel(Cloneable::class.java, FQ_NAMES.cloneable) - addTopLevel(Number::class.java, FQ_NAMES.number) - addTopLevel(Comparable::class.java, FQ_NAMES.comparable) - addTopLevel(Enum::class.java, FQ_NAMES._enum) - addTopLevel(Annotation::class.java, FQ_NAMES.annotation) + addTopLevel(Any::class.java, FqNames.any) + addTopLevel(String::class.java, FqNames.string) + addTopLevel(CharSequence::class.java, FqNames.charSequence) + addTopLevel(Throwable::class.java, FqNames.throwable) + addTopLevel(Cloneable::class.java, FqNames.cloneable) + addTopLevel(Number::class.java, FqNames.number) + addTopLevel(Comparable::class.java, FqNames.comparable) + addTopLevel(Enum::class.java, FqNames._enum) + addTopLevel(Annotation::class.java, FqNames.annotation) for (platformCollection in mutabilityMappings) { addMapping(platformCollection) @@ -107,7 +107,7 @@ object JavaToKotlinClassMap : PlatformToKotlinClassMap { addKotlinToJava(FqName(kSuspendFun + i), K_FUNCTION_CLASS_ID) } - addKotlinToJava(FQ_NAMES.nothing.toSafe(), classId(Void::class.java)) + addKotlinToJava(FqNames.nothing.toSafe(), classId(Void::class.java)) } /** 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 5a67ab3658e..c7ef337c2dd 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 = KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME - private val CLONEABLE_NAME = KotlinBuiltIns.FQ_NAMES.cloneable.shortName() - val CLONEABLE_CLASS_ID = ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.cloneable.toSafe()) + 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()) } } 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 c856eabb41b..a237b3bd8b9 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,6 +6,7 @@ package org.jetbrains.kotlin.builtins.jvm import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.createDeprecatedAnnotation @@ -338,7 +339,7 @@ open class JvmBuiltInsSettings( } private fun isArrayOrPrimitiveArray(fqName: FqNameUnsafe): Boolean { - return fqName == KotlinBuiltIns.FQ_NAMES.array || KotlinBuiltIns.isPrimitiveArray(fqName) + return fqName == KotlinBuiltInsNames.FqNames.array || KotlinBuiltIns.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 269d2668165..01dc35f4c80 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.name.FqName object FakePureImplementationsProvider { @@ -28,9 +28,9 @@ object FakePureImplementationsProvider { } init { - FQ_NAMES.mutableList implementedWith fqNameListOf("java.util.ArrayList", "java.util.LinkedList") - FQ_NAMES.mutableSet implementedWith fqNameListOf("java.util.HashSet", "java.util.TreeSet", "java.util.LinkedHashSet") - FQ_NAMES.mutableMap implementedWith fqNameListOf( + FqNames.mutableList implementedWith fqNameListOf("java.util.ArrayList", "java.util.LinkedList") + FqNames.mutableSet implementedWith fqNameListOf("java.util.HashSet", "java.util.TreeSet", "java.util.LinkedHashSet") + FqNames.mutableMap implementedWith fqNameListOf( "java.util.HashMap", "java.util.TreeMap", "java.util.LinkedHashMap", "java.util.concurrent.ConcurrentHashMap", "java.util.concurrent.ConcurrentSkipListMap" ) 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 a998cb949b0..efb85f7aebe 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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, KotlinBuiltIns.FQ_NAMES.repeatable) - ClassId.topLevel(JAVA_DOCUMENTED_FQ_NAME) -> JavaAnnotationDescriptor(c, annotation, KotlinBuiltIns.FQ_NAMES.mustBeDocumented) + 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_DEPRECATED_FQ_NAME) -> null else -> LazyJavaAnnotationDescriptor(c, annotation) } @@ -68,7 +68,7 @@ object JavaAnnotationMapper { annotationOwner: JavaAnnotationOwner, c: LazyJavaResolverContext ): AnnotationDescriptor? { - if (kotlinName == KotlinBuiltIns.FQ_NAMES.deprecated) { + if (kotlinName == KotlinBuiltInsNames.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( - KotlinBuiltIns.FQ_NAMES.target to JAVA_TARGET_FQ_NAME, - KotlinBuiltIns.FQ_NAMES.retention to JAVA_RETENTION_FQ_NAME, - KotlinBuiltIns.FQ_NAMES.repeatable to JAVA_REPEATABLE_FQ_NAME, - KotlinBuiltIns.FQ_NAMES.mustBeDocumented to JAVA_DOCUMENTED_FQ_NAME + 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 ) val javaToKotlinNameMap: Map = mapOf( - JAVA_TARGET_FQ_NAME to KotlinBuiltIns.FQ_NAMES.target, - JAVA_RETENTION_FQ_NAME to KotlinBuiltIns.FQ_NAMES.retention, - JAVA_DEPRECATED_FQ_NAME to KotlinBuiltIns.FQ_NAMES.deprecated, - JAVA_REPEATABLE_FQ_NAME to KotlinBuiltIns.FQ_NAMES.repeatable, - JAVA_DOCUMENTED_FQ_NAME to KotlinBuiltIns.FQ_NAMES.mustBeDocumented + 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 ) } @@ -119,7 +119,7 @@ open class JavaAnnotationDescriptor( class JavaDeprecatedAnnotationDescriptor( annotation: JavaAnnotation?, c: LazyJavaResolverContext -) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltIns.FQ_NAMES.deprecated) { +) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.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, KotlinBuiltIns.FQ_NAMES.target) { +) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.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, KotlinBuiltIns.FQ_NAMES.retention) { +) : JavaAnnotationDescriptor(c, annotation, KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.annotationTarget), Name.identifier(kotlinTarget.name)) + EnumValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.annotationTarget), Name.identifier(kotlinTarget.name)) } return ArrayValue(kotlinTargets) { module -> val parameterDescriptor = DescriptorResolverUtils.getAnnotationParameterByName( JavaAnnotationMapper.TARGET_ANNOTATION_ALLOWED_TARGETS, - module.builtIns.getBuiltInClassByFqName(KotlinBuiltIns.FQ_NAMES.target) + module.builtIns.getBuiltInClassByFqName(KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.annotationRetention), Name.identifier(retention.name)) + EnumValue(ClassId.topLevel(KotlinBuiltInsNames.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 1e46eccb322..2682689aa79 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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( - KotlinBuiltIns.FQ_NAMES.deprecated, + KotlinBuiltInsNames.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 d9478af8c3e..b446d0cc762 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,6 +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.jvm.createMappedTypeParametersSubstitution import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -225,7 +226,7 @@ class LazyJavaClassDescriptor( private fun getPurelyImplementedSupertype(): KotlinType? { val annotatedPurelyImplementedFqName = getPurelyImplementsFqNameFromAnnotation()?.takeIf { fqName -> - !fqName.isRoot && fqName.startsWith(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME) + !fqName.isRoot && fqName.startsWith(KotlinBuiltInsNames.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 74a13367929..1da8034b93b 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,6 +16,7 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor @@ -29,7 +30,6 @@ import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValueOfMethod import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValuesMethod -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.utils.DFS @@ -46,7 +46,7 @@ class LazyJavaStaticClassScope( declaredMemberIndex().getMethodNames().toMutableSet().apply { addAll(ownerDescriptor.getParentJavaStaticClassScope()?.getFunctionNames().orEmpty()) if (jClass.isEnum) { - addAll(listOf(DescriptorUtils.ENUM_VALUE_OF, DescriptorUtils.ENUM_VALUES)) + addAll(listOf(KotlinBuiltInsNames.ENUM_VALUE_OF, KotlinBuiltInsNames.ENUM_VALUES)) } } @@ -75,8 +75,8 @@ class LazyJavaStaticClassScope( if (jClass.isEnum) { when (name) { - DescriptorUtils.ENUM_VALUE_OF -> result.add(createEnumValueOfMethod(ownerDescriptor)) - DescriptorUtils.ENUM_VALUES -> result.add(createEnumValuesMethod(ownerDescriptor)) + KotlinBuiltInsNames.ENUM_VALUE_OF -> result.add(createEnumValueOfMethod(ownerDescriptor)) + KotlinBuiltInsNames.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 a8655bf28c5..ffe24796387 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,6 +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.descriptors.* import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.getSpecialSignatureInfo import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.sameAsBuiltinMethodWithErasedValueParameters @@ -37,7 +38,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.descriptorUtil.propertyIfAccessor import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES as BUILTIN_NAMES private fun FqName.child(name: String): FqName = child(Name.identifier(name)) private fun FqNameUnsafe.childSafe(name: String): FqName = child(Name.identifier(name)).toSafe() @@ -52,14 +52,14 @@ private fun String.method(name: String, parameters: String, returnType: String) object BuiltinSpecialProperties { val PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP = mapOf( - BUILTIN_NAMES._enum.childSafe("name") to Name.identifier("name"), - BUILTIN_NAMES._enum.childSafe("ordinal") to Name.identifier("ordinal"), - BUILTIN_NAMES.collection.child("size") to Name.identifier("size"), - BUILTIN_NAMES.map.child("size") to Name.identifier("size"), - BUILTIN_NAMES.charSequence.childSafe("length") to Name.identifier("length"), - BUILTIN_NAMES.map.child("keys") to Name.identifier("keySet"), - BUILTIN_NAMES.map.child("values") to Name.identifier("values"), - BUILTIN_NAMES.map.child("entries") to Name.identifier("entrySet") + FqNames._enum.childSafe("name") to Name.identifier("name"), + FqNames._enum.childSafe("ordinal") to Name.identifier("ordinal"), + FqNames.collection.child("size") to Name.identifier("size"), + FqNames.map.child("size") to Name.identifier("size"), + FqNames.charSequence.childSafe("length") to Name.identifier("length"), + FqNames.map.child("keys") to Name.identifier("keySet"), + FqNames.map.child("values") to Name.identifier("values"), + FqNames.map.child("entries") to Name.identifier("entrySet") ) private val GETTER_JVM_NAME_TO_PROPERTIES_SHORT_NAME_MAP: Map> = 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 f0d8c950319..a8e387673f4 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.mutableCollection.toUnsafe() + return overridden.containingDeclaration.fqNameUnsafe == KotlinBuiltInsNames.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 2993886c087..6fc3c44765e 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,6 +5,7 @@ package org.jetbrains.kotlin.resolve.jvm +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe @@ -47,7 +48,7 @@ private fun KotlinType.requiresFunctionNameManglingInParameterTypes() = isInlineClassThatRequiresMangling() || isTypeParameterWithUpperBoundThatRequiresMangling() private fun isDontMangleClass(classDescriptor: ClassDescriptor) = - classDescriptor.fqNameSafe == DescriptorUtils.RESULT_FQ_NAME + classDescriptor.fqNameSafe == KotlinBuiltInsNames.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 2172685d039..7df0a7cfbf3 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,8 +16,11 @@ package org.jetbrains.kotlin.descriptors.runtime.components -import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap +import org.jetbrains.kotlin.descriptors.runtime.structure.classId +import org.jetbrains.kotlin.descriptors.runtime.structure.desc +import org.jetbrains.kotlin.descriptors.runtime.structure.isEnumClassOrSpecializedEnumEntryClass import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor @@ -28,9 +31,6 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Method -import org.jetbrains.kotlin.descriptors.runtime.structure.classId -import org.jetbrains.kotlin.descriptors.runtime.structure.desc -import org.jetbrains.kotlin.descriptors.runtime.structure.isEnumClassOrSpecializedEnumEntryClass @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf>( @@ -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(KotlinBuiltIns.FQ_NAMES.unit.toSafe()), dimensions) + return ClassLiteralValue(ClassId.topLevel(KotlinBuiltInsNames.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 c73212f6053..fb0fa4b3126 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME)) return null + if (!packageFqName.startsWith(KotlinBuiltInsNames.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 756db80dc81..6f64d234151 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt @@ -25,9 +25,9 @@ import java.util.* object CompanionObjectMapping { private val classIds = (PrimitiveType.NUMBER_TYPES.map(KotlinBuiltIns::getPrimitiveFqName) + - KotlinBuiltIns.FQ_NAMES.string.toSafe() + - KotlinBuiltIns.FQ_NAMES._boolean.toSafe() + - KotlinBuiltIns.FQ_NAMES._enum.toSafe()).mapTo(linkedSetOf(), ClassId::topLevel) + KotlinBuiltInsNames.FqNames.string.toSafe() + + KotlinBuiltInsNames.FqNames._boolean.toSafe() + + KotlinBuiltInsNames.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 7c54adcf71d..fd2f002d306 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -33,31 +33,11 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.*; -import static kotlin.collections.SetsKt.setOf; +import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.*; import static org.jetbrains.kotlin.builtins.PrimitiveType.*; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.kotlin.utils.CollectionsKt.newHashMapWithExpectedSize; -import static org.jetbrains.kotlin.utils.CollectionsKt.newHashSetWithExpectedSize; public abstract class KotlinBuiltIns { - public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier("kotlin"); - public static final FqName BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME); - public static final FqName ANNOTATION_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("annotation")); - public static final FqName COLLECTIONS_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("collections")); - public static final FqName RANGES_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("ranges")); - public static final FqName TEXT_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("text")); - - public static final Set BUILT_INS_PACKAGE_FQ_NAMES = setOf( - BUILT_INS_PACKAGE_FQ_NAME, - COLLECTIONS_PACKAGE_FQ_NAME, - RANGES_PACKAGE_FQ_NAME, - ANNOTATION_PACKAGE_FQ_NAME, - ReflectionTypesKt.getKOTLIN_REFLECT_FQ_NAME(), - BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("internal")), - COROUTINES_PACKAGE_FQ_NAME_RELEASE - ); - private ModuleDescriptorImpl builtInsModule; private final NotNullLazyValue primitives; @@ -67,7 +47,6 @@ public abstract class KotlinBuiltIns { private final StorageManager storageManager; - public static final FqNames FQ_NAMES = new FqNames(); public static final Name BUILTINS_MODULE_NAME = Name.special(""); protected KotlinBuiltIns(@NotNull StorageManager storageManager) { @@ -180,135 +159,6 @@ public abstract class KotlinBuiltIns { } } - public static class FqNames { - public final FqNameUnsafe any = fqNameUnsafe("Any"); - public final FqNameUnsafe nothing = fqNameUnsafe("Nothing"); - public final FqNameUnsafe cloneable = fqNameUnsafe("Cloneable"); - public final FqName suppress = fqName("Suppress"); - public final FqNameUnsafe unit = fqNameUnsafe("Unit"); - public final FqNameUnsafe charSequence = fqNameUnsafe("CharSequence"); - public final FqNameUnsafe string = fqNameUnsafe("String"); - public final FqNameUnsafe array = fqNameUnsafe("Array"); - - public final FqNameUnsafe _boolean = fqNameUnsafe("Boolean"); - public final FqNameUnsafe _char = fqNameUnsafe("Char"); - public final FqNameUnsafe _byte = fqNameUnsafe("Byte"); - public final FqNameUnsafe _short = fqNameUnsafe("Short"); - public final FqNameUnsafe _int = fqNameUnsafe("Int"); - public final FqNameUnsafe _long = fqNameUnsafe("Long"); - public final FqNameUnsafe _float = fqNameUnsafe("Float"); - public final FqNameUnsafe _double = fqNameUnsafe("Double"); - public final FqNameUnsafe number = fqNameUnsafe("Number"); - - public final FqNameUnsafe _enum = fqNameUnsafe("Enum"); - - public final FqNameUnsafe functionSupertype = fqNameUnsafe("Function"); - - public final FqName throwable = fqName("Throwable"); - public final FqName comparable = fqName("Comparable"); - - public final FqNameUnsafe intRange = rangesFqName("IntRange"); - public final FqNameUnsafe longRange = rangesFqName("LongRange"); - - public final FqName deprecated = fqName("Deprecated"); - public final FqName deprecatedSinceKotlin = fqName("DeprecatedSinceKotlin"); - public final FqName deprecationLevel = fqName("DeprecationLevel"); - public final FqName replaceWith = fqName("ReplaceWith"); - public final FqName extensionFunctionType = fqName("ExtensionFunctionType"); - public final FqName parameterName = fqName("ParameterName"); - public final FqName annotation = fqName("Annotation"); - public final FqName target = annotationName("Target"); - public final FqName annotationTarget = annotationName("AnnotationTarget"); - public final FqName annotationRetention = annotationName("AnnotationRetention"); - public final FqName retention = annotationName("Retention"); - public final FqName repeatable = annotationName("Repeatable"); - public final FqName mustBeDocumented = annotationName("MustBeDocumented"); - public final FqName unsafeVariance = fqName("UnsafeVariance"); - public final FqName publishedApi = fqName("PublishedApi"); - - public final FqName iterator = collectionsFqName("Iterator"); - public final FqName iterable = collectionsFqName("Iterable"); - public final FqName collection = collectionsFqName("Collection"); - public final FqName list = collectionsFqName("List"); - public final FqName listIterator = collectionsFqName("ListIterator"); - public final FqName set = collectionsFqName("Set"); - public final FqName map = collectionsFqName("Map"); - public final FqName mapEntry = map.child(Name.identifier("Entry")); - public final FqName mutableIterator = collectionsFqName("MutableIterator"); - public final FqName mutableIterable = collectionsFqName("MutableIterable"); - public final FqName mutableCollection = collectionsFqName("MutableCollection"); - public final FqName mutableList = collectionsFqName("MutableList"); - public final FqName mutableListIterator = collectionsFqName("MutableListIterator"); - public final FqName mutableSet = collectionsFqName("MutableSet"); - public final FqName mutableMap = collectionsFqName("MutableMap"); - public final FqName mutableMapEntry = mutableMap.child(Name.identifier("MutableEntry")); - - public final FqNameUnsafe kClass = reflect("KClass"); - public final FqNameUnsafe kCallable = reflect("KCallable"); - public final FqNameUnsafe kProperty0 = reflect("KProperty0"); - public final FqNameUnsafe kProperty1 = reflect("KProperty1"); - public final FqNameUnsafe kProperty2 = reflect("KProperty2"); - public final FqNameUnsafe kMutableProperty0 = reflect("KMutableProperty0"); - public final FqNameUnsafe kMutableProperty1 = reflect("KMutableProperty1"); - public final FqNameUnsafe kMutableProperty2 = reflect("KMutableProperty2"); - public final FqNameUnsafe kPropertyFqName = reflect("KProperty"); - public final FqNameUnsafe kMutablePropertyFqName = reflect("KMutableProperty"); - public final ClassId kProperty = ClassId.topLevel(kPropertyFqName.toSafe()); - public final FqNameUnsafe kDeclarationContainer = reflect("KDeclarationContainer"); - - public final FqName uByteFqName = fqName("UByte"); - public final FqName uShortFqName = fqName("UShort"); - public final FqName uIntFqName = fqName("UInt"); - public final FqName uLongFqName = fqName("ULong"); - public final ClassId uByte = ClassId.topLevel(uByteFqName); - public final ClassId uShort = ClassId.topLevel(uShortFqName); - public final ClassId uInt = ClassId.topLevel(uIntFqName); - public final ClassId uLong = ClassId.topLevel(uLongFqName); - - public final Set primitiveTypeShortNames = newHashSetWithExpectedSize(PrimitiveType.values().length); - public final Set primitiveArrayTypeShortNames = newHashSetWithExpectedSize(PrimitiveType.values().length); - public final Map fqNameToPrimitiveType = newHashMapWithExpectedSize(PrimitiveType.values().length); - public final Map arrayClassFqNameToPrimitiveType = newHashMapWithExpectedSize(PrimitiveType.values().length); - { - for (PrimitiveType primitiveType : PrimitiveType.values()) { - primitiveTypeShortNames.add(primitiveType.getTypeName()); - primitiveArrayTypeShortNames.add(primitiveType.getArrayTypeName()); - fqNameToPrimitiveType.put(fqNameUnsafe(primitiveType.getTypeName().asString()), primitiveType); - arrayClassFqNameToPrimitiveType.put(fqNameUnsafe(primitiveType.getArrayTypeName().asString()), primitiveType); - } - } - - @NotNull - private static FqNameUnsafe fqNameUnsafe(@NotNull String simpleName) { - return fqName(simpleName).toUnsafe(); - } - - @NotNull - private static FqName fqName(@NotNull String simpleName) { - return BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)); - } - - @NotNull - private static FqName collectionsFqName(@NotNull String simpleName) { - return COLLECTIONS_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)); - } - - @NotNull - private static FqNameUnsafe rangesFqName(@NotNull String simpleName) { - return RANGES_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)).toUnsafe(); - } - - @NotNull - private static FqNameUnsafe reflect(@NotNull String simpleName) { - return ReflectionTypesKt.getKOTLIN_REFLECT_FQ_NAME().child(Name.identifier(simpleName)).toUnsafe(); - } - - @NotNull - private static FqName annotationName(@NotNull String simpleName) { - return ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)); - } - } - @NotNull public ModuleDescriptorImpl getBuiltInsModule() { return builtInsModule; @@ -516,107 +366,107 @@ public abstract class KotlinBuiltIns { @NotNull public ClassDescriptor getKClass() { - return getBuiltInClassByFqName(FQ_NAMES.kClass.toSafe()); + return getBuiltInClassByFqName(FqNames.kClass.toSafe()); } @NotNull public ClassDescriptor getKCallable() { - return getBuiltInClassByFqName(FQ_NAMES.kCallable.toSafe()); + return getBuiltInClassByFqName(FqNames.kCallable.toSafe()); } @NotNull public ClassDescriptor getKProperty() { - return getBuiltInClassByFqName(FQ_NAMES.kPropertyFqName.toSafe()); + return getBuiltInClassByFqName(FqNames.kPropertyFqName.toSafe()); } @NotNull public ClassDescriptor getKProperty0() { - return getBuiltInClassByFqName(FQ_NAMES.kProperty0.toSafe()); + return getBuiltInClassByFqName(FqNames.kProperty0.toSafe()); } @NotNull public ClassDescriptor getKProperty1() { - return getBuiltInClassByFqName(FQ_NAMES.kProperty1.toSafe()); + return getBuiltInClassByFqName(FqNames.kProperty1.toSafe()); } @NotNull public ClassDescriptor getKProperty2() { - return getBuiltInClassByFqName(FQ_NAMES.kProperty2.toSafe()); + return getBuiltInClassByFqName(FqNames.kProperty2.toSafe()); } @NotNull public ClassDescriptor getKMutableProperty0() { - return getBuiltInClassByFqName(FQ_NAMES.kMutableProperty0.toSafe()); + return getBuiltInClassByFqName(FqNames.kMutableProperty0.toSafe()); } @NotNull public ClassDescriptor getKMutableProperty1() { - return getBuiltInClassByFqName(FQ_NAMES.kMutableProperty1.toSafe()); + return getBuiltInClassByFqName(FqNames.kMutableProperty1.toSafe()); } @NotNull public ClassDescriptor getKMutableProperty2() { - return getBuiltInClassByFqName(FQ_NAMES.kMutableProperty2.toSafe()); + return getBuiltInClassByFqName(FqNames.kMutableProperty2.toSafe()); } @NotNull public ClassDescriptor getIterator() { - return getBuiltInClassByFqName(FQ_NAMES.iterator); + return getBuiltInClassByFqName(FqNames.iterator); } @NotNull public ClassDescriptor getIterable() { - return getBuiltInClassByFqName(FQ_NAMES.iterable); + return getBuiltInClassByFqName(FqNames.iterable); } @NotNull public ClassDescriptor getMutableIterable() { - return getBuiltInClassByFqName(FQ_NAMES.mutableIterable); + return getBuiltInClassByFqName(FqNames.mutableIterable); } @NotNull public ClassDescriptor getMutableIterator() { - return getBuiltInClassByFqName(FQ_NAMES.mutableIterator); + return getBuiltInClassByFqName(FqNames.mutableIterator); } @NotNull public ClassDescriptor getCollection() { - return getBuiltInClassByFqName(FQ_NAMES.collection); + return getBuiltInClassByFqName(FqNames.collection); } @NotNull public ClassDescriptor getMutableCollection() { - return getBuiltInClassByFqName(FQ_NAMES.mutableCollection); + return getBuiltInClassByFqName(FqNames.mutableCollection); } @NotNull public ClassDescriptor getList() { - return getBuiltInClassByFqName(FQ_NAMES.list); + return getBuiltInClassByFqName(FqNames.list); } @NotNull public ClassDescriptor getMutableList() { - return getBuiltInClassByFqName(FQ_NAMES.mutableList); + return getBuiltInClassByFqName(FqNames.mutableList); } @NotNull public ClassDescriptor getSet() { - return getBuiltInClassByFqName(FQ_NAMES.set); + return getBuiltInClassByFqName(FqNames.set); } @NotNull public ClassDescriptor getMutableSet() { - return getBuiltInClassByFqName(FQ_NAMES.mutableSet); + return getBuiltInClassByFqName(FqNames.mutableSet); } @NotNull public ClassDescriptor getMap() { - return getBuiltInClassByFqName(FQ_NAMES.map); + return getBuiltInClassByFqName(FqNames.map); } @NotNull public ClassDescriptor getMutableMap() { - return getBuiltInClassByFqName(FQ_NAMES.mutableMap); + return getBuiltInClassByFqName(FqNames.mutableMap); } @NotNull @@ -635,12 +485,12 @@ public abstract class KotlinBuiltIns { @NotNull public ClassDescriptor getListIterator() { - return getBuiltInClassByFqName(FQ_NAMES.listIterator); + return getBuiltInClassByFqName(FqNames.listIterator); } @NotNull public ClassDescriptor getMutableListIterator() { - return getBuiltInClassByFqName(FQ_NAMES.mutableListIterator); + return getBuiltInClassByFqName(FqNames.mutableListIterator); } @NotNull @@ -814,20 +664,20 @@ public abstract class KotlinBuiltIns { } public static boolean isPrimitiveArray(@NotNull FqNameUnsafe arrayFqName) { - return FQ_NAMES.arrayClassFqNameToPrimitiveType.get(arrayFqName) != null; + return FqNames.arrayClassFqNameToPrimitiveType.get(arrayFqName) != null; } @Nullable public static PrimitiveType getPrimitiveType(@NotNull DeclarationDescriptor descriptor) { - return FQ_NAMES.primitiveTypeShortNames.contains(descriptor.getName()) - ? FQ_NAMES.fqNameToPrimitiveType.get(getFqName(descriptor)) + return FqNames.primitiveTypeShortNames.contains(descriptor.getName()) + ? FqNames.fqNameToPrimitiveType.get(getFqName(descriptor)) : null; } @Nullable public static PrimitiveType getPrimitiveArrayType(@NotNull DeclarationDescriptor descriptor) { - return FQ_NAMES.primitiveArrayTypeShortNames.contains(descriptor.getName()) - ? FQ_NAMES.arrayClassFqNameToPrimitiveType.get(getFqName(descriptor)) + return FqNames.primitiveArrayTypeShortNames.contains(descriptor.getName()) + ? FqNames.arrayClassFqNameToPrimitiveType.get(getFqName(descriptor)) : null; } @@ -850,11 +700,11 @@ public abstract class KotlinBuiltIns { } public static boolean isArray(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.array); + return isConstructedFromGivenClass(type, FqNames.array); } public static boolean isArrayOrPrimitiveArray(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.array) || getPrimitiveArrayType(descriptor) != null; + return classFqNameEquals(descriptor, FqNames.array) || getPrimitiveArrayType(descriptor) != null; } public static boolean isArrayOrPrimitiveArray(@NotNull KotlinType type) { @@ -915,59 +765,59 @@ public abstract class KotlinBuiltIns { } public static boolean isSpecialClassWithNoSupertypes(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.any) || classFqNameEquals(descriptor, FQ_NAMES.nothing); + return classFqNameEquals(descriptor, FqNames.any) || classFqNameEquals(descriptor, FqNames.nothing); } public static boolean isAny(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.any); + return classFqNameEquals(descriptor, FqNames.any); } public static boolean isAny(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.any); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.any); } public static boolean isBoolean(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._boolean); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._boolean); } public static boolean isBooleanOrNullableBoolean(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES._boolean); + return isConstructedFromGivenClass(type, FqNames._boolean); } public static boolean isBoolean(@NotNull ClassDescriptor classDescriptor) { - return classFqNameEquals(classDescriptor, FQ_NAMES._boolean); + return classFqNameEquals(classDescriptor, FqNames._boolean); } public static boolean isNumber(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.number); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.number); } public static boolean isChar(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._char); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._char); } public static boolean isCharOrNullableChar(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES._char); + return isConstructedFromGivenClass(type, FqNames._char); } public static boolean isInt(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._int); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._int); } public static boolean isByte(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._byte); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._byte); } public static boolean isLong(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._long); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._long); } public static boolean isLongOrNullableLong(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES._long); + return isConstructedFromGivenClass(type, FqNames._long); } public static boolean isShort(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._short); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._short); } public static boolean isFloat(@NotNull KotlinType type) { @@ -975,7 +825,7 @@ public abstract class KotlinBuiltIns { } public static boolean isFloatOrNullableFloat(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES._float); + return isConstructedFromGivenClass(type, FqNames._float); } public static boolean isDouble(@NotNull KotlinType type) { @@ -983,23 +833,23 @@ public abstract class KotlinBuiltIns { } public static boolean isUByte(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.uByteFqName.toUnsafe()); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.uByteFqName.toUnsafe()); } public static boolean isUShort(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.uShortFqName.toUnsafe()); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.uShortFqName.toUnsafe()); } public static boolean isUInt(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.uIntFqName.toUnsafe()); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.uIntFqName.toUnsafe()); } public static boolean isULong(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.uLongFqName.toUnsafe()); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.uLongFqName.toUnsafe()); } public static boolean isDoubleOrNullableDouble(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES._double); + return isConstructedFromGivenClass(type, FqNames._double); } private static boolean isConstructedFromGivenClassAndNotNullable(@NotNull KotlinType type, @NotNull FqNameUnsafe fqName) { @@ -1017,11 +867,11 @@ public abstract class KotlinBuiltIns { } public static boolean isNothingOrNullableNothing(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.nothing); + return isConstructedFromGivenClass(type, FqNames.nothing); } public static boolean isAnyOrNullableAny(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.any); + return isConstructedFromGivenClass(type, FqNames.any); } public static boolean isNullableAny(@NotNull KotlinType type) { @@ -1033,11 +883,11 @@ public abstract class KotlinBuiltIns { } public static boolean isUnit(@NotNull KotlinType type) { - return isNotNullConstructedFromGivenClass(type, FQ_NAMES.unit); + return isNotNullConstructedFromGivenClass(type, FqNames.unit); } public static boolean isUnitOrNullableUnit(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.unit); + return isConstructedFromGivenClass(type, FqNames.unit); } public boolean isBooleanOrSubtype(@NotNull KotlinType type) { @@ -1049,78 +899,78 @@ public abstract class KotlinBuiltIns { } public static boolean isEnum(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES._enum); + return classFqNameEquals(descriptor, FqNames._enum); } public static boolean isEnum(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES._enum); + return isConstructedFromGivenClassAndNotNullable(type, FqNames._enum); } public static boolean isComparable(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.comparable.toUnsafe()); + return classFqNameEquals(descriptor, FqNames.comparable.toUnsafe()); } public static boolean isComparable(@NotNull KotlinType type) { - return isConstructedFromGivenClassAndNotNullable(type, FQ_NAMES.comparable.toUnsafe()); + return isConstructedFromGivenClassAndNotNullable(type, FqNames.comparable.toUnsafe()); } public static boolean isCharSequence(@Nullable KotlinType type) { - return type != null && isNotNullConstructedFromGivenClass(type, FQ_NAMES.charSequence); + return type != null && isNotNullConstructedFromGivenClass(type, FqNames.charSequence); } public static boolean isString(@Nullable KotlinType type) { - return type != null && isNotNullConstructedFromGivenClass(type, FQ_NAMES.string); + return type != null && isNotNullConstructedFromGivenClass(type, FqNames.string); } public static boolean isCharSequenceOrNullableCharSequence(@Nullable KotlinType type) { - return type != null && isConstructedFromGivenClass(type, FQ_NAMES.charSequence); + return type != null && isConstructedFromGivenClass(type, FqNames.charSequence); } public static boolean isStringOrNullableString(@Nullable KotlinType type) { - return type != null && isConstructedFromGivenClass(type, FQ_NAMES.string); + return type != null && isConstructedFromGivenClass(type, FqNames.string); } public static boolean isCollectionOrNullableCollection(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.collection); + return isConstructedFromGivenClass(type, FqNames.collection); } public static boolean isListOrNullableList(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.list); + return isConstructedFromGivenClass(type, FqNames.list); } public static boolean isSetOrNullableSet(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.set); + return isConstructedFromGivenClass(type, FqNames.set); } public static boolean isMapOrNullableMap(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.map); + return isConstructedFromGivenClass(type, FqNames.map); } public static boolean isIterableOrNullableIterable(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.iterable); + return isConstructedFromGivenClass(type, FqNames.iterable); } public static boolean isThrowableOrNullableThrowable(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.throwable); + return isConstructedFromGivenClass(type, FqNames.throwable); } public static boolean isKClass(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.kClass); + return classFqNameEquals(descriptor, FqNames.kClass); } public static boolean isNonPrimitiveArray(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.array); + return classFqNameEquals(descriptor, FqNames.array); } public static boolean isCloneable(@NotNull ClassDescriptor descriptor) { - return classFqNameEquals(descriptor, FQ_NAMES.cloneable); + return classFqNameEquals(descriptor, FqNames.cloneable); } // This function only checks presence of Deprecated annotation at declaration-site, it doesn't take into account @DeprecatedSinceKotlin // To check that a referenced descriptor is actually deprecated at call-site, use DeprecationResolver public static boolean isDeprecated(@NotNull DeclarationDescriptor declarationDescriptor) { - if (declarationDescriptor.getOriginal().getAnnotations().hasAnnotation(FQ_NAMES.deprecated)) return true; + if (declarationDescriptor.getOriginal().getAnnotations().hasAnnotation(FqNames.deprecated)) return true; if (declarationDescriptor instanceof PropertyDescriptor) { boolean isVar = ((PropertyDescriptor) declarationDescriptor).isVar(); @@ -1133,7 +983,7 @@ public abstract class KotlinBuiltIns { } public static boolean isNotNullOrNullableFunctionSupertype(@NotNull KotlinType type) { - return isConstructedFromGivenClass(type, FQ_NAMES.functionSupertype); + return isConstructedFromGivenClass(type, FqNames.functionSupertype); } public static FqName getPrimitiveFqName(@NotNull PrimitiveType primitiveType) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index 4f1d8ef10b2..c487488d659 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -5,27 +5,23 @@ 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.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.* import kotlin.reflect.KProperty -val KOTLIN_REFLECT_FQ_NAME = FqName("kotlin.reflect") -val K_PROPERTY_PREFIX = "KProperty" -val K_MUTABLE_PROPERTY_PREFIX = "KMutableProperty" -val K_FUNCTION_PREFIX = "KFunction" -val K_SUSPEND_FUNCTION_PREFIX = "KSuspendFunction" - -val PREFIXES = listOf(K_PROPERTY_PREFIX, K_MUTABLE_PROPERTY_PREFIX, K_FUNCTION_PREFIX, K_SUSPEND_FUNCTION_PREFIX) - class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: NotFoundClasses) { private val kotlinReflectScope: MemberScope by lazy(LazyThreadSafetyMode.PUBLICATION) { module.getPackage(KOTLIN_REFLECT_FQ_NAME).memberScope @@ -116,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, KotlinBuiltIns.FQ_NAMES.kCallable) + hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kCallable) fun hasKMutablePropertyTypeFqName(type: KotlinType): Boolean = - hasFqName(type.constructor, KotlinBuiltIns.FQ_NAMES.kMutablePropertyFqName) + hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kMutablePropertyFqName) fun isNumberedKMutablePropertyType(type: KotlinType): Boolean { val descriptor = type.constructor.declarationDescriptor as? ClassDescriptor ?: return false - return hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kMutableProperty0) || - hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kMutableProperty1) || - hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kMutableProperty2) + return hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty0) || + hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty1) || + hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kMutableProperty2) } fun isNumberedTypeWithOneOrMoreNumber(type: KotlinType): Boolean { @@ -146,13 +142,13 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not } fun hasKPropertyTypeFqName(type: KotlinType): Boolean = - hasFqName(type.constructor, KotlinBuiltIns.FQ_NAMES.kPropertyFqName) + hasFqName(type.constructor, KotlinBuiltInsNames.FqNames.kPropertyFqName) fun isNumberedKPropertyType(type: KotlinType): Boolean { val descriptor = type.constructor.declarationDescriptor as? ClassDescriptor ?: return false - return hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kProperty0) || - hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kProperty1) || - hasFqName(descriptor, KotlinBuiltIns.FQ_NAMES.kProperty2) + return hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty0) || + hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty1) || + hasFqName(descriptor, KotlinBuiltInsNames.FqNames.kProperty2) } fun isNumberedKFunctionOrKSuspendFunction(type: KotlinType): Boolean { @@ -184,7 +180,7 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not } fun createKPropertyStarType(module: ModuleDescriptor): KotlinType? { - val kPropertyClass = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.kProperty) ?: return null + val kPropertyClass = module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.kProperty) ?: return null return KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, kPropertyClass, listOf(StarProjectionImpl(kPropertyClass.typeConstructor.parameters.single()))) } @@ -207,7 +203,7 @@ class ReflectionTypes(module: ModuleDescriptor, private val notFoundClasses: Not || shortName == "KCallable" || shortName == "KAnnotatedElement" } - if (packageName == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME || packageName == COROUTINES_PACKAGE_FQ_NAME_RELEASE) { + if (packageName == BUILT_INS_PACKAGE_FQ_NAME || packageName == COROUTINES_PACKAGE_FQ_NAME_RELEASE) { return shortName.startsWith("Function") // FunctionN, Function || shortName.startsWith("SuspendFunction") } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/UnsignedType.kt index d25c932f4f4..568e88471ad 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 == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME && + container.fqName == KotlinBuiltInsNames.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 ddd0c03cae8..65cd74ccd25 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.builtins +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME import org.jetbrains.kotlin.builtins.functions.BuiltInFictitiousFunctionClassFactory import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -86,7 +87,7 @@ val DeclarationDescriptor.isBuiltinFunctionalClassDescriptor: Boolean } fun isBuiltinFunctionClass(classId: ClassId): Boolean { - if (!classId.startsWith(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME)) return false + if (!classId.startsWith(KotlinBuiltInsNames.BUILT_INS_PACKAGE_NAME)) return false val kind = classId.asSingleFqName().toUnsafe().getFunctionalClassKind() return kind == FunctionClassDescriptor.Kind.Function || @@ -103,14 +104,14 @@ val KotlinType.isBuiltinExtensionFunctionalType: Boolean get() = isBuiltinFunctionalType && isTypeAnnotatedWithExtensionFunctionType private val KotlinType.isTypeAnnotatedWithExtensionFunctionType: Boolean - get() = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.extensionFunctionType) != null + get() = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) != null /** * @return true if this is an FQ name of a fictitious class representing the function type, * e.g. kotlin.Function1 (but NOT kotlin.reflect.KFunction1) */ fun isNumberedFunctionClassFqName(fqName: FqNameUnsafe): Boolean { - return fqName.startsWith(KotlinBuiltIns.BUILT_INS_PACKAGE_NAME) && + return fqName.startsWith(BUILT_INS_PACKAGE_NAME) && fqName.getFunctionalClassKind() == FunctionClassDescriptor.Kind.Function } @@ -173,7 +174,7 @@ fun KotlinType.getPureArgumentsForFunctionalTypeOrSubtype(): List { } fun KotlinType.extractParameterNameFromFunctionTypeArgument(): Name? { - val annotation = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.parameterName) ?: return null + val annotation = annotations.findAnnotation(KotlinBuiltInsNames.FqNames.parameterName) ?: return null val name = (annotation.allValueArguments.values.singleOrNull() as? StringValue) ?.value ?.takeIf { Name.isValidIdentifier(it) } @@ -196,9 +197,9 @@ fun getFunctionTypeArgumentProjections( val name = parameterNames?.get(index)?.takeUnless { it.isSpecial } val typeToUse = if (name != null) { val parameterNameAnnotation = BuiltInAnnotationDescriptor( - builtIns, - KotlinBuiltIns.FQ_NAMES.parameterName, - mapOf(Name.identifier("name") to StringValue(name.asString())) + builtIns, + KotlinBuiltInsNames.FqNames.parameterName, + mapOf(Name.identifier("name") to StringValue(name.asString())) ) type.replaceAnnotations(Annotations.create(type.annotations + parameterNameAnnotation)) } @@ -233,16 +234,16 @@ fun createFunctionType( return KotlinTypeFactory.simpleNotNullType(typeAnnotations, classDescriptor, arguments) } -fun Annotations.hasExtensionFunctionAnnotation() = hasAnnotation(KotlinBuiltIns.FQ_NAMES.extensionFunctionType) +fun Annotations.hasExtensionFunctionAnnotation() = hasAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType) fun Annotations.withoutExtensionFunctionAnnotation() = - FilteredAnnotations(this, true) { it != KotlinBuiltIns.FQ_NAMES.extensionFunctionType } + FilteredAnnotations(this, true) { it != KotlinBuiltInsNames.FqNames.extensionFunctionType } fun Annotations.withExtensionFunctionAnnotation(builtIns: KotlinBuiltIns) = - if (hasAnnotation(KotlinBuiltIns.FQ_NAMES.extensionFunctionType)) { + if (hasAnnotation(KotlinBuiltInsNames.FqNames.extensionFunctionType)) { this } else { - Annotations.create(this + BuiltInAnnotationDescriptor(builtIns, KotlinBuiltIns.FQ_NAMES.extensionFunctionType, emptyMap())) + Annotations.create(this + BuiltInAnnotationDescriptor(builtIns, KotlinBuiltInsNames.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 3ab74eca96d..37f0c8e2d63 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt @@ -5,8 +5,9 @@ package org.jetbrains.kotlin.builtins.functions -import org.jetbrains.kotlin.builtins.KOTLIN_REFLECT_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME +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.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.AbstractClassDescriptor @@ -14,7 +15,6 @@ import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.types.* 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 d45c57fbdb4..891140fa872 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInterfaceFactory.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.builtins.functions import org.jetbrains.kotlin.builtins.FunctionInterfacePackageFragment -import org.jetbrains.kotlin.builtins.KOTLIN_REFLECT_FQ_NAME -import org.jetbrains.kotlin.builtins.KotlinBuiltIns +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.descriptors.* import org.jetbrains.kotlin.descriptors.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl @@ -15,7 +16,6 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.storage.StorageManager @@ -78,7 +78,7 @@ fun functionInterfacePackageFragmentProvider( val classFactory = BuiltInFictitiousFunctionClassFactory(storageManager, module) val fragments = listOf( KOTLIN_REFLECT_FQ_NAME, - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, + BUILT_INS_PACKAGE_FQ_NAME, COROUTINES_PACKAGE_FQ_NAME_RELEASE ).map { fqName -> FunctionInterfacePackageFragmentImpl(classFactory, module, fqName) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt index 065783d858e..fe75879d644 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt @@ -5,6 +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.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.SourceElement @@ -15,7 +19,6 @@ import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.typeUtil.asTypeProjection @@ -23,9 +26,9 @@ import org.jetbrains.kotlin.types.typeUtil.builtIns private val FAKE_CONTINUATION_CLASS_DESCRIPTOR_EXPERIMENTAL = MutableClassDescriptor( - EmptyPackageFragmentDescriptor(ErrorUtils.getErrorModule(), DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL), + EmptyPackageFragmentDescriptor(ErrorUtils.getErrorModule(), COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL), ClassKind.INTERFACE, /* isInner = */ false, /* isExternal = */ false, - DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS + CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS ).apply { modality = Modality.ABSTRACT visibility = Visibilities.PUBLIC @@ -39,9 +42,9 @@ private val FAKE_CONTINUATION_CLASS_DESCRIPTOR_EXPERIMENTAL = private val FAKE_CONTINUATION_CLASS_DESCRIPTOR_RELEASE = MutableClassDescriptor( - EmptyPackageFragmentDescriptor(ErrorUtils.getErrorModule(), DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE), + EmptyPackageFragmentDescriptor(ErrorUtils.getErrorModule(), COROUTINES_PACKAGE_FQ_NAME_RELEASE), ClassKind.INTERFACE, /* isInner = */ false, /* isExternal = */ false, - DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS + CONTINUATION_INTERFACE_FQ_NAME_RELEASE.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS ).apply { modality = Modality.ABSTRACT visibility = Visibilities.PUBLIC @@ -79,6 +82,6 @@ fun transformSuspendFunctionToRuntimeFunctionType(suspendFunType: KotlinType, is } fun isContinuation(name: FqName?, isReleaseCoroutines: Boolean): Boolean { - return if (isReleaseCoroutines) name == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE - else name == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL + return if (isReleaseCoroutines) name == CONTINUATION_INTERFACE_FQ_NAME_RELEASE + else name == CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL } 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 4f9d672876b..d56cbb08136 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.descriptors.annotations import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.AnnotationValue @@ -31,9 +32,9 @@ fun KotlinBuiltIns.createDeprecatedAnnotation( level: String = "WARNING" ): AnnotationDescriptor { val replaceWithAnnotation = BuiltInAnnotationDescriptor( - this, - KotlinBuiltIns.FQ_NAMES.replaceWith, - mapOf( + this, + KotlinBuiltInsNames.FqNames.replaceWith, + mapOf( REPLACE_WITH_EXPRESSION_NAME to StringValue(replaceWith), REPLACE_WITH_IMPORTS_NAME to ArrayValue(emptyList()) { module -> module.builtIns.getArrayType(Variance.INVARIANT, stringType) @@ -42,14 +43,14 @@ fun KotlinBuiltIns.createDeprecatedAnnotation( ) return BuiltInAnnotationDescriptor( - this, - KotlinBuiltIns.FQ_NAMES.deprecated, - mapOf( + this, + KotlinBuiltInsNames.FqNames.deprecated, + mapOf( DEPRECATED_MESSAGE_NAME to StringValue(message), DEPRECATED_REPLACE_WITH_NAME to AnnotationValue(replaceWithAnnotation), DEPRECATED_LEVEL_NAME to EnumValue( - ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.deprecationLevel), - Name.identifier(level) + ClassId.topLevel(KotlinBuiltInsNames.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 fecaac2fff4..14c449a165c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt @@ -5,10 +5,11 @@ 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.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinTypeFactory @@ -28,9 +29,9 @@ fun ModuleDescriptor.resolveClassByFqName(fqName: FqName, lookupLocation: Lookup fun ModuleDescriptor.findContinuationClassDescriptorOrNull(lookupLocation: LookupLocation, releaseCoroutines: Boolean) = if (releaseCoroutines) - resolveClassByFqName(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE, lookupLocation) + resolveClassByFqName(CONTINUATION_INTERFACE_FQ_NAME_RELEASE, lookupLocation) else - resolveClassByFqName(DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL, lookupLocation) + resolveClassByFqName(CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL, lookupLocation) fun ModuleDescriptor.findContinuationClassDescriptor(lookupLocation: LookupLocation, releaseCoroutines: Boolean) = findContinuationClassDescriptorOrNull(lookupLocation, releaseCoroutines).sure { "Continuation interface is not found" } @@ -52,4 +53,4 @@ fun DeclarationDescriptor.isTopLevelInPackage(name: String, packageName: String) val containingDeclaration = containingDeclaration as? PackageFragmentDescriptor ?: return false val packageFqName = containingDeclaration.fqName.asString() return packageName == packageFqName -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 876678571e9..5029ef41ac1 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(KotlinBuiltIns.FQ_NAMES.extensionFunctionType) + excludedTypeAnnotationClasses += listOf(KotlinBuiltInsNames.FqNames.extensionFunctionType) annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.ALWAYS_PARENTHESIZED } as DescriptorRendererImpl } @@ -424,7 +424,7 @@ internal class DescriptorRendererImpl( } private fun AnnotationDescriptor.isParameterName(): Boolean { - return fqName == KotlinBuiltIns.FQ_NAMES.parameterName + return fqName == KotlinBuiltInsNames.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 cf6ed4194b7..16d304aac08 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -28,6 +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.resolve.DescriptorUtils.getDefaultConstructorVisibility; import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; @@ -134,7 +136,7 @@ public class DescriptorFactory { @NotNull public static SimpleFunctionDescriptor createEnumValuesMethod(@NotNull ClassDescriptor enumClass) { SimpleFunctionDescriptorImpl values = - SimpleFunctionDescriptorImpl.create(enumClass, Annotations.Companion.getEMPTY(), DescriptorUtils.ENUM_VALUES, + SimpleFunctionDescriptorImpl.create(enumClass, Annotations.Companion.getEMPTY(), ENUM_VALUES, CallableMemberDescriptor.Kind.SYNTHESIZED, enumClass.getSource()); return values.initialize(null, null, Collections.emptyList(), Collections.emptyList(), @@ -145,7 +147,7 @@ public class DescriptorFactory { @NotNull public static SimpleFunctionDescriptor createEnumValueOfMethod(@NotNull ClassDescriptor enumClass) { SimpleFunctionDescriptorImpl valueOf = - SimpleFunctionDescriptorImpl.create(enumClass, Annotations.Companion.getEMPTY(), DescriptorUtils.ENUM_VALUE_OF, + SimpleFunctionDescriptorImpl.create(enumClass, Annotations.Companion.getEMPTY(), ENUM_VALUE_OF, CallableMemberDescriptor.Kind.SYNTHESIZED, enumClass.getSource()); ValueParameterDescriptor parameterDescriptor = new ValueParameterDescriptorImpl( valueOf, null, 0, Annotations.Companion.getEMPTY(), Name.identifier("value"), getBuiltIns(enumClass).getStringType(), @@ -161,11 +163,11 @@ public class DescriptorFactory { } public static boolean isEnumValuesMethod(@NotNull FunctionDescriptor descriptor) { - return descriptor.getName().equals(DescriptorUtils.ENUM_VALUES) && isEnumSpecialMethod(descriptor); + return descriptor.getName().equals(ENUM_VALUES) && isEnumSpecialMethod(descriptor); } public static boolean isEnumValueOfMethod(@NotNull FunctionDescriptor descriptor) { - return descriptor.getName().equals(DescriptorUtils.ENUM_VALUE_OF) && isEnumSpecialMethod(descriptor); + return descriptor.getName().equals(ENUM_VALUE_OF) && isEnumSpecialMethod(descriptor); } private static boolean isEnumSpecialMethod(@NotNull FunctionDescriptor descriptor) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index 65323929482..c403a6dad02 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -34,19 +34,6 @@ import static org.jetbrains.kotlin.descriptors.Modality.ABSTRACT; import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class DescriptorUtils { - public static final Name ENUM_VALUES = Name.identifier("values"); - public static final Name ENUM_VALUE_OF = Name.identifier("valueOf"); - public static final FqName COROUTINES_PACKAGE_FQ_NAME_RELEASE = new FqName("kotlin.coroutines"); - public static final FqName COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL = - COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("experimental")); - public static final FqName COROUTINES_INTRINSICS_PACKAGE_FQ_NAME_EXPERIMENTAL = - COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("intrinsics")); - public static final FqName CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL = - COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL.child(Name.identifier("Continuation")); - public static final FqName CONTINUATION_INTERFACE_FQ_NAME_RELEASE = - COROUTINES_PACKAGE_FQ_NAME_RELEASE.child(Name.identifier("Continuation")); - public static final FqName RESULT_FQ_NAME = new FqName("kotlin.Result"); - // This JVM-specific class FQ name is declared here only because it's used in MainFunctionDetector which is in frontend public static final FqName JVM_NAME = new FqName("kotlin.jvm.JvmName"); diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 3b403653cc3..8a7f71d72c7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -6,6 +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.descriptors.* import org.jetbrains.kotlin.descriptors.ClassKind.* import org.jetbrains.kotlin.descriptors.annotations.Annotated @@ -200,14 +202,14 @@ fun ValueParameterDescriptor.declaresOrInheritsDefaultValue(): Boolean { } fun Annotated.isRepeatableAnnotation(): Boolean = - annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.repeatable) != null + annotations.findAnnotation(KotlinBuiltInsNames.FqNames.repeatable) != null fun Annotated.isDocumentedAnnotation(): Boolean = - annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.mustBeDocumented) != null + annotations.findAnnotation(KotlinBuiltInsNames.FqNames.mustBeDocumented) != null fun Annotated.getAnnotationRetention(): KotlinRetention? { val retentionArgumentValue = - annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.retention)?.allValueArguments?.get(RETENTION_PARAMETER_NAME) + annotations.findAnnotation(KotlinBuiltInsNames.FqNames.retention)?.allValueArguments?.get(RETENTION_PARAMETER_NAME) as? EnumValue ?: return null val retentionArgumentValueName = retentionArgumentValue.enumEntryName.asString() @@ -344,7 +346,7 @@ private fun ClassDescriptor.getAllSuperClassesTypesIncludeItself(): List { val isError: Boolean @@ -98,7 +102,7 @@ fun createIntegerValueTypeConstant( } fun hasUnsignedTypesInModuleDependencies(module: ModuleDescriptor): Boolean { - return module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uInt) != null + return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uInt) != null } class UnsignedErrorValueTypeConstant( diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.kt index 17ac74326df..1a89ec4dc47 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.resolve.constants import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.types.KotlinType @@ -65,10 +66,10 @@ class IntegerValueTypeConstructor( } private fun addUnsignedSuperTypes() { - checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltIns.FQ_NAMES.uInt)) - checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltIns.FQ_NAMES.uByte)) - checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltIns.FQ_NAMES.uShort)) - supertypes.add(module.unsignedType(KotlinBuiltIns.FQ_NAMES.uLong)) + checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltInsNames.FqNames.uInt)) + checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltInsNames.FqNames.uByte)) + checkBoundsAndAddSuperType(value, module.unsignedType(KotlinBuiltInsNames.FqNames.uShort)) + supertypes.add(module.unsignedType(KotlinBuiltInsNames.FqNames.uLong)) } private fun checkBoundsAndAddSuperType(value: Long, kotlinType: KotlinType) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/PrimitiveTypeUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/PrimitiveTypeUtil.kt index 458d8f3b384..066d1c02c4d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/PrimitiveTypeUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/PrimitiveTypeUtil.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.resolve.constants import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies @@ -41,16 +42,16 @@ internal fun KotlinType.maxValue(): Long { internal fun ModuleDescriptor.unsignedType(classId: ClassId): SimpleType = findClassAcrossModuleDependencies(classId)!!.defaultType internal val ModuleDescriptor.uIntType: SimpleType - get() = unsignedType(KotlinBuiltIns.FQ_NAMES.uInt) + get() = unsignedType(KotlinBuiltInsNames.FqNames.uInt) internal val ModuleDescriptor.uLongType: SimpleType - get() = unsignedType(KotlinBuiltIns.FQ_NAMES.uLong) + get() = unsignedType(KotlinBuiltInsNames.FqNames.uLong) internal val ModuleDescriptor.uByteType: SimpleType - get() = unsignedType(KotlinBuiltIns.FQ_NAMES.uByte) + get() = unsignedType(KotlinBuiltInsNames.FqNames.uByte) internal val ModuleDescriptor.uShortType: SimpleType - get() = unsignedType(KotlinBuiltIns.FQ_NAMES.uShort) + get() = unsignedType(KotlinBuiltInsNames.FqNames.uShort) internal val ModuleDescriptor.allSignedLiteralTypes: Collection get() = listOf(builtIns.intType, builtIns.longType, builtIns.byteType, builtIns.shortType) @@ -58,8 +59,8 @@ internal val ModuleDescriptor.allSignedLiteralTypes: Collection internal val ModuleDescriptor.allUnsignedLiteralTypes: Collection get() = if (hasUnsignedTypesInModuleDependencies(this)) { listOf( - unsignedType(KotlinBuiltIns.FQ_NAMES.uInt), unsignedType(KotlinBuiltIns.FQ_NAMES.uLong), - unsignedType(KotlinBuiltIns.FQ_NAMES.uByte), unsignedType(KotlinBuiltIns.FQ_NAMES.uShort) + unsignedType(KotlinBuiltInsNames.FqNames.uInt), unsignedType(KotlinBuiltInsNames.FqNames.uLong), + unsignedType(KotlinBuiltInsNames.FqNames.uByte), unsignedType(KotlinBuiltInsNames.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 752939bea95..ac78360e0a2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.resolve.constants import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor @@ -218,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(KotlinBuiltIns.FQ_NAMES.any.toSafe()), 0) + KClassValue(ClassId.topLevel(KotlinBuiltInsNames.FqNames.any.toSafe()), 0) } else -> null } @@ -258,7 +259,7 @@ class StringValue(value: String) : ConstantValue(value) { class UByteValue(byteValue: Byte) : UnsignedValueConstant(byteValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uByte)?.defaultType + return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uByte)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UByte not found") } @@ -271,7 +272,7 @@ class UByteValue(byteValue: Byte) : UnsignedValueConstant(byteValue) { class UShortValue(shortValue: Short) : UnsignedValueConstant(shortValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uShort)?.defaultType + return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uShort)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UShort not found") } @@ -284,7 +285,7 @@ class UShortValue(shortValue: Short) : UnsignedValueConstant(shortValue) class UIntValue(intValue: Int) : UnsignedValueConstant(intValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uInt)?.defaultType + return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.FqNames.uInt)?.defaultType ?: ErrorUtils.createErrorType("Unsigned type UInt not found") } @@ -297,7 +298,7 @@ class UIntValue(intValue: Int) : UnsignedValueConstant(intValue) { class ULongValue(longValue: Long) : UnsignedValueConstant(longValue) { override fun getType(module: ModuleDescriptor): KotlinType { - return module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.uLong)?.defaultType + return module.findClassAcrossModuleDependencies(KotlinBuiltInsNames.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 b2c9a80996b..1d4343749bb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -20,6 +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.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.annotations.CompositeAnnotations; @@ -251,7 +252,7 @@ public class TypeSubstitutor implements TypeSubstitutorMarker { @Nullable TypeParameterDescriptor typeParameter, @NotNull TypeProjection originalProjection ) { - if (!originalType.getAnnotations().hasAnnotation(KotlinBuiltIns.FQ_NAMES.unsafeVariance)) return substituted; + if (!originalType.getAnnotations().hasAnnotation(KotlinBuiltInsNames.FqNames.unsafeVariance)) return substituted; TypeConstructor constructor = substituted.getType().getConstructor(); if (!(constructor instanceof NewCapturedTypeConstructor)) return substituted; @@ -277,11 +278,11 @@ public class TypeSubstitutor implements TypeSubstitutorMarker { @NotNull private static Annotations filterOutUnsafeVariance(@NotNull Annotations annotations) { - if (!annotations.hasAnnotation(KotlinBuiltIns.FQ_NAMES.unsafeVariance)) return annotations; + if (!annotations.hasAnnotation(KotlinBuiltInsNames.FqNames.unsafeVariance)) return annotations; return new FilteredAnnotations(annotations, new Function1() { @Override public Boolean invoke(@NotNull FqName name) { - return !name.equals(KotlinBuiltIns.FQ_NAMES.unsafeVariance); + return !name.equals(KotlinBuiltInsNames.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 174d1e06723..e6a17caaadc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -10,6 +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.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; @@ -499,10 +500,10 @@ public class TypeUtils { return longType; } - KotlinType uIntType = findByFqName(supertypes, KotlinBuiltIns.FQ_NAMES.uIntFqName); + KotlinType uIntType = findByFqName(supertypes, KotlinBuiltInsNames.FqNames.uIntFqName); if (uIntType != null) return uIntType; - KotlinType uLongType = findByFqName(supertypes, KotlinBuiltIns.FQ_NAMES.uLongFqName); + KotlinType uLongType = findByFqName(supertypes, KotlinBuiltInsNames.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 9872f3b81ad..57a401b5285 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.isBuiltinFunctionalTypeOrSubtype import org.jetbrains.kotlin.descriptors.* @@ -248,12 +248,12 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy override fun TypeConstructorMarker.isAnyConstructor(): Boolean { require(this is TypeConstructor, this::errorMessage) - return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FQ_NAMES.any) + return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FqNames.any) } override fun TypeConstructorMarker.isNothingConstructor(): Boolean { require(this is TypeConstructor, this::errorMessage) - return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FQ_NAMES.nothing) + return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FqNames.nothing) } override fun KotlinTypeMarker.asTypeArgument(): TypeArgumentMarker { @@ -263,7 +263,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy override fun TypeConstructorMarker.isUnitTypeConstructor(): Boolean { require(this is TypeConstructor, this::errorMessage) - return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FQ_NAMES.unit) + return KotlinBuiltIns.isTypeConstructorForGivenClass(this, FqNames.unit) } /** @@ -441,7 +441,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy require(constructor is TypeConstructor, constructor::errorMessage) val annotations = if (isExtensionFunction) { - Annotations.create(listOf(BuiltInAnnotationDescriptor(builtIns, FQ_NAMES.extensionFunctionType, emptyMap()))) + Annotations.create(listOf(BuiltInAnnotationDescriptor(builtIns, FqNames.extensionFunctionType, emptyMap()))) } else Annotations.EMPTY @Suppress("UNCHECKED_CAST") @@ -467,7 +467,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy override fun SimpleTypeMarker.isExtensionFunction(): Boolean { require(this is SimpleType, this::errorMessage) - return this.hasAnnotation(FQ_NAMES.extensionFunctionType) + return this.hasAnnotation(FqNames.extensionFunctionType) } override fun SimpleTypeMarker.replaceArguments(newArguments: List): SimpleTypeMarker { 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 c003fbe0cac..de284b45285 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.cloneable.toSafe()) + ClassId.topLevel(KotlinBuiltInsNames.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 4f03076e87e..17444622cdb 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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, - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES, + KotlinBuiltInsNames.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 141d2f78e09..47d19e28bab 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName) + return ClassId(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME, it.arrayTypeName) } - return ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.array.toSafe()) + return ClassId.topLevel(KotlinBuiltInsNames.FqNames.array.toSafe()) } if (klass == Void.TYPE) return JAVA_LANG_VOID klass.primitiveType?.let { - return ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, it.typeName) + return ClassId(KotlinBuiltInsNames.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 df8f427b1d7..eb87364e8f7 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 = KotlinBuiltIns.FQ_NAMES.suppress.shortName().identifier + private val SUPPRESS_ANNOTATION_SHORT_NAME = KotlinBuiltInsNames.FqNames.suppress.shortName().identifier } } @@ -528,4 +528,4 @@ fun IdeaModuleInfo.supportsAdditionalBuiltInsMembers(project: Project): Boolean .supportsFeature(LanguageFeature.AdditionalBuiltInsMembers) } -val IdeaModuleInfo.sdk: Sdk? get() = dependencies().firstIsInstanceOrNull()?.sdk \ No newline at end of file +val IdeaModuleInfo.sdk: Sdk? get() = dependencies().firstIsInstanceOrNull()?.sdk 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 2ab4b72d4f7..c96f793e19e 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 { KotlinBuiltIns.FQ_NAMES.any == it.asSingleFqName().toUnsafe() } == true) { + if (supertypeIds.singleOrNull()?.let { KotlinBuiltInsNames.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 f130c5ff350..e9e62288e58 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.isBuiltinFunctionClass import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.lexer.KtTokens @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.psi.stubs.impl.* -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getName @@ -33,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(KotlinBuiltIns.FQ_NAMES.parameterName) +private val ANNOTATIONS_NOT_LOADED_FOR_TYPES = setOf(KotlinBuiltInsNames.FqNames.parameterName) class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { fun createTypeReferenceStub( @@ -96,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() == KotlinBuiltIns.FQ_NAMES.extensionFunctionType + it.classId.asSingleFqName() == KotlinBuiltInsNames.FqNames.extensionFunctionType } val isExtension = extensionAnnotations.isNotEmpty() @@ -195,8 +194,8 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { val classId = c.nameResolver.getClassId(parameterType.className) val fqName = classId.asSingleFqName() assert( - fqName == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL - || fqName == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE + fqName == KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL + || fqName == KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE ) { "Last parameter type of suspend function must be Continuation, but it is $fqName" } @@ -338,7 +337,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { private fun Type.isDefaultUpperBound(): Boolean { return this.hasClassName() && - c.nameResolver.getClassId(className).let { KotlinBuiltIns.FQ_NAMES.any == it.asSingleFqName().toUnsafe() } && + c.nameResolver.getClassId(className).let { KotlinBuiltInsNames.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 d1ad7d6c849..c2a81917f6c 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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) KotlinBuiltIns.FQ_NAMES.any + val fqName = if (substituteWithAny) KotlinBuiltInsNames.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 48f1955ffb2..91960639b32 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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( - KotlinBuiltIns.FQ_NAMES.suppress, + KotlinBuiltInsNames.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 ""}${KotlinBuiltIns.FQ_NAMES.suppress.shortName()}($id)" + "${if (withAt) "@" else ""}${KotlinBuiltInsNames.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 == KotlinBuiltIns.FQ_NAMES.suppress + context.get(BindingContext.ANNOTATION, entry)?.fqName == KotlinBuiltInsNames.FqNames.suppress } } } 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 58851d75f53..84b1e123e61 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,6 +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.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject @@ -74,7 +75,7 @@ fun isDeprecatedAtCallSite(descriptor: DeclarationDescriptor, languageVersionSet if (!isDeprecatedAtDeclarationSite) return false return computeLevelForDeprecatedSinceKotlin( - descriptor.original.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin) ?: return true, + descriptor.original.annotations.findAnnotation(KotlinBuiltInsNames.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 5224c6b9a27..338cfc30288 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.unit.asString(), scope) + JavaPsiFacade.getInstance(project).findClass(KotlinBuiltInsNames.FqNames.unit.asString(), scope) } } -} \ No newline at end of file +} 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 58fcc33aae8..f1628c529d9 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,6 +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.name.ClassId val KtType.isUnit: Boolean get() = isClassTypeWithClassId(DefaultTypeClassIds.UNIT) @@ -16,5 +17,5 @@ fun KtType.isClassTypeWithClassId(classId: ClassId): Boolean { } private object DefaultTypeClassIds { - val UNIT = ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.unit.toSafe()) -} \ No newline at end of file + val UNIT = ClassId.topLevel(KotlinBuiltInsNames.FqNames.unit.toSafe()) +} 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 1acf06df330..927abc62c6d 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) + return IDEVirtualFileFinder(scope).hasMetadataPackage(KotlinBuiltInsNames.BUILT_INS_PACKAGE_FQ_NAME) } class LibraryKindSearchScope( diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt index c00fb5e9334..459390ef4a5 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.externalDescriptors -import org.jetbrains.kotlin.resolve.ResolutionAnchorProvider import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.Variance @@ -217,4 +216,4 @@ internal class DebugLabelPropertyDescriptor( /*isActual = */false, /*isExternal = */false, /*isDelegated = */false -) \ No newline at end of file +) 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 bbf70401214..d35e611a817 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,22 +7,22 @@ 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.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames object KotlinSequenceTypes : Types { - override val ANY: GenericType = ClassTypeImpl(FQ_NAMES.any.asString(), "kotlin.Any()") + override val ANY: GenericType = ClassTypeImpl(FqNames.any.asString(), "kotlin.Any()") - override val BOOLEAN: GenericType = ClassTypeImpl(FQ_NAMES._boolean.asString(), "false") - val BYTE: GenericType = ClassTypeImpl(FQ_NAMES._byte.asString(), "0") - val SHORT: GenericType = ClassTypeImpl(FQ_NAMES._short.asString(), "0") - val CHAR: GenericType = ClassTypeImpl(FQ_NAMES._char.asString(), "0.toChar()") - override val INT: GenericType = ClassTypeImpl(FQ_NAMES._int.asString(), "0") - override val LONG: GenericType = ClassTypeImpl(FQ_NAMES._long.asString(), "0L") - val FLOAT: GenericType = ClassTypeImpl(FQ_NAMES._float.asString(), "0.0f") - override val DOUBLE: GenericType = ClassTypeImpl(FQ_NAMES._double.asString(), "0.0") - override val STRING: GenericType = ClassTypeImpl(FQ_NAMES.string.asString(), "\"\"") - override val EXCEPTION: GenericType = ClassTypeImpl(FQ_NAMES.throwable.asString(), "kotlin.Throwable()") - override val VOID: GenericType = ClassTypeImpl(FQ_NAMES.unit.asString(), "Unit") + override val BOOLEAN: GenericType = ClassTypeImpl(FqNames._boolean.asString(), "false") + val BYTE: GenericType = ClassTypeImpl(FqNames._byte.asString(), "0") + val SHORT: GenericType = ClassTypeImpl(FqNames._short.asString(), "0") + val CHAR: GenericType = ClassTypeImpl(FqNames._char.asString(), "0.toChar()") + override val INT: GenericType = ClassTypeImpl(FqNames._int.asString(), "0") + override val LONG: GenericType = ClassTypeImpl(FqNames._long.asString(), "0L") + val FLOAT: GenericType = ClassTypeImpl(FqNames._float.asString(), "0.0f") + override val DOUBLE: GenericType = ClassTypeImpl(FqNames._double.asString(), "0.0") + override val STRING: GenericType = ClassTypeImpl(FqNames.string.asString(), "\"\"") + override val EXCEPTION: GenericType = ClassTypeImpl(FqNames.throwable.asString(), "kotlin.Throwable()") + override val VOID: GenericType = ClassTypeImpl(FqNames.unit.asString(), "Unit") val NULLABLE_ANY: GenericType = nullable { 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 01c5111edfb..21a3371db46 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -119,10 +119,10 @@ class JavaContextDeclarationRenderer { private fun StringBuilder.renderFqName(fqName: FqNameUnsafe) { val stringFqName = when (fqName) { - KotlinBuiltIns.FQ_NAMES.unit -> "void" + KotlinBuiltInsNames.FqNames.unit -> "void" else -> JavaToKotlinClassMap.mapKotlinToJava(fqName)?.asSingleFqName() ?: fqName.asString() } append(stringFqName) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt index 517923b474c..4ea1d945f75 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.FQ_NAMES.deprecated) continue + if (descriptorFqName != KotlinBuiltInsNames.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 = KotlinBuiltIns.FQ_NAMES.deprecated.shortName() + val DEPRECATED_NAME = KotlinBuiltInsNames.FqNames.deprecated.shortName() } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt index e1550a1185b..5213d8c3d1b 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.mutableList + constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.mutableList private fun KotlinType.isMutableListOrSubtype(): Boolean { return isMutableList() || constructor.supertypes.reversed().any { it.isMutableList() } } private fun KotlinType.isList() = - constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltIns.FQ_NAMES.list + constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.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 594ab0b26f4..7f315209f33 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MainFunctionReturnUnitInspection.kt @@ -12,6 +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.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.MainFunctionDetector @@ -76,7 +77,7 @@ private class ChangeMainFunctionReturnTypeToUnitFix(private val hasExplicitRetur if (function.hasBlockBody()) { function.typeReference = null } else { - function.setType(KotlinBuiltIns.FQ_NAMES.unit.asString()) + function.setType(KotlinBuiltInsNames.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 89d82fbed1e..423c042f6b6 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.FQ_NAMES.suppress) return + if (descriptor.fqName != KotlinBuiltInsNames.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 2cba184b040..530d93d3c47 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 != KotlinBuiltIns.FQ_NAMES.any.shortName() && !expectedReturnType.isMarkedNullable + return expectedReturnType.nameIfStandardType != KotlinBuiltInsNames.FqNames.any.shortName() && !expectedReturnType.isMarkedNullable } if (parent is KtBlockExpression) { @@ -73,7 +73,7 @@ class RedundantUnitExpressionInspection : AbstractKotlinInspection(), CleanupLoc } private fun KtExpression.isUnitLiteral(): Boolean = - KotlinBuiltIns.FQ_NAMES.unit.shortName() == (this as? KtNameReferenceExpression)?.getReferencedNameAsName() + KotlinBuiltInsNames.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 e651f97d0a5..c4696d72e1e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt @@ -16,6 +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.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.canOmitDeclaredType @@ -168,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(KotlinBuiltIns.FQ_NAMES.unit.asString(), shortenReferences = true) + declaration.setType(KotlinBuiltInsNames.FqNames.unit.asString(), shortenReferences = true) } } @@ -218,4 +219,4 @@ class UseExpressionBodyInspection(private val convertEmptyToUnit: Boolean) : Abs } } -} \ No newline at end of file +} 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 d67d05d56c3..5dfaf26cf27 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.quickfix.ReplaceSelectorOfQualifiedExpressionFix import org.jetbrains.kotlin.psi.KtExpression @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getType +import org.jetbrains.kotlin.resolve.calls.inference.model.TypeVariableTypeConstructor import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.resolve.calls.inference.model.TypeVariableTypeConstructor import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf @@ -96,5 +96,5 @@ class UselessCallOnCollectionInspection : AbstractUselessCallInspection() { } } - private fun KotlinType?.isList() = this?.constructor?.declarationDescriptor?.fqNameSafe == KotlinBuiltIns.FQ_NAMES.list -} \ No newline at end of file + private fun KotlinType?.isList() = this?.constructor?.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.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 609ca8e292a..5c4aaa9caad 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.KOTLIN_REFLECT_FQ_NAME +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -140,4 +140,4 @@ class ConvertReferenceToLambdaIntention : SelfTargetingOffsetIndependentIntentio companion object { private val SOURCE_RENDERER = IdeDescriptorRenderers.SOURCE_CODE } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt index 71104f82d6d..cf21228af6b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt @@ -14,6 +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.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.idea.KotlinBundle @@ -224,7 +225,7 @@ class SpecifyTypeExplicitlyIntention : SelfTargetingRangeIntention.lastWithPersistedElementOrNull(elementShouldPe } fun KotlinType.reflectToRegularFunctionType(): KotlinType { - val isTypeAnnotatedWithExtensionFunctionType = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.extensionFunctionType) != null + val isTypeAnnotatedWithExtensionFunctionType = annotations.findAnnotation(KotlinBuiltInsNames.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 f59a6587d5f..a10c9eaedde 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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, KotlinBuiltIns.FQ_NAMES.list, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.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, KotlinBuiltIns.FQ_NAMES.mutableList, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.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, KotlinBuiltIns.FQ_NAMES.set, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.FqNames.set, state.outerLoop) -> { AssignToSetTransformation(state.outerLoop, collectionInitialization) } - canChangeInitializerType(collectionInitialization, KotlinBuiltIns.FQ_NAMES.mutableSet, state.outerLoop) -> { + canChangeInitializerType(collectionInitialization, KotlinBuiltInsNames.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 == KotlinBuiltIns.FQ_NAMES.mutableCollection) { + if ((containingDeclaration as? ClassDescriptor)?.fqNameSafe == KotlinBuiltInsNames.FqNames.mutableCollection) { return true } val overrides = (this as? CallableDescriptor)?.overriddenTreeUniqueAsSequence(true) ?: return false return overrides.any { - (it.containingDeclaration as? ClassDescriptor)?.fqNameSafe == KotlinBuiltIns.FQ_NAMES.mutableCollection + (it.containingDeclaration as? ClassDescriptor)?.fqNameSafe == KotlinBuiltInsNames.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 092cd8c4667..695d7270bf2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt @@ -5,23 +5,23 @@ package org.jetbrains.kotlin.idea.kdoc -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.resolve.DescriptorUtils private val boringBuiltinClasses = setOf( - FQ_NAMES.unit, - FQ_NAMES._byte, - FQ_NAMES._short, - FQ_NAMES._int, - FQ_NAMES._long, - FQ_NAMES._char, - FQ_NAMES._boolean, - FQ_NAMES._float, - FQ_NAMES._double, - FQ_NAMES.string, - FQ_NAMES.array, - FQ_NAMES.any + FqNames.unit, + FqNames._byte, + FqNames._short, + FqNames._int, + FqNames._long, + FqNames._char, + FqNames._boolean, + FqNames._float, + FqNames._double, + FqNames.string, + FqNames.array, + FqNames.any ) -fun ClassifierDescriptor.isBoringBuiltinClass(): Boolean = DescriptorUtils.getFqName(this) in boringBuiltinClasses \ No newline at end of file +fun ClassifierDescriptor.isBoringBuiltinClass(): Boolean = DescriptorUtils.getFqName(this) in boringBuiltinClasses diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt index 0818aa5f2e9..6c384b19d39 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 = KotlinBuiltIns.FQ_NAMES.retention.shortName().asString() + val retentionAnnotationName = KotlinBuiltInsNames.FqNames.retention.shortName().asString() if (annotationTargets.any { it == KotlinTarget.EXPRESSION }) { val retentionEntry = annotationEntries.firstOrNull { it.typeReference?.text == retentionAnnotationName } val newRetentionEntry = psiFactory.createAnnotationEntry( - "@$retentionAnnotationName(${KotlinBuiltIns.FQ_NAMES.annotationRetention.shortName()}.${AnnotationRetention.SOURCE.name})" + "@$retentionAnnotationName(${KotlinBuiltInsNames.FqNames.annotationRetention.shortName()}.${AnnotationRetention.SOURCE.name})" ) if (retentionEntry == null) { addAnnotationEntry(newRetentionEntry) @@ -164,7 +164,7 @@ private fun KtClass.addAnnotationTargets(annotationTargets: List, } } - val targetAnnotationName = KotlinBuiltIns.FQ_NAMES.target.shortName().asString() + val targetAnnotationName = KotlinBuiltInsNames.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() = "${KotlinBuiltIns.FQ_NAMES.annotationTarget.shortName().asString()}.$name" +private fun KotlinTarget.asNameString() = "${KotlinBuiltInsNames.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 86f9547cc35..249961a7307 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 = "${KotlinBuiltIns.FQ_NAMES.annotationRetention.asString()}.${AnnotationRetention.SOURCE.name}" - private val sourceRetentionAnnotation = "@${KotlinBuiltIns.FQ_NAMES.retention.asString()}($sourceRetention)" + private val sourceRetention = "${KotlinBuiltInsNames.FqNames.annotationRetention.asString()}.${AnnotationRetention.SOURCE.name}" + private val sourceRetentionAnnotation = "@${KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.retention) - val targetAnnotation = containingClass.annotation(KotlinBuiltIns.FQ_NAMES.target) + val retentionAnnotation = containingClass.annotation(KotlinBuiltInsNames.FqNames.retention) + val targetAnnotation = containingClass.annotation(KotlinBuiltInsNames.FqNames.target) val expressionTargetArgument = if (targetAnnotation != null) findExpressionTargetArgument(targetAnnotation) else null return listOfNotNull( @@ -114,4 +114,4 @@ object RestrictedRetentionForExpressionAnnotationFactory : KotlinIntentionAction } } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt index 32f8d36f3c1..dd2d0542b3d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/WrongPrimitiveLiteralFix.kt @@ -8,6 +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.codegen.ExpressionCodegen import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.idea.KotlinBundle @@ -26,10 +27,10 @@ import org.jetbrains.kotlin.types.typeUtil.isUnsignedNumberType import kotlin.math.floor private val valueRanges = mapOf( - KotlinBuiltIns.FQ_NAMES._byte to Byte.MIN_VALUE.toLong()..Byte.MAX_VALUE.toLong(), - KotlinBuiltIns.FQ_NAMES._short to Short.MIN_VALUE.toLong()..Short.MAX_VALUE.toLong(), - KotlinBuiltIns.FQ_NAMES._int to Int.MIN_VALUE.toLong()..Int.MAX_VALUE.toLong(), - KotlinBuiltIns.FQ_NAMES._long to Long.MIN_VALUE..Long.MAX_VALUE + 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 ) 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 5f7756ed3ec..7f9f116c5b3 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.suppress, "\"NOTHING_TO_INLINE\"") + declaration.addAnnotation(KotlinBuiltInsNames.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 454731036b3..dbf4cba7033 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt @@ -12,6 +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.descriptors.* import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.diagnostics.Diagnostic @@ -79,7 +80,7 @@ abstract class DeprecatedSymbolUsageFixBase( contextElement: KtReferenceExpression?, replaceInWholeProject: Boolean ): ReplaceWith? { - val annotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: return null + val annotation = descriptor.annotations.findAnnotation(KotlinBuiltInsNames.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/TypeVisitor.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt index fa49b48a208..d012ce20f50 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt @@ -22,7 +22,6 @@ import com.intellij.psi.impl.source.PsiClassReferenceType import org.jetbrains.kotlin.j2k.ast.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES as BUILTIN_NAMES private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.javaKeywordName } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt index 99d867569f3..95feab6cd9b 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 KotlinBuiltIns.FQ_NAMES.any.asString(), - CommonClassNames.JAVA_LANG_BYTE to KotlinBuiltIns.FQ_NAMES._byte.asString(), - CommonClassNames.JAVA_LANG_CHARACTER to KotlinBuiltIns.FQ_NAMES._char.asString(), - CommonClassNames.JAVA_LANG_DOUBLE to KotlinBuiltIns.FQ_NAMES._double.asString(), - CommonClassNames.JAVA_LANG_FLOAT to KotlinBuiltIns.FQ_NAMES._float.asString(), - CommonClassNames.JAVA_LANG_INTEGER to KotlinBuiltIns.FQ_NAMES._int.asString(), - CommonClassNames.JAVA_LANG_LONG to KotlinBuiltIns.FQ_NAMES._long.asString(), - CommonClassNames.JAVA_LANG_SHORT to KotlinBuiltIns.FQ_NAMES._short.asString(), - CommonClassNames.JAVA_LANG_BOOLEAN to KotlinBuiltIns.FQ_NAMES._boolean.asString(), - CommonClassNames.JAVA_LANG_ITERABLE to KotlinBuiltIns.FQ_NAMES.iterable.asString(), - CommonClassNames.JAVA_UTIL_ITERATOR to KotlinBuiltIns.FQ_NAMES.iterator.asString(), - CommonClassNames.JAVA_UTIL_LIST to KotlinBuiltIns.FQ_NAMES.list.asString(), - CommonClassNames.JAVA_UTIL_COLLECTION to KotlinBuiltIns.FQ_NAMES.collection.asString(), - CommonClassNames.JAVA_UTIL_SET to KotlinBuiltIns.FQ_NAMES.set.asString(), - CommonClassNames.JAVA_UTIL_MAP to KotlinBuiltIns.FQ_NAMES.map.asString(), - CommonClassNames.JAVA_UTIL_MAP_ENTRY to KotlinBuiltIns.FQ_NAMES.mapEntry.asString(), - java.util.ListIterator::class.java.canonicalName to KotlinBuiltIns.FQ_NAMES.listIterator.asString() + 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() ) val toKotlinMutableTypesMap: Map = mapOf( - CommonClassNames.JAVA_UTIL_ITERATOR to KotlinBuiltIns.FQ_NAMES.mutableIterator.asString(), - CommonClassNames.JAVA_UTIL_LIST to KotlinBuiltIns.FQ_NAMES.mutableList.asString(), - CommonClassNames.JAVA_UTIL_COLLECTION to KotlinBuiltIns.FQ_NAMES.mutableCollection.asString(), - CommonClassNames.JAVA_UTIL_SET to KotlinBuiltIns.FQ_NAMES.mutableSet.asString(), - CommonClassNames.JAVA_UTIL_MAP to KotlinBuiltIns.FQ_NAMES.mutableMap.asString(), - CommonClassNames.JAVA_UTIL_MAP_ENTRY to KotlinBuiltIns.FQ_NAMES.mutableMapEntry.asString(), - java.util.ListIterator::class.java.canonicalName to KotlinBuiltIns.FQ_NAMES.mutableListIterator.asString() + 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() ) 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 8ce11328650..fcc61eee32a 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES._enum } + superClasses.removeAll { it.fqNameUnsafe == KotlinBuiltInsNames.FqNames._enum } } - if (superClasses.any { !AnnotationsUtils.isNativeObject(it) && it.fqNameSafe != KotlinBuiltIns.FQ_NAMES.throwable }) { + if (superClasses.any { !AnnotationsUtils.isNativeObject(it) && it.fqNameSafe != KotlinBuiltInsNames.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 0fd4bb635ad..cf4e2d79a4a 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + superClass?.classId ?: ClassId.topLevel(KotlinBuiltInsNames.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 899ab1b2584..a44495c47b3 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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) { - KotlinBuiltIns.FQ_NAMES.intRange -> { + KotlinBuiltInsNames.FqNames.intRange -> { callExpression.range = Pair(RangeType.INT, RangeKind.UNTIL) } - KotlinBuiltIns.FQ_NAMES.longRange -> { + KotlinBuiltInsNames.FqNames.longRange -> { callExpression.range = Pair(RangeType.LONG, RangeKind.UNTIL) } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 9820d835e06..18118f5c854 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -21,11 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.idea.KotlinLanguage; -import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.js.backend.ast.*; import org.jetbrains.kotlin.js.backend.ast.metadata.MetadataProperties; import org.jetbrains.kotlin.js.backend.ast.metadata.SideEffectKind; @@ -38,12 +35,10 @@ import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.ArrayFIF; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; import org.jetbrains.kotlin.name.FqNameUnsafe; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.List; 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 c547f9bb68b..d389c50eb88 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,6 +17,7 @@ package org.jetbrains.kotlin.js.translate.declaration import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.backend.ast.* @@ -39,7 +40,7 @@ class EnumTranslator( } private fun generateValuesFunction() { - val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, DescriptorUtils.ENUM_VALUES)) + val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUES)) val values = entries.map { JsInvocation(JsAstUtils.pureFqn(context().getNameForObjectInstance(it), null)).source(psi) @@ -48,7 +49,7 @@ class EnumTranslator( } private fun generateValueOfFunction() { - val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, DescriptorUtils.ENUM_VALUE_OF)) + val function = createFunction(DescriptorUtils.getFunctionByName(descriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUE_OF)) val nameParam = JsScope.declareTemporaryName("name") function.parameters += JsParameter(nameParam) @@ -93,4 +94,4 @@ class EnumTranslator( return function } -} \ No newline at end of file +} 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 d8d13ed8109..366721bd5ed 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,6 +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.descriptors.* import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator @@ -43,7 +44,6 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver -import org.jetbrains.kotlin.types.KotlinType fun createWhile(doWhile: Boolean, expression: KtWhileExpressionBase, context: TranslationContext): JsNode { val conditionExpression = expression.condition ?: @@ -316,7 +316,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont } fun findCollection() = - context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.collection))!! + context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(KotlinBuiltInsNames.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(KotlinBuiltIns.FQ_NAMES.iterable))!! + context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(KotlinBuiltInsNames.FqNames.iterable))!! fun findSequence() = context.currentModule.findClassAcrossModuleDependencies(ClassId.topLevel(sequenceFqName))!! @@ -473,4 +473,4 @@ private enum class WithIndexReceiverType { COLLECTION, ITERABLE, SEQUENCE -} \ No newline at end of file +} 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 d86619e8ad8..98229373695 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 @@ -17,11 +17,8 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories import com.intellij.openapi.util.text.StringUtil.decapitalize -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.PrimitiveType +import org.jetbrains.kotlin.builtins.* import org.jetbrains.kotlin.builtins.PrimitiveType.* -import org.jetbrains.kotlin.builtins.getValueParameterTypesFromFunctionType -import org.jetbrains.kotlin.builtins.isBuiltinFunctionalType import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor @@ -144,7 +141,7 @@ object ArrayFIF : CompositeFIF() { } init { - val arrayName = KotlinBuiltIns.FQ_NAMES.array.shortName() + val arrayName = KotlinBuiltInsNames.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 c225374a735..21e86248cfc 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES.throwable + it.type.constructor.declarationDescriptor?.fqNameSafe == KotlinBuiltInsNames.FqNames.throwable } if (constructor.valueParameters.size == 1 && hasCauseParameter) { @@ -52,4 +52,4 @@ object ThrowableConstructorIntrinsicFactory : FunctionIntrinsicFactory { return JsInvocation(JsAstUtils.pureFqn("newThrowable", Namer.kotlinObject()), argumentsToPass) } } -} \ No newline at end of file +} 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 c840a5403e5..0fc3c10255b 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.KotlinBuiltIns.FQ_NAMES; +import static org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames; import static org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern; public final class TopLevelFIF extends CompositeFIF { @@ -220,14 +220,14 @@ public final class TopLevelFIF extends CompositeFIF { private TopLevelFIF() { add(EQUALS_IN_ANY, KOTLIN_ANY_EQUALS); add(pattern("Char.toString"), CHAR_TO_STRING); - add(pattern("kotlin", "toString").isExtensionOf(FQ_NAMES.any.asString()), TO_STRING); - add(pattern("kotlin", "equals").isExtensionOf(FQ_NAMES.any.asString()), KOTLIN_EQUALS); + add(pattern("kotlin", "toString").isExtensionOf(FqNames.any.asString()), TO_STRING); + add(pattern("kotlin", "equals").isExtensionOf(FqNames.any.asString()), KOTLIN_EQUALS); add(HASH_CODE_IN_ANY, KOTLIN_HASH_CODE); add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), KOTLIN_EQUALS); add(pattern("String|Boolean|Char|Number.equals"), KOTLIN_EQUALS); add(pattern("String.subSequence"), STRING_SUBSTRING); add(pattern("CharSequence.subSequence"), KOTLIN_SUBSEQUENCE); - add(pattern("kotlin", "iterator").isExtensionOf(FQ_NAMES.iterator.asString()), RETURN_RECEIVER_INTRINSIC); + add(pattern("kotlin", "iterator").isExtensionOf(FqNames.iterator.asString()), RETURN_RECEIVER_INTRINSIC); add(pattern("kotlin.js", "Json", "get"), ArrayFIF.GET_INTRINSIC); add(pattern("kotlin.js", "Json", "set"), ArrayFIF.SET_INTRINSIC); 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 e9005be5726..05609454e4b 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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 == KotlinBuiltIns.FQ_NAMES._enum || + if (classDescriptor.fqNameUnsafe == KotlinBuiltInsNames.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 4cdbc09cfb3..fb424bd43b4 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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"), - KotlinBuiltIns.FQ_NAMES.unit + KotlinBuiltInsNames.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 d6e43b7d5fa..ee3217e0809 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.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames; 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, KotlinBuiltIns.FQ_NAMES.uByte); + return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uByte); } @NotNull public static JsExpression shortToUShort(short value, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltIns.FQ_NAMES.uShort); + return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uShort); } @NotNull public static JsExpression intToUInt(int value, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltIns.FQ_NAMES.uInt); + return toUnsignedNumber(new JsIntLiteral(value), context, KotlinBuiltInsNames.FqNames.uInt); } @NotNull public static JsExpression longToULong(@NotNull JsExpression expression, @NotNull TranslationContext context) { // replace with external builder - return toUnsignedNumber(expression, context, KotlinBuiltIns.FQ_NAMES.uLong); + return toUnsignedNumber(expression, context, KotlinBuiltInsNames.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 f47842803b4..93b58edfc03 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,6 +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.descriptors.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -41,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( - KotlinBuiltIns.FQ_NAMES.any.asString() + KotlinBuiltInsNames.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 e1fa22ebe8c..c96bd2353cd 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,6 +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.PrimitiveType; import org.jetbrains.kotlin.config.CoroutineLanguageVersionSettingsUtilKt; import org.jetbrains.kotlin.descriptors.*; @@ -59,7 +60,7 @@ public final class TranslationUtils { new FqNameUnsafe("kotlin.ranges.CharProgression"), new FqNameUnsafe("kotlin.js.internal.CharCompanionObject"), new FqNameUnsafe("kotlin.Char.Companion"), - KotlinBuiltIns.FQ_NAMES.charSequence, KotlinBuiltIns.FQ_NAMES.number + KotlinBuiltInsNames.FqNames.charSequence, KotlinBuiltInsNames.FqNames.number )); private TranslationUtils() { 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 6d21bb5ba19..c11bf20a28c 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.name.ClassId @@ -16,7 +16,7 @@ internal val DEPRECATED_ANNOTATION_FQN: FqName = FqName(Deprecated::class.java.n internal val DEPRECATED_ANNOTATION_CID: ClassId = internedClassId(DEPRECATED_ANNOTATION_FQN) internal val STANDARD_KOTLIN_PACKAGE_FQNS: List = listOf( - KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.intern(), + KotlinBuiltInsNames.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 f7a85534310..acbee77ada4 100644 --- a/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt +++ b/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.builtins.konan import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.DescriptorUtils.COROUTINES_PACKAGE_FQ_NAME_RELEASE import org.jetbrains.kotlin.storage.StorageManager class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageManager) { @@ -22,4 +22,4 @@ class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageMana Name.identifier("SuspendFunction$parameterCount") ) )!! -} \ No newline at end of file +} 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 ae75c0ee95e..8e404231e82 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor @@ -37,7 +37,7 @@ object NativeThrowsChecker : DeclarationChecker { // Note: can't use subtyping, because CancellationException can be missing (e.g. for common code). private val cancellationExceptionAndSupersClassIds = sequenceOf( - KotlinBuiltIns.FQ_NAMES.throwable, + KotlinBuiltInsNames.FqNames.throwable, FqName("kotlin.Exception"), FqName("kotlin.RuntimeException"), FqName("kotlin.IllegalStateException"), 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 150629fe9d1..37b4da7de13 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,17 +5,15 @@ package org.jetbrains.kotlin.nj2k.inference.mutability -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.nj2k.inference.common.BoundType import org.jetbrains.kotlin.nj2k.inference.common.BoundTypeCalculatorImpl import org.jetbrains.kotlin.nj2k.inference.common.BoundTypeEnhancer import org.jetbrains.kotlin.nj2k.inference.common.InferenceContext -import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtQualifiedExpression -import org.jetbrains.kotlin.utils.addToStdlib.safeAs class MutabilityBoundTypeCalculator( private val resolutionFacade: ResolutionFacade, @@ -38,10 +36,10 @@ class MutabilityBoundTypeCalculator( companion object { private val PRESERVING_MUTABILITY_FQ_NAMES = setOf( - FQ_NAMES.collection.child(Name.identifier("iterator")), - FQ_NAMES.list.child(Name.identifier("listIterator")), - FQ_NAMES.map.child(Name.identifier("entries")), - FQ_NAMES.map.child(Name.identifier("values")) + FqNames.collection.child(Name.identifier("iterator")), + FqNames.list.child(Name.identifier("listIterator")), + FqNames.map.child(Name.identifier("entries")), + FqNames.map.child(Name.identifier("values")) ) } -} \ No newline at end of file +} 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 c6532805b70..ab9dca8987e 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,10 +5,8 @@ package org.jetbrains.kotlin.nj2k.inference.mutability -import com.intellij.psi.CommonClassNames -import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames.FqNames import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.nj2k.inference.common.* import org.jetbrains.kotlin.nj2k.inference.common.collectors.ConstraintsCollector @@ -38,35 +36,35 @@ class MutabilityConstraintsCollector : ConstraintsCollector() { companion object { private val MUTATOR_CALL_FQ_NAMES = setOf( - FQ_NAMES.mutableCollection.child(Name.identifier("add")), - FQ_NAMES.mutableCollection.child(Name.identifier("addAll")), - FQ_NAMES.mutableCollection.child(Name.identifier("remove")), - FQ_NAMES.mutableCollection.child(Name.identifier("removeAll")), - FQ_NAMES.mutableCollection.child(Name.identifier("retainAll")), - FQ_NAMES.mutableCollection.child(Name.identifier("clear")), - FQ_NAMES.mutableCollection.child(Name.identifier("removeIf")), + FqNames.mutableCollection.child(Name.identifier("add")), + FqNames.mutableCollection.child(Name.identifier("addAll")), + FqNames.mutableCollection.child(Name.identifier("remove")), + FqNames.mutableCollection.child(Name.identifier("removeAll")), + FqNames.mutableCollection.child(Name.identifier("retainAll")), + FqNames.mutableCollection.child(Name.identifier("clear")), + FqNames.mutableCollection.child(Name.identifier("removeIf")), - FQ_NAMES.mutableList.child(Name.identifier("addAll")), - FQ_NAMES.mutableList.child(Name.identifier("set")), + FqNames.mutableList.child(Name.identifier("addAll")), + FqNames.mutableList.child(Name.identifier("set")), - FQ_NAMES.mutableMap.child(Name.identifier("put")), - FQ_NAMES.mutableMap.child(Name.identifier("remove")), - FQ_NAMES.mutableMap.child(Name.identifier("putAll")), - FQ_NAMES.mutableMap.child(Name.identifier("clear")), - FQ_NAMES.mutableMap.child(Name.identifier("putIfAbsent")), - FQ_NAMES.mutableMap.child(Name.identifier("replace")), - FQ_NAMES.mutableMap.child(Name.identifier("replaceAll")), - FQ_NAMES.mutableMap.child(Name.identifier("computeIfAbsent")), - FQ_NAMES.mutableMap.child(Name.identifier("computeIfPresent")), - FQ_NAMES.mutableMap.child(Name.identifier("compute")), - FQ_NAMES.mutableMap.child(Name.identifier("merge")), + FqNames.mutableMap.child(Name.identifier("put")), + FqNames.mutableMap.child(Name.identifier("remove")), + FqNames.mutableMap.child(Name.identifier("putAll")), + FqNames.mutableMap.child(Name.identifier("clear")), + FqNames.mutableMap.child(Name.identifier("putIfAbsent")), + FqNames.mutableMap.child(Name.identifier("replace")), + FqNames.mutableMap.child(Name.identifier("replaceAll")), + FqNames.mutableMap.child(Name.identifier("computeIfAbsent")), + FqNames.mutableMap.child(Name.identifier("computeIfPresent")), + FqNames.mutableMap.child(Name.identifier("compute")), + FqNames.mutableMap.child(Name.identifier("merge")), - FQ_NAMES.mutableMapEntry.child(Name.identifier("setValue")), + FqNames.mutableMapEntry.child(Name.identifier("setValue")), - FQ_NAMES.mutableIterator.child(Name.identifier("remove")), + FqNames.mutableIterator.child(Name.identifier("remove")), - FQ_NAMES.mutableListIterator.child(Name.identifier("set")), - FQ_NAMES.mutableListIterator.child(Name.identifier("add")) + FqNames.mutableListIterator.child(Name.identifier("set")), + FqNames.mutableListIterator.child(Name.identifier("add")) ) } -} \ No newline at end of file +} 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 04ed9eaa51b..d20d36046fb 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.nj2k.inference.common.State import org.jetbrains.kotlin.nj2k.inference.common.StateUpdater @@ -54,15 +54,15 @@ class MutabilityStateUpdater : StateUpdater() { } val mutableToImmutable = mapOf( - KotlinBuiltIns.FQ_NAMES.mutableIterator to KotlinBuiltIns.FQ_NAMES.iterator, - KotlinBuiltIns.FQ_NAMES.mutableCollection to KotlinBuiltIns.FQ_NAMES.collection, - KotlinBuiltIns.FQ_NAMES.mutableList to KotlinBuiltIns.FQ_NAMES.list, - KotlinBuiltIns.FQ_NAMES.mutableListIterator to KotlinBuiltIns.FQ_NAMES.listIterator, - KotlinBuiltIns.FQ_NAMES.mutableSet to KotlinBuiltIns.FQ_NAMES.set, - KotlinBuiltIns.FQ_NAMES.mutableMap to KotlinBuiltIns.FQ_NAMES.map, - KotlinBuiltIns.FQ_NAMES.mutableMapEntry to KotlinBuiltIns.FQ_NAMES.mapEntry + 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 ) val immutableToMutable = mutableToImmutable.map { (key, value) -> value to key }.toMap() } -} \ No newline at end of file +} diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt index 51ac3293df3..e4c9c2c9ca9 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES.array.toSafe()), + symbolProvider.provideClassSymbol(KotlinBuiltInsNames.FqNames.array.toSafe()), listOf(resultType), Nullability.Default ) @@ -91,4 +91,4 @@ class ArrayInitializerConversion(context: NewJ2kConverterContext) : RecursiveApp JKTypeArgumentList(listOf(JKTypeElement(resultType))) ) } -} \ No newline at end of file +} diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt index d2d1aa8c21c..51ed2b299f5 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.nj2k.* import org.jetbrains.kotlin.nj2k.symbols.JKMethodSymbol import org.jetbrains.kotlin.nj2k.symbols.JKUnresolvedField @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.nj2k.symbols.deepestFqName import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.types.isArrayType import org.jetbrains.kotlin.nj2k.types.isStringType - import org.jetbrains.kotlin.utils.addToStdlib.cast import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -500,7 +499,7 @@ class BuiltinMembersConversion(context: NewJ2kConverterContext) : RecursiveAppli }, Method("java.lang.String.format") convertTo CustomExpression { expression -> JKClassAccessExpression( - symbolProvider.provideClassSymbol(KotlinBuiltIns.FQ_NAMES.string) + symbolProvider.provideClassSymbol(KotlinBuiltInsNames.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 4f4770d0349..57c59d9b54d 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/symbols/JKMethodSymbol.kt @@ -9,17 +9,12 @@ 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.nj2k.tree.JKClass import org.jetbrains.kotlin.nj2k.tree.JKMethod -import org.jetbrains.kotlin.nj2k.types.asType -import org.jetbrains.kotlin.nj2k.types.toJK -import org.jetbrains.kotlin.nj2k.types.JKClassType -import org.jetbrains.kotlin.nj2k.types.JKNoType -import org.jetbrains.kotlin.nj2k.types.JKType -import org.jetbrains.kotlin.nj2k.types.JKTypeFactory +import org.jetbrains.kotlin.nj2k.types.* import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -77,7 +72,7 @@ class JKMultiverseFunctionSymbol( type?.let { if (parameter.isVarArg) { JKClassType( - symbolProvider.provideClassSymbol(KotlinBuiltIns.FQ_NAMES.array.toSafe()), + symbolProvider.provideClassSymbol(KotlinBuiltInsNames.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 fef5d49291d..934d8818f98 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames 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(KotlinBuiltIns.FQ_NAMES._boolean) - val char = typeByFqName(KotlinBuiltIns.FQ_NAMES._char) - val byte = typeByFqName(KotlinBuiltIns.FQ_NAMES._byte) - val short = typeByFqName(KotlinBuiltIns.FQ_NAMES._short) - val int = typeByFqName(KotlinBuiltIns.FQ_NAMES._int) - val float = typeByFqName(KotlinBuiltIns.FQ_NAMES._float) - val long = typeByFqName(KotlinBuiltIns.FQ_NAMES._long) - val double = typeByFqName(KotlinBuiltIns.FQ_NAMES._double) + 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 string = typeByFqName(KotlinBuiltIns.FQ_NAMES.string) - val possiblyNullString = typeByFqName(KotlinBuiltIns.FQ_NAMES.string, nullability = Nullability.Default) + val string = typeByFqName(KotlinBuiltInsNames.FqNames.string) + val possiblyNullString = typeByFqName(KotlinBuiltInsNames.FqNames.string, nullability = Nullability.Default) - val unit = typeByFqName(KotlinBuiltIns.FQ_NAMES.unit) - val nothing = typeByFqName(KotlinBuiltIns.FQ_NAMES.nothing) - val nullableAny = typeByFqName(KotlinBuiltIns.FQ_NAMES.any, nullability = Nullability.Nullable) + val unit = typeByFqName(KotlinBuiltInsNames.FqNames.unit) + val nothing = typeByFqName(KotlinBuiltInsNames.FqNames.nothing) + val nullableAny = typeByFqName(KotlinBuiltInsNames.FqNames.any, nullability = Nullability.Nullable) val javaKlass = typeByFqName(FqNameUnsafe(CommonClassNames.JAVA_LANG_CLASS)) - val kotlinClass = typeByFqName(KotlinBuiltIns.FQ_NAMES.kClass) + val kotlinClass = typeByFqName(KotlinBuiltInsNames.FqNames.kClass) } fun fromPrimitiveType(primitiveType: JKJavaPrimitiveType) = when (primitiveType.jvmPrimitiveType) { @@ -139,4 +139,4 @@ class JKTypeFactory(val symbolProvider: JKSymbolProvider) { ) } } -} \ No newline at end of file +} diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt index a62b8200b13..98db4f672d0 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/types/typesUtils.kt @@ -9,14 +9,17 @@ 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.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.nj2k.JKSymbolProvider import org.jetbrains.kotlin.nj2k.symbols.JKClassSymbol -import org.jetbrains.kotlin.nj2k.tree.* +import org.jetbrains.kotlin.nj2k.tree.JKAnnotationList +import org.jetbrains.kotlin.nj2k.tree.JKClass +import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression +import org.jetbrains.kotlin.nj2k.tree.JKTypeElement import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtTypeReference import org.jetbrains.kotlin.resolve.BindingContext @@ -116,7 +119,7 @@ fun JKType.isStringType(): Boolean = fun JKClassSymbol.isStringType(): Boolean = fqName == CommonClassNames.JAVA_LANG_STRING - || fqName == KotlinBuiltIns.FQ_NAMES.string.asString() + || fqName == KotlinBuiltInsNames.FqNames.string.asString() fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? = when (this) { @@ -134,14 +137,14 @@ fun JKJavaPrimitiveType.toLiteralType(): JKLiteralExpression.LiteralType? = fun JKType.asPrimitiveType(): JKJavaPrimitiveType? = if (this is JKJavaPrimitiveType) this else when ((this as? JKClassType)?.classReference?.fqName) { - KotlinBuiltIns.FQ_NAMES._char.asString(), CommonClassNames.JAVA_LANG_CHARACTER -> JKJavaPrimitiveType.CHAR - KotlinBuiltIns.FQ_NAMES._boolean.asString(), CommonClassNames.JAVA_LANG_BOOLEAN -> JKJavaPrimitiveType.BOOLEAN - KotlinBuiltIns.FQ_NAMES._int.asString(), CommonClassNames.JAVA_LANG_INTEGER -> JKJavaPrimitiveType.INT - KotlinBuiltIns.FQ_NAMES._long.asString(), CommonClassNames.JAVA_LANG_LONG -> JKJavaPrimitiveType.LONG - KotlinBuiltIns.FQ_NAMES._float.asString(), CommonClassNames.JAVA_LANG_FLOAT -> JKJavaPrimitiveType.FLOAT - KotlinBuiltIns.FQ_NAMES._double.asString(), CommonClassNames.JAVA_LANG_DOUBLE -> JKJavaPrimitiveType.DOUBLE - KotlinBuiltIns.FQ_NAMES._byte.asString(), CommonClassNames.JAVA_LANG_BYTE -> JKJavaPrimitiveType.BYTE - KotlinBuiltIns.FQ_NAMES._short.asString(), CommonClassNames.JAVA_LANG_SHORT -> JKJavaPrimitiveType.SHORT + 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 else -> null } @@ -167,7 +170,7 @@ val primitiveTypes = fun JKType.arrayFqName(): String = if (this is JKJavaPrimitiveType) PrimitiveType.valueOf(jvmPrimitiveType.name).arrayTypeFqName.asString() - else KotlinBuiltIns.FQ_NAMES.array.asString() + else KotlinBuiltInsNames.FqNames.array.asString() fun JKClassSymbol.isArrayType(): Boolean = fqName in arrayFqNames @@ -175,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(KotlinBuiltIns.FQ_NAMES.array.asString()) + add(KotlinBuiltInsNames.FqNames.array.asString()) } fun JKType.isArrayType() = @@ -186,19 +189,19 @@ fun JKType.isArrayType() = } fun JKType.isUnit() = - safeAs()?.classReference?.fqName == KotlinBuiltIns.FQ_NAMES.unit.asString() + safeAs()?.classReference?.fqName == KotlinBuiltInsNames.FqNames.unit.asString() val JKType.isCollectionType: Boolean get() = safeAs()?.classReference?.fqName in collectionFqNames private val collectionFqNames = setOf( - KotlinBuiltIns.FQ_NAMES.mutableIterator.asString(), - KotlinBuiltIns.FQ_NAMES.mutableList.asString(), - KotlinBuiltIns.FQ_NAMES.mutableCollection.asString(), - KotlinBuiltIns.FQ_NAMES.mutableSet.asString(), - KotlinBuiltIns.FQ_NAMES.mutableMap.asString(), - KotlinBuiltIns.FQ_NAMES.mutableMapEntry.asString(), - KotlinBuiltIns.FQ_NAMES.mutableListIterator.asString() + 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() ) fun JKType.arrayInnerType(): JKType? = @@ -228,7 +231,7 @@ fun JKType.replaceJavaClassWithKotlinClassType(symbolProvider: JKSymbolProvider) applyRecursive { type -> if (type is JKClassType && type.classReference.fqName == "java.lang.Class") { JKClassType( - symbolProvider.provideClassSymbol(KotlinBuiltIns.FQ_NAMES.kClass.toSafe()), + symbolProvider.provideClassSymbol(KotlinBuiltInsNames.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 79a08902039..0ed69bbe01c 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,6 +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.codegen.AsmUtil import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_PARAMETER_NAME import org.jetbrains.kotlin.codegen.needsExperimentalCoroutinesWrapper @@ -51,7 +52,6 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DelegatingBindingTrace -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument @@ -945,8 +945,8 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati && kaptContext.generationState.languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) return when (areCoroutinesReleased) { - true -> DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE - false -> DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL + true -> KotlinBuiltInsNames.CONTINUATION_INTERFACE_FQ_NAME_RELEASE + false -> KotlinBuiltInsNames.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 1d14749d502..dfdb0f48fe5 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,6 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.ir +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.ir.builders.* @@ -19,7 +20,6 @@ import org.jetbrains.kotlin.ir.util.functions import org.jetbrains.kotlin.ir.util.properties import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationPluginContext import org.jetbrains.kotlinx.serialization.compiler.resolve.* @@ -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 == DescriptorUtils.ENUM_VALUES } + val valuesF = serializableIrClass.functions.single { it.name == KotlinBuiltInsNames.ENUM_VALUES } val getValues = irInvoke(dispatchReceiver = null, callee = valuesF.symbol) @@ -114,4 +114,4 @@ class SerializerForEnumsGenerator( ) } } -} \ No newline at end of file +} 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 85e73430768..bd783610212 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,6 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.js +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi @@ -171,7 +172,7 @@ internal fun AbstractSerialGenerator.serializerInstance( context.getInnerNameForDescriptor( DescriptorUtils.getFunctionByName( kType.toClassDescriptor!!.staticScope, - DescriptorUtils.ENUM_VALUES + KotlinBuiltInsNames.ENUM_VALUES ) ).makeRef() ) @@ -237,4 +238,4 @@ fun TranslationContext.buildInitializersRemapping( val parentPsi = superClass?.takeIf { it.isInternalSerializable }?.findPsi() as? KtPureClassOrObject ?: return myMap val parentMap = buildInitializersRemapping(parentPsi, superClass.getSuperClassNotAny()) return myMap + parentMap -} \ No newline at end of file +} 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 58af96c4108..a0a9a28fd02 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,6 +5,7 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.js +import org.jetbrains.kotlin.builtins.KotlinBuiltInsNames import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -37,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, DescriptorUtils.ENUM_VALUES) + val valuesFunc = DescriptorUtils.getFunctionByName(serializableDescriptor.staticScope, KotlinBuiltInsNames.ENUM_VALUES) val decodeEnumCall = JsInvocation(JsNameRef(decodeEnumF, JsNameRef(jsFun.parameters[0].name)), serialClassDescRef) val resultCall = JsArrayAccess(JsInvocation(ctx.getInnerNameForDescriptor(valuesFunc).makeRef()), decodeEnumCall) +JsReturn(resultCall) @@ -76,4 +77,4 @@ class SerializerForEnumsTranslator( pushAnnotationsInto(entry, pushAnnotationFunction, serialDescriptorInThis) } } -} \ No newline at end of file +}