From d1fd1da56f222741c1626d4520128b2e30efc83f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 1 Sep 2020 16:06:06 +0300 Subject: [PATCH] Rename Visibility to DescriptorVisibility --- .../JavaClassesSerializerExtension.kt | 10 +- .../incremental/protoDifferenceUtils.kt | 6 +- .../kotlin/backend/common/CodegenUtil.kt | 16 +- ...rCompanionObjectInstanceFieldDescriptor.kt | 4 +- .../AccessorForConstructorDescriptor.kt | 12 +- .../codegen/AccessorForFunctionDescriptor.kt | 2 +- .../codegen/AccessorForPropertyDescriptor.kt | 6 +- .../kotlin/codegen/AnnotationCodegen.java | 2 +- .../org/jetbrains/kotlin/codegen/AsmUtil.java | 46 ++-- .../codegen/CollectionStubMethodGenerator.kt | 2 +- .../DefaultParameterValueSubstitutor.kt | 2 +- .../kotlin/codegen/ExpressionCodegen.java | 4 +- .../kotlin/codegen/FunctionCodegen.java | 4 +- .../codegen/ImplementationBodyCodegen.java | 2 +- .../codegen/InterfaceImplBodyCodegen.kt | 2 +- .../kotlin/codegen/JvmCodegenUtil.java | 4 +- .../kotlin/codegen/JvmRuntimeTypes.kt | 2 +- .../kotlin/codegen/MemberCodegen.java | 6 +- .../kotlin/codegen/MultifileClassCodegen.kt | 2 +- .../kotlin/codegen/PropertyCodegen.java | 14 +- .../kotlin/codegen/SamWrapperCodegen.java | 8 +- .../binding/CodegenAnnotatingVisitor.java | 2 +- .../codegen/context/CodegenContext.java | 6 +- .../codegen/coroutines/CoroutineCodegen.kt | 6 +- .../coroutines/coroutineCodegenUtil.kt | 2 +- .../inline/FictitiousArrayConstructor.kt | 2 +- .../serialization/JvmSerializerExtension.kt | 8 +- ...FactoryForDuplicateSignatureDiagnostics.kt | 4 +- .../kotlin/codegen/state/KotlinTypeMapper.kt | 10 +- .../backend/jvm/FirJvmVisibilityConverter.kt | 9 +- .../fir/backend/Fir2IrDeclarationStorage.kt | 2 +- .../fir/backend/Fir2IrVisibilityConverter.kt | 20 +- .../generators/CallAndReferenceGenerator.kt | 4 +- .../generators/DataClassMembersGenerator.kt | 2 +- .../generators/DelegatedMemberGenerator.kt | 4 +- .../generators/FakeOverrideGenerator.kt | 4 +- .../kotlin/fir/lazy/Fir2IrLazyClass.kt | 2 +- .../kotlin/fir/lazy/Fir2IrLazyConstructor.kt | 2 +- .../kotlin/fir/lazy/Fir2IrLazyProperty.kt | 2 +- .../fir/lazy/Fir2IrLazySimpleFunction.kt | 2 +- .../jetbrains/kotlin/fir/java/JavaUtils.kt | 26 +-- .../load/java/structure/impl/JavaClassImpl.kt | 4 +- .../java/structure/impl/JavaElementUtil.java | 16 +- .../java/structure/impl/JavaMemberImpl.java | 4 +- .../impl/JavaValueParameterImpl.java | 8 +- .../structure/impl/classFiles/commonMixins.kt | 16 +- .../checkers/JavaTypeAccessibilityChecker.kt | 6 +- ...tationsTargetNonExistentAccessorChecker.kt | 4 +- .../checkers/JvmFieldApplicabilityChecker.kt | 4 +- ...otectedInSuperClassCompanionCallChecker.kt | 4 +- .../ProtectedSyntheticExtensionCallChecker.kt | 6 +- .../jvm/checkers/declarationCheckers.kt | 6 +- .../SignaturesPropagationData.java | 2 +- .../synthetic/JavaSyntheticPropertiesScope.kt | 32 +-- .../synthetic/syntheticExtensionsUtils.kt | 12 +- .../cfg/ControlFlowInformationProvider.kt | 6 +- .../impl/LocalVariableAccessorDescriptor.kt | 2 +- .../impl/LocalVariableDescriptor.java | 4 +- .../jetbrains/kotlin/diagnostics/Errors.java | 10 +- .../kotlin/diagnostics/rendering/Renderers.kt | 4 +- .../SyntheticClassOrObjectDescriptor.kt | 26 +-- .../resolve/DataClassDescriptorResolver.kt | 2 +- .../kotlin/resolve/DeclarationsChecker.kt | 8 +- .../kotlin/resolve/DelegationResolver.kt | 2 +- .../kotlin/resolve/DescriptorResolver.java | 22 +- .../resolve/ExposedVisibilityChecker.kt | 6 +- .../kotlin/resolve/FunctionsFromAny.kt | 4 +- .../resolve/InlineClassDescriptorResolver.kt | 6 +- .../kotlin/resolve/LocalVariableResolver.kt | 4 +- .../resolve/MissingSupertypesResolver.kt | 2 +- .../kotlin/resolve/ModifiersChecker.java | 14 +- .../kotlin/resolve/OverloadResolver.kt | 2 +- .../kotlin/resolve/OverrideResolver.kt | 4 +- .../resolve/QualifiedExpressionResolver.kt | 4 +- .../resolve/ShadowedExtensionChecker.kt | 2 +- .../jetbrains/kotlin/resolve/TypeResolver.kt | 2 +- .../kotlin/resolve/VarianceChecker.kt | 10 +- .../kotlin/resolve/calls/CandidateResolver.kt | 8 +- .../resolve/calls/checkers/InlineChecker.kt | 6 +- .../ProtectedConstructorCallChecker.kt | 8 +- .../smartcasts/DataFlowValueKindUtils.kt | 2 +- .../resolve/calls/tasks/dynamicCalls.kt | 4 +- .../checkers/ExplicitApiDeclarationChecker.kt | 6 +- .../checkers/InlineClassDeclarationChecker.kt | 4 +- .../KClassWithIncorrectTypeArgumentChecker.kt | 2 +- .../checkers/PublishedApiUsageChecker.kt | 4 +- .../ResultClassInReturnTypeChecker.kt | 2 +- .../kotlin/resolve/importedFromObject.kt | 8 +- .../resolve/inline/InlineAnalyzerExtension.kt | 2 +- .../kotlin/resolve/inline/inlineOnly.kt | 4 +- .../kotlin/resolve/lazy/FileScopeFactory.kt | 2 +- .../kotlin/resolve/lazy/LazyImportScope.kt | 2 +- .../lazy/descriptors/LazyClassDescriptor.java | 12 +- .../descriptors/LazyTypeAliasDescriptor.kt | 4 +- .../ControlStructureTypingUtils.java | 2 +- .../DoubleColonExpressionResolver.kt | 4 +- .../expressions/ExpressionTypingUtils.java | 2 +- .../jetbrains/kotlin/util/declarationUtil.kt | 6 +- .../backend/common/CheckIrElementVisitor.kt | 4 +- .../kotlin/backend/common/ir/IrUtils.kt | 30 +-- .../lower/AbstractSuspendFunctionsLowering.kt | 8 +- .../backend/common/lower/ClosureAnnotator.kt | 6 +- .../lower/DefaultArgumentStubGenerator.kt | 30 +-- .../common/lower/LocalDeclarationsLowering.kt | 34 +-- .../lower/SingleAbstractMethodLowering.kt | 12 +- .../PropertyAccessorInlineLowering.kt | 6 +- .../declarations/declarationBuilders.kt | 20 +- .../kotlin/ir/backend/js/MutableController.kt | 4 +- .../backend/js/export/ExportModelGenerator.kt | 4 +- .../js/lower/BlockDecomposerLowering.kt | 6 +- .../js/lower/CallableReferenceLowering.kt | 6 +- .../js/lower/CreateScriptFunctionsPhase.kt | 4 +- ...AddInternalParametersToConstructorPhase.kt | 4 +- .../lower/InteropCallableReferenceLowering.kt | 4 +- .../backend/js/lower/JsInnerClassesSupport.kt | 4 +- .../lower/JsSingleAbstractMethodLowering.kt | 10 +- .../js/lower/PrimaryConstructorLowering.kt | 4 +- .../js/lower/PrivateMembersLowering.kt | 6 +- .../backend/js/lower/SecondaryCtorLowering.kt | 6 +- .../AbstractSuspendFunctionsLowering.kt | 6 +- .../transformers/irToJs/JsClassGenerator.kt | 6 +- .../backend/jvm/JvmCachedDeclarations.kt | 12 +- .../backend/jvm/JvmGeneratorExtensions.kt | 2 +- .../jetbrains/kotlin/backend/jvm/JvmLower.kt | 19 +- .../kotlin/backend/jvm/JvmSymbols.kt | 8 +- .../backend/jvm/codegen/AnnotationCodegen.kt | 4 +- .../backend/jvm/codegen/ClassCodegen.kt | 4 +- .../backend/jvm/codegen/ExpressionCodegen.kt | 4 +- .../backend/jvm/codegen/FunctionCodegen.kt | 10 +- .../backend/jvm/codegen/IrTypeMapping.kt | 4 +- .../jvm/codegen/MethodSignatureMapper.kt | 10 +- .../backend/jvm/codegen/irCodegenUtils.kt | 42 ++-- .../kotlin/backend/jvm/ir/IrUtils.kt | 8 +- .../jvm/lower/AddContinuationLowering.kt | 30 +-- .../backend/jvm/lower/AssertionLowering.kt | 4 +- .../backend/jvm/lower/BridgeLowering.kt | 6 +- .../backend/jvm/lower/EnumClassLowering.kt | 4 +- .../backend/jvm/lower/FileClassLowering.kt | 6 +- .../lower/FunctionNVarargBridgeLowering.kt | 4 +- .../jvm/lower/FunctionReferenceLowering.kt | 4 +- .../jvm/lower/GenerateMultifileFacades.kt | 12 +- ...nheritedDefaultMethodsOnClassesLowering.kt | 4 +- .../lower/InlineCallableReferenceToLambda.kt | 8 +- .../backend/jvm/lower/InterfaceLowering.kt | 6 +- .../lower/JvmDefaultConstructorLowering.kt | 8 +- .../jvm/lower/JvmInlineClassLowering.kt | 4 +- .../jvm/lower/JvmInnerClassesSupport.kt | 4 +- .../lower/JvmSingleAbstractMethodLowering.kt | 8 +- .../jvm/lower/JvmStaticAnnotationLowering.kt | 4 +- .../jvm/lower/MainMethodGenerationLowering.kt | 14 +- .../MoveCompanionObjectFieldsLowering.kt | 4 +- .../backend/jvm/lower/ObjectClassLowering.kt | 6 +- .../jvm/lower/PropertyReferenceLowering.kt | 10 +- .../jvm/lower/StaticInitializersLowering.kt | 4 +- .../backend/jvm/lower/StaticLambdaLowering.kt | 4 +- .../jvm/lower/SyntheticAccessorLowering.kt | 34 +-- .../backend/jvm/lower/ToArrayLowering.kt | 4 +- .../MemoizedInlineClassReplacements.kt | 4 +- .../backend/wasm/codegen/ModuleTransformer.kt | 4 +- .../generators/ArgumentsGenerationUtils.kt | 2 +- .../psi2ir/generators/ClassGenerator.kt | 6 +- .../psi2ir/generators/FunctionGenerator.kt | 2 +- .../psi2ir/generators/GeneratorExtensions.kt | 4 +- .../psi2ir/generators/PropertyGenerator.kt | 14 +- .../ReflectionReferencesGenerator.kt | 4 +- .../SyntheticDeclarationsGenerator.kt | 6 +- .../ir/declarations/impl/IrClassImpl.kt | 32 +-- .../ir/declarations/impl/IrConstructorImpl.kt | 26 +-- .../ir/declarations/impl/IrFactoryImpl.kt | 208 +++++++++--------- .../ir/declarations/impl/IrFieldImpl.kt | 22 +- .../ir/declarations/impl/IrFunctionImpl.kt | 92 ++++---- .../ir/declarations/impl/IrPropertyImpl.kt | 80 +++---- .../ir/declarations/impl/IrTypeAliasImpl.kt | 18 +- .../persistent/PersistentIrClass.kt | 36 +-- .../persistent/PersistentIrConstructor.kt | 30 +-- .../persistent/PersistentIrFactory.kt | 208 +++++++++--------- .../persistent/PersistentIrField.kt | 22 +- .../persistent/PersistentIrFunction.kt | 96 ++++---- .../persistent/PersistentIrProperty.kt | 80 +++---- .../persistent/PersistentIrTypeAlias.kt | 18 +- .../persistent/carriers/ClassCarrier.kt | 26 +-- .../persistent/carriers/ConstructorCarrier.kt | 26 +-- .../carriers/FunctionBaseCarrier.kt | 4 +- .../persistent/carriers/FunctionCarrier.kt | 32 +-- .../declarations/IrDeclarationBuilder.kt | 8 +- .../kotlin/ir/declarations/IrDeclaration.kt | 4 +- .../kotlin/ir/declarations/IrFactory.kt | 208 +++++++++--------- .../ir/declarations/lazy/IrLazyClass.kt | 36 +-- .../ir/declarations/lazy/IrLazyConstructor.kt | 28 +-- .../lazy/IrLazyDeclarationBase.kt | 2 +- .../ir/declarations/lazy/IrLazyField.kt | 26 +-- .../ir/declarations/lazy/IrLazyFunction.kt | 38 ++-- .../ir/declarations/lazy/IrLazyProperty.kt | 38 ++-- .../ir/declarations/lazy/IrLazyTypeAlias.kt | 22 +- .../ir/descriptors/IrBasedDescriptors.kt | 46 ++-- .../kotlin/ir/descriptors/IrBuiltIns.kt | 6 +- .../IrBuiltinFunctionDescriptor.kt | 8 +- .../ir/descriptors/IrDelegateDescriptor.kt | 6 +- .../ir/descriptors/IrFunctionFactory.kt | 4 +- .../IrTemporaryVariableDescriptor.kt | 4 +- .../ir/descriptors/WrappedDescriptors.kt | 46 ++-- .../kotlin/ir/types/IrTypeSystemContext.kt | 6 +- .../kotlin/ir/util/AdditionalIrUtils.kt | 4 +- .../kotlin/ir/util/DescriptorToIrUtil.kt | 16 +- .../jetbrains/kotlin/ir/util/SymbolTable.kt | 16 +- .../common/overrides/FakeOverrideChecker.kt | 4 +- .../common/overrides/IrOverridingUtil.kt | 14 +- .../common/overrides/IrVisibilityUtil.kt | 6 +- .../serialization/encodings/BinaryFlags.kt | 14 +- .../DescriptorExportCheckerVisitor.kt | 6 +- .../mangle/ir/IrExportCheckerVisitor.kt | 8 +- .../javac/resolve/KotlinClassifiersCache.kt | 20 +- .../kotlin/javac/resolve/ResolveHelper.kt | 10 +- .../wrappers/symbols/FakeSymbolBasedClass.kt | 6 +- .../wrappers/symbols/SymbolBasedClass.kt | 4 +- .../wrappers/symbols/SymbolBasedMember.kt | 6 +- .../kotlin/javac/wrappers/symbols/utils.kt | 22 +- .../javac/wrappers/trees/TreeBasedClass.kt | 6 +- .../wrappers/trees/TreeBasedConstructor.kt | 6 +- .../javac/wrappers/trees/TreeBasedField.kt | 10 +- .../javac/wrappers/trees/TreeBasedMethod.kt | 8 +- .../kotlin/javac/wrappers/trees/utils.kt | 4 +- .../classes/ultraLightMembersCreator.kt | 6 +- .../jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt | 14 +- .../components/CallableReferenceResolution.kt | 4 +- .../calls/components/ResolutionParts.kt | 6 +- .../kotlin/resolve/calls/tower/TowerLevels.kt | 2 +- .../multiplatform/ExpectedActualResolver.kt | 2 +- .../codegen/AbstractLightAnalysisModeTest.kt | 4 +- .../builtins/jvm/CloneableClassScope.kt | 2 +- .../builtins/jvm/JvmBuiltInsSettings.kt | 2 +- ...s.java => JavaDescriptorVisibilities.java} | 34 +-- .../descriptors/JavaMethodDescriptor.java | 2 +- .../descriptors/JavaPropertyDescriptor.java | 6 +- .../descriptors/LazyJavaClassDescriptor.kt | 4 +- .../descriptors/LazyJavaClassMemberScope.kt | 6 +- .../load/java/structure/javaElements.kt | 4 +- .../resolve/jvm/inlineClassManglingRules.kt | 2 +- .../structure/ReflectJavaModifierListOwner.kt | 18 +- .../functions/FunctionClassDescriptor.kt | 2 +- .../functions/FunctionInvokeDescriptor.kt | 2 +- .../kotlin/builtins/suspendFunctionTypes.kt | 6 +- .../descriptors/CallableMemberDescriptor.java | 4 +- .../descriptors/ClassConstructorDescriptor.kt | 12 +- .../kotlin/descriptors/ClassDescriptor.java | 2 +- .../descriptors/ConstructorDescriptor.java | 2 +- .../DeclarationDescriptorWithVisibility.java | 2 +- ...ities.java => DescriptorVisibilities.java} | 42 ++-- ...{Visibility.kt => DescriptorVisibility.kt} | 8 +- .../kotlin/descriptors/EffectiveVisibility.kt | 20 +- .../descriptors/EffectiveVisibilityUtils.kt | 16 +- .../descriptors/FunctionDescriptor.java | 4 +- .../kotlin/descriptors/MemberDescriptor.java | 2 +- .../kotlin/descriptors/ModalityUtils.kt | 2 +- .../kotlin/descriptors/NotFoundClasses.kt | 2 +- .../PropertyAccessorDescriptor.java | 2 +- .../descriptors/SimpleFunctionDescriptor.java | 5 +- .../AbstractReceiverParameterDescriptor.java | 4 +- .../impl/AbstractTypeAliasDescriptor.kt | 3 +- .../impl/ClassConstructorDescriptorImpl.java | 6 +- .../descriptors/impl/ClassDescriptorImpl.java | 5 +- .../EnumEntrySyntheticClassDescriptor.java | 4 +- .../impl/FunctionDescriptorImpl.java | 17 +- .../impl/LazySubstitutingClassDescriptor.java | 2 +- .../impl/MutableClassDescriptor.java | 6 +- .../impl/PropertyAccessorDescriptorImpl.java | 10 +- .../impl/PropertyDescriptorImpl.java | 24 +- .../impl/PropertyGetterDescriptorImpl.java | 2 +- .../impl/PropertySetterDescriptorImpl.java | 2 +- .../impl/SimpleFunctionDescriptorImpl.java | 6 +- .../impl/TypeAliasConstructorDescriptor.kt | 20 +- .../impl/ValueParameterDescriptorImpl.kt | 2 +- .../kotlin/renderer/DescriptorRendererImpl.kt | 6 +- .../kotlin/resolve/DescriptorFactory.java | 6 +- .../kotlin/resolve/DescriptorUtils.java | 10 +- .../kotlin/resolve/DescriptorUtils.kt | 2 +- .../kotlin/resolve/OverridingUtil.java | 40 ++-- .../kotlin/resolve/VisibilityUtil.kt | 4 +- .../jetbrains/kotlin/types/ErrorUtils.java | 6 +- .../ErrorSimpleFunctionDescriptorImpl.java | 4 +- .../deserialization/MemberDeserializer.kt | 18 +- .../deserialization/ProtoEnumFlags.kt | 28 +-- .../DeserializedMemberDescriptor.kt | 89 ++++---- .../jvm/internal/KDeclarationContainerImpl.kt | 4 +- .../reflect/jvm/internal/KPropertyImpl.kt | 2 +- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 4 +- .../src/kotlin/reflect/jvm/internal/util.kt | 10 +- .../idea/KotlinDescriptorIconProvider.java | 10 +- .../KotlinStructureViewElement.kt | 14 +- .../smart/TypeInstantiationItems.kt | 2 +- .../org/jetbrains/kotlin/idea/core/Utils.kt | 4 +- .../kotlin/idea/core/descriptorUtils.kt | 18 +- .../OverrideMembersHandler.kt | 2 +- .../DebuggerFieldSyntheticScopeProvider.kt | 8 +- .../compilation/CodeFragmentCompiler.kt | 4 +- .../CodeFragmentParameterAnalyzer.kt | 4 +- .../DebugLabelPropertyDescriptorProvider.kt | 4 +- .../idea/debugger/FileRankingCalculator.kt | 6 +- ...recatedCallableAddReplaceWithInspection.kt | 4 +- .../KotlinRedundantOverrideInspection.kt | 4 +- .../RedundantCompanionReferenceInspection.kt | 4 +- .../RedundantVisibilityModifierInspection.kt | 8 +- .../inspections/UnusedSymbolInspection.kt | 4 +- .../AddThrowsAnnotationIntention.kt | 6 +- .../ChangeVisibilityModifierIntention.kt | 8 +- .../CreateKotlinSubClassIntention.kt | 14 +- .../idea/quickfix/ChangeVisibilityFix.kt | 16 +- .../ChangeVisibilityOnExposureFactory.kt | 18 +- .../idea/quickfix/MakeVisibleFactory.kt | 2 +- .../callableBuilder/CallableBuilder.kt | 2 +- .../callableBuilder/CallableInfo.kt | 4 +- ...teClassFromConstructorCallActionFactory.kt | 6 +- .../createClass/CreateClassFromUsageFix.kt | 4 +- .../changeSignature/KotlinChangeInfo.kt | 22 +- .../KotlinChangeSignatureData.kt | 2 +- .../KotlinChangeSignatureUsageProcessor.kt | 2 +- .../changeSignature/KotlinMethodDescriptor.kt | 4 +- .../KotlinMutableMethodDescriptor.kt | 6 +- .../ui/KotlinChangePropertySignatureDialog.kt | 10 +- .../ui/KotlinChangeSignatureCompat.kt | 4 +- .../ui/KotlinChangeSignatureDialog.kt | 24 +- .../extractionEngine/extractorUtil.kt | 6 +- .../moveDeclarations/moveConflictUtils.kt | 33 ++- .../moveMethod/MoveKotlinMethodProcessor.kt | 4 +- .../pullUp/pullUpConflictsUtils.kt | 4 +- .../pushDown/pushDownConflictsUtils.kt | 2 +- .../refactoring/rename/renameConflictUtils.kt | 4 +- .../idea/util/ImportInsertHelperImpl.kt | 2 +- .../KotlinChangeSignatureTest.kt | 20 +- .../js/descriptorUtils/descriptorUtils.kt | 4 +- .../kotlin/js/naming/NameSuggestion.kt | 10 +- .../resolve/diagnostics/JsExternalChecker.kt | 2 +- .../js/resolve/nativeAnnotationCheckers.kt | 4 +- .../js/translate/utils/AnnotationsUtils.java | 2 +- .../js/translate/context/UsageTracker.kt | 2 +- .../declaration/ClassModelGenerator.kt | 4 +- .../expression/LiteralFunctionTranslator.kt | 2 +- .../reference/CallableReferenceTranslator.kt | 2 +- .../js/translate/utils/signatureUtils.kt | 2 +- .../builder/CommonizedClassDescriptor.kt | 34 +-- .../builder/CommonizedTypeAliasDescriptor.kt | 12 +- .../commonizer/cir/CirDeclaration.kt | 2 +- .../commonizer/cir/CirFunctionOrProperty.kt | 4 +- .../cir/factory/CirClassConstructorFactory.kt | 18 +- .../commonizer/cir/factory/CirClassFactory.kt | 28 +-- .../cir/factory/CirFunctionFactory.kt | 24 +- .../cir/factory/CirPropertyFactory.kt | 40 ++-- .../cir/factory/CirPropertySetterFactory.kt | 20 +- .../cir/factory/CirTypeAliasFactory.kt | 14 +- .../commonizer/cir/factory/CirTypeFactory.kt | 14 +- .../cir/impl/CirClassConstructorImpl.kt | 18 +- .../commonizer/cir/impl/CirClassImpl.kt | 28 +-- .../commonizer/cir/impl/CirFunctionImpl.kt | 26 +-- .../commonizer/cir/impl/CirPropertyImpl.kt | 40 ++-- .../cir/impl/CirPropertySetterImpl.kt | 14 +- .../commonizer/cir/impl/CirSimpleTypeImpl.kt | 10 +- .../commonizer/cir/impl/CirTypeAliasImpl.kt | 14 +- .../commonizer/core/AnnotationsCommonizer.kt | 4 +- .../core/PropertySetterCommonizer.kt | 4 +- .../commonizer/core/VisibilityCommonizer.kt | 36 +-- .../EqualizingVisibilityCommonizerTest.kt | 10 +- .../core/LoweringVisibilityCommonizerTest.kt | 8 +- .../core/PropertySetterCommonizerTest.kt | 8 +- .../descriptors/commonizer/utils/mocks.kt | 4 +- .../parcel/ParcelableResolveExtension.kt | 4 +- .../parcel/ir/ParcelableIrTransformer.kt | 4 +- ...oidExtensionsExpressionCodegenExtension.kt | 4 +- .../synthetic/codegen/AndroidIrExtension.kt | 2 +- .../res/syntheticDescriptorGeneration.kt | 8 +- .../kotlin/jvm/abi/asm/AbiClassBuilder.kt | 6 +- .../compiler/backend/ir/Synthetics.kt | 4 +- .../backend/jvm/SerialInfoCodegenImpl.kt | 4 +- .../resolve/KSerializerDescriptorResolver.kt | 26 +-- .../resolve/SerializableProperties.kt | 4 +- ...AbstractNoArgExpressionCodegenExtension.kt | 2 +- .../resolve/LazyScriptClassMemberScope.kt | 2 +- .../resolve/ReplResultPropertyDescriptor.kt | 4 +- .../ScriptProvidedPropertiesDescriptor.kt | 2 +- .../ScriptProvidedPropertyDescriptor.kt | 4 +- 379 files changed, 2240 insertions(+), 2250 deletions(-) rename core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/{JavaVisibilities.java => JavaDescriptorVisibilities.java} (77%) rename core/descriptors/src/org/jetbrains/kotlin/descriptors/{Visibilities.java => DescriptorVisibilities.java} (90%) rename core/descriptors/src/org/jetbrains/kotlin/descriptors/{Visibility.kt => DescriptorVisibility.kt} (92%) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt index 061a964d9c4..df47a0a0e52 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf @@ -41,7 +41,7 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri childSerializer: DescriptorSerializer ) { super.serializeClass(descriptor, proto, versionRequirementTable, childSerializer) - if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) { + if (descriptor.visibility == JavaDescriptorVisibilities.PACKAGE_VISIBILITY) { proto.setExtension(JavaClassProtoBuf.isPackagePrivateClass, true) } } @@ -50,7 +50,7 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri proto: ProtoBuf.Constructor.Builder, childSerializer: DescriptorSerializer) { super.serializeConstructor(descriptor, proto, childSerializer) - if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) { + if (descriptor.visibility == JavaDescriptorVisibilities.PACKAGE_VISIBILITY) { proto.setExtension(JavaClassProtoBuf.isPackagePrivateConstructor, true) } } @@ -62,7 +62,7 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri childSerializer: DescriptorSerializer ) { super.serializeFunction(descriptor, proto, versionRequirementTable, childSerializer) - if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) { + if (descriptor.visibility == JavaDescriptorVisibilities.PACKAGE_VISIBILITY) { proto.setExtension(JavaClassProtoBuf.isPackagePrivateMethod, true) } @@ -78,7 +78,7 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri childSerializer: DescriptorSerializer ) { super.serializeProperty(descriptor, proto, versionRequirementTable, childSerializer) - if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) { + if (descriptor.visibility == JavaDescriptorVisibilities.PACKAGE_VISIBILITY) { proto.setExtension(JavaClassProtoBuf.isPackagePrivateField, true) } diff --git a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt index c22964443cf..cff64826e5d 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.incremental -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufClassKind import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufPackageKind import org.jetbrains.kotlin.incremental.storage.ProtoMapValue @@ -49,7 +49,7 @@ fun ProtoMapValue.toProtoData(packageFqName: FqName): ProtoData = } internal val MessageLite.isPrivate: Boolean - get() = Visibilities.isPrivate( + get() = DescriptorVisibilities.isPrivate( ProtoEnumFlags.visibility( when (this) { is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) @@ -346,4 +346,4 @@ val ProtoBuf.Class.typeTableOrNull: ProtoBuf.TypeTable? get() = if (hasTypeTable()) typeTable else null val ProtoBuf.Package.typeTableOrNull: ProtoBuf.TypeTable? - get() = if (hasTypeTable()) typeTable else null \ No newline at end of file + get() = if (hasTypeTable()) typeTable else null diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt index 8071325661c..8b8f776ccc6 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt @@ -65,7 +65,7 @@ object CodegenUtil { if (copy) copyFunctions( declaration, traitMember, declaration.containingDeclaration, traitMember.modality, - Visibilities.PUBLIC, CallableMemberDescriptor.Kind.DECLARATION, true + DescriptorVisibilities.PUBLIC, CallableMemberDescriptor.Kind.DECLARATION, true ) else mapMembers(declaration, traitMember) ) @@ -74,13 +74,13 @@ object CodegenUtil { } fun copyFunctions( - inheritedMember: CallableMemberDescriptor, - traitMember: CallableMemberDescriptor, - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: CallableMemberDescriptor.Kind, - copyOverrides: Boolean + inheritedMember: CallableMemberDescriptor, + traitMember: CallableMemberDescriptor, + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: CallableMemberDescriptor.Kind, + copyOverrides: Boolean ): Map = mapMembers(inheritedMember.copy(newOwner, modality, visibility, kind, copyOverrides), traitMember) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCompanionObjectInstanceFieldDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCompanionObjectInstanceFieldDescriptor.kt index 4ffb759e231..da3d2ed1624 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCompanionObjectInstanceFieldDescriptor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCompanionObjectInstanceFieldDescriptor.kt @@ -27,7 +27,7 @@ class AccessorForCompanionObjectInstanceFieldDescriptor( null, null, emptyList(), emptyList(), companionObjectDescriptor.defaultType, Modality.FINAL, - Visibilities.LOCAL + DescriptorVisibilities.LOCAL ) } @@ -41,4 +41,4 @@ class AccessorForCompanionObjectInstanceFieldDescriptor( ): FunctionDescriptorImpl { throw UnsupportedOperationException("Accessor for companion object $companionObjectDescriptor should not be substituted") } -} \ No newline at end of file +} diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt index 676a297f258..c59781e6ddd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForConstructorDescriptor.kt @@ -42,11 +42,11 @@ class AccessorForConstructorDescriptor( override fun substitute(substitutor: TypeSubstitutor) = super.substitute(substitutor) as ClassConstructorDescriptor override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: CallableMemberDescriptor.Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: CallableMemberDescriptor.Kind, + copyOverrides: Boolean ): AccessorForConstructorDescriptor { throw UnsupportedOperationException() } @@ -61,7 +61,7 @@ class AccessorForConstructorDescriptor( copyValueParameters(calleeDescriptor), calleeDescriptor.returnType, Modality.FINAL, - Visibilities.LOCAL + DescriptorVisibilities.LOCAL ) } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.kt index 6aec2ef89dc..4a99b949f11 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.kt @@ -43,7 +43,7 @@ class AccessorForFunctionDescriptor( copyValueParameters(calleeDescriptor), calleeDescriptor.returnType, Modality.FINAL, - Visibilities.LOCAL + DescriptorVisibilities.LOCAL ) isSuspend = calleeDescriptor.isSuspend diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.kt index c3119bd0858..170f618ac40 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.kt @@ -43,7 +43,7 @@ open class AccessorForPropertyDescriptor private constructor( null, Annotations.EMPTY, Modality.FINAL, - Visibilities.LOCAL, + DescriptorVisibilities.LOCAL, calleeDescriptor.isVar, Name.identifier("access$$accessorSuffix"), CallableMemberDescriptor.Kind.DECLARATION, @@ -111,7 +111,7 @@ open class AccessorForPropertyDescriptor private constructor( property, Annotations.EMPTY, Modality.FINAL, - Visibilities.LOCAL, + DescriptorVisibilities.LOCAL, false, false, false, @@ -136,7 +136,7 @@ open class AccessorForPropertyDescriptor private constructor( property, Annotations.EMPTY, Modality.FINAL, - Visibilities.LOCAL, + DescriptorVisibilities.LOCAL, false, false, false, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index 17af71ee5a8..6d3759a9697 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -142,7 +142,7 @@ public abstract class AnnotationCodegen { && !applicableTargets.contains(KotlinTarget.CLASS) && !applicableTargets.contains(KotlinTarget.ANNOTATION_CLASS)) { ClassDescriptor classDescriptor = (ClassDescriptor) annotated; - if (classDescriptor.getVisibility() == Visibilities.LOCAL) { + if (classDescriptor.getVisibility() == DescriptorVisibilities.LOCAL) { assert applicableTargets.contains(KotlinTarget.EXPRESSION) : "Inconsistent target list for object literal annotation: " + applicableTargets + " on " + annotated; continue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 31d971ff096..8c08f229b78 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.*; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.lexer.KtTokens; -import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil; import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable; @@ -82,16 +82,16 @@ public class AsmUtil { public static final int NO_FLAG_PACKAGE_PRIVATE = 0; @NotNull - private static final Map visibilityToAccessFlag = ImmutableMap.builder() - .put(Visibilities.PRIVATE, ACC_PRIVATE) - .put(Visibilities.PRIVATE_TO_THIS, ACC_PRIVATE) - .put(Visibilities.PROTECTED, ACC_PROTECTED) - .put(JavaVisibilities.PROTECTED_STATIC_VISIBILITY, ACC_PROTECTED) - .put(JavaVisibilities.PROTECTED_AND_PACKAGE, ACC_PROTECTED) - .put(Visibilities.PUBLIC, ACC_PUBLIC) - .put(Visibilities.INTERNAL, ACC_PUBLIC) - .put(Visibilities.LOCAL, NO_FLAG_LOCAL) - .put(JavaVisibilities.PACKAGE_VISIBILITY, NO_FLAG_PACKAGE_PRIVATE) + private static final Map visibilityToAccessFlag = ImmutableMap.builder() + .put(DescriptorVisibilities.PRIVATE, ACC_PRIVATE) + .put(DescriptorVisibilities.PRIVATE_TO_THIS, ACC_PRIVATE) + .put(DescriptorVisibilities.PROTECTED, ACC_PROTECTED) + .put(JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY, ACC_PROTECTED) + .put(JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE, ACC_PROTECTED) + .put(DescriptorVisibilities.PUBLIC, ACC_PUBLIC) + .put(DescriptorVisibilities.INTERNAL, ACC_PUBLIC) + .put(DescriptorVisibilities.LOCAL, NO_FLAG_LOCAL) + .put(JavaDescriptorVisibilities.PACKAGE_VISIBILITY, NO_FLAG_PACKAGE_PRIVATE) .build(); public static final String CAPTURED_PREFIX = "$"; @@ -395,7 +395,7 @@ public class AsmUtil { flags |= getDeprecatedAccessFlag(functionDescriptor); if (deprecationResolver.isDeprecatedHidden(functionDescriptor) || isInlineWithReified(functionDescriptor) || - functionDescriptor.isSuspend() && functionDescriptor.getVisibility().equals(Visibilities.PRIVATE)) { + functionDescriptor.isSuspend() && functionDescriptor.getVisibility().equals(DescriptorVisibilities.PRIVATE)) { flags |= ACC_SYNTHETIC; } return flags; @@ -410,7 +410,7 @@ public class AsmUtil { if (specialCase != null) { return specialCase; } - Visibility visibility = descriptor.getVisibility(); + DescriptorVisibility visibility = descriptor.getVisibility(); Integer defaultMapping = getVisibilityAccessFlag(visibility); if (defaultMapping == null) { throw new IllegalStateException(visibility + " is not a valid visibility in backend for " + DescriptorRenderer.DEBUG_TEXT.render(descriptor)); @@ -419,7 +419,7 @@ public class AsmUtil { } @Nullable - public static Integer getVisibilityAccessFlag(Visibility visibility) { + public static Integer getVisibilityAccessFlag(DescriptorVisibility visibility) { return visibilityToAccessFlag.get(visibility); } @@ -435,11 +435,11 @@ public class AsmUtil { if (descriptor.getKind() == ClassKind.ENUM_ENTRY) { return NO_FLAG_PACKAGE_PRIVATE; } - if (descriptor.getVisibility() == Visibilities.PUBLIC || - descriptor.getVisibility() == Visibilities.PROTECTED || + if (descriptor.getVisibility() == DescriptorVisibilities.PUBLIC || + descriptor.getVisibility() == DescriptorVisibilities.PROTECTED || // TODO: should be package private, but for now Kotlin's reflection can't access members of such classes - descriptor.getVisibility() == Visibilities.LOCAL || - descriptor.getVisibility() == Visibilities.INTERNAL) { + descriptor.getVisibility() == DescriptorVisibilities.LOCAL || + descriptor.getVisibility() == DescriptorVisibilities.INTERNAL) { return ACC_PUBLIC; } return NO_FLAG_PACKAGE_PRIVATE; @@ -458,7 +458,7 @@ public class AsmUtil { int visibility = innerClass instanceof SyntheticClassDescriptorForLambda ? getVisibilityAccessFlagForAnonymous(innerClass) - : innerClass.getVisibility() == Visibilities.LOCAL + : innerClass.getVisibility() == DescriptorVisibilities.LOCAL ? ACC_PUBLIC : getVisibilityAccessFlag(innerClass); return visibility | @@ -511,7 +511,7 @@ public class AsmUtil { @Nullable private static Integer specialCaseVisibility(@NotNull MemberDescriptor memberDescriptor, @Nullable OwnerKind kind) { DeclarationDescriptor containingDeclaration = memberDescriptor.getContainingDeclaration(); - Visibility memberVisibility = memberDescriptor.getVisibility(); + DescriptorVisibility memberVisibility = memberDescriptor.getVisibility(); if (JvmCodegenUtil.isNonIntrinsicPrivateCompanionObjectInInterface(memberDescriptor)) { return ACC_PUBLIC; @@ -534,7 +534,7 @@ public class AsmUtil { return ACC_PRIVATE; } - if (memberVisibility == Visibilities.LOCAL && memberDescriptor instanceof CallableMemberDescriptor) { + if (memberVisibility == DescriptorVisibilities.LOCAL && memberDescriptor instanceof CallableMemberDescriptor) { return ACC_PUBLIC; } @@ -564,7 +564,7 @@ public class AsmUtil { } } - if (memberDescriptor instanceof CallableDescriptor && memberVisibility == Visibilities.PROTECTED) { + if (memberDescriptor instanceof CallableDescriptor && memberVisibility == DescriptorVisibilities.PROTECTED) { for (CallableDescriptor overridden : DescriptorUtils.getAllOverriddenDescriptors((CallableDescriptor) memberDescriptor)) { if (isJvmInterface(overridden.getContainingDeclaration())) { return ACC_PUBLIC; @@ -572,7 +572,7 @@ public class AsmUtil { } } - if (!Visibilities.isPrivate(memberVisibility)) { + if (!DescriptorVisibilities.isPrivate(memberVisibility)) { return null; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index aa7266e481b..1c5772c10ca 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -321,7 +321,7 @@ class CollectionStubMethodGenerator( ) child.modality = Modality.FINAL - child.visibility = Visibilities.PUBLIC + child.visibility = DescriptorVisibilities.PUBLIC val typeParameters = descriptor.typeConstructor.parameters val newTypeParameters = ArrayList(typeParameters.size) DescriptorSubstitutor.substituteTypeParameters(typeParameters, TypeSubstitution.EMPTY, child, newTypeParameters) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt index 330b4c8e44e..9b543c0aed6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt @@ -268,7 +268,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) { if (CodegenBinding.canHaveOuter(state.bindingContext, classDescriptor)) return false - if (Visibilities.isPrivate(constructorDescriptor.visibility)) return false + if (DescriptorVisibilities.isPrivate(constructorDescriptor.visibility)) return false if (constructorDescriptor.valueParameters.isEmpty()) return false if (classOrObject is KtClass && hasSecondaryConstructorsWithNoParameters(classOrObject)) return false diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 957a0b913f6..6c0698268fa 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -2181,7 +2181,7 @@ public class ExpressionCodegen extends KtVisitor impleme } else if (isBackingFieldMovedFromCompanion && (forceField || - (Visibilities.isPrivate(propertyDescriptor.getVisibility()) && + (DescriptorVisibilities.isPrivate(propertyDescriptor.getVisibility()) && isDefaultAccessor(propertyDescriptor.getGetter()) && isDefaultAccessor(propertyDescriptor.getSetter())))) { fieldAccessorKind = JvmCodegenUtil.isDebuggerContext(context) ? AccessorKind.NORMAL : AccessorKind.IN_CLASS_COMPANION; } @@ -2254,7 +2254,7 @@ public class ExpressionCodegen extends KtVisitor impleme skipPropertyAccessors = forceField; if (JvmCodegenUtil.isDebuggerContext(context) - && Visibilities.isPrivate(propertyDescriptor.getVisibility()) + && DescriptorVisibilities.isPrivate(propertyDescriptor.getVisibility()) && bindingContext.get(BACKING_FIELD_REQUIRED, propertyDescriptor) == Boolean.TRUE ) { skipPropertyAccessors = true; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index a3213b86605..5867c852901 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -1152,7 +1152,7 @@ public class FunctionCodegen { // $default methods are never private to be accessible from other class files (e.g. inner) without the need of synthetic accessors // $default methods are never protected to be accessible from subclass nested classes int visibilityFlag = - Visibilities.isPrivate(functionDescriptor.getVisibility()) || isInlineOnlyPrivateInBytecode(functionDescriptor) + DescriptorVisibilities.isPrivate(functionDescriptor.getVisibility()) || isInlineOnlyPrivateInBytecode(functionDescriptor) ? AsmUtil.NO_FLAG_PACKAGE_PRIVATE : Opcodes.ACC_PUBLIC; int flags = visibilityFlag | getDeprecatedAccessFlag(functionDescriptor) | ACC_SYNTHETIC; if (!(functionDescriptor instanceof ConstructorDescriptor && @@ -1685,7 +1685,7 @@ public class FunctionCodegen { } else { switch (kind) { case DEFAULT_IMPLS: return true; - case IMPLEMENTATION: return !Visibilities.isPrivate(memberDescriptor.getVisibility()) && !isDefault && !isSynthetic; + case IMPLEMENTATION: return !DescriptorVisibilities.isPrivate(memberDescriptor.getVisibility()) && !isDefault && !isSynthetic; default: return false; } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 9380597b675..3182cd2c0b1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -817,7 +817,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } if (properVisibilityForCompanionObjectInstanceField && JvmCodegenUtil.isCompanionObjectInInterfaceNotIntrinsic(companionObjectDescriptor) && - Visibilities.isPrivate(companionObjectDescriptor.getVisibility())) { + DescriptorVisibilities.isPrivate(companionObjectDescriptor.getVisibility())) { fieldAccessFlags |= ACC_SYNTHETIC; } StackValue.Field field = StackValue.singleton(companionObjectDescriptor, typeMapper); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt index 32067b8bf9e..16255dec118 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt @@ -65,7 +65,7 @@ class InterfaceImplBodyCodegen( if (memberDescriptor !is CallableMemberDescriptor) continue if (memberDescriptor.kind.isReal) continue - if (memberDescriptor.visibility == Visibilities.INVISIBLE_FAKE) continue + if (memberDescriptor.visibility == DescriptorVisibilities.INVISIBLE_FAKE) continue if (memberDescriptor.modality == Modality.ABSTRACT) continue val implementation = findImplementationFromInterface(memberDescriptor) ?: continue diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index f17d3ad7f23..d054e21b018 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -221,7 +221,7 @@ public class JvmCodegenUtil { if (DescriptorPsiUtilsKt.hasBody(accessor)) return false; // If the accessor is private or final, it can't be overridden in the subclass and thus we can use direct access - return Visibilities.isPrivate(accessor.getVisibility()) || accessor.getModality() == FINAL; + return DescriptorVisibilities.isPrivate(accessor.getVisibility()) || accessor.getModality() == FINAL; } public static boolean isDebuggerContext(@NotNull CodegenContext context) { @@ -345,7 +345,7 @@ public class JvmCodegenUtil { public static boolean isNonIntrinsicPrivateCompanionObjectInInterface(@NotNull DeclarationDescriptorWithVisibility companionObject) { return isCompanionObjectInInterfaceNotIntrinsic(companionObject) && - Visibilities.isPrivate(companionObject.getVisibility()); + DescriptorVisibilities.isPrivate(companionObject.getVisibility()); } public static boolean isDeclarationOfBigArityFunctionInvoke(@Nullable DeclarationDescriptor descriptor) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.kt index c5e8272d954..a6e32c1f5da 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.kt @@ -86,7 +86,7 @@ class JvmRuntimeTypes( packageFragment, classKind, false, false, Name.identifier(name), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS ).apply { modality = Modality.FINAL - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC setTypeParameterDescriptors(emptyList()) createTypeConstructor() } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 6ff005e030c..0777708e269 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil; import org.jetbrains.kotlin.load.java.DescriptorsJvmAbiUtil; -import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; @@ -469,7 +469,7 @@ public abstract class MemberCodegen"), SYNTHESIZED, KotlinSourceElementKt.toSourceElement(element)); clInit.initialize(null, null, Collections.emptyList(), Collections.emptyList(), DescriptorUtilsKt.getModule(descriptor).getBuiltIns().getUnitType(), - Modality.FINAL, Visibilities.PRIVATE); + Modality.FINAL, DescriptorVisibilities.PRIVATE); return clInit; } @@ -882,7 +882,7 @@ public abstract class MemberCodegen$cp' and avoid some // useless indirection by using others accessors. if (isCompanionObject(descriptor.getContainingDeclaration())) { - if (Visibilities.isPrivate(descriptor.getVisibility()) && isDefaultGetterAndSetter) { + if (DescriptorVisibilities.isPrivate(descriptor.getVisibility()) && isDefaultGetterAndSetter) { return false; } return true; @@ -228,14 +228,14 @@ public class PropertyCodegen { if (isTopLevelInJvmMultifileClass(descriptor)) return true; // Private class properties have accessors only in cases when those accessors are non-trivial - if (Visibilities.isPrivate(descriptor.getVisibility())) { + if (DescriptorVisibilities.isPrivate(descriptor.getVisibility())) { return !isDefaultAccessor; } // Non-private properties with private setter should not be generated for trivial properties // as the class will use direct field access instead //noinspection ConstantConditions - if (accessor != null && accessor.isSetter() && Visibilities.isPrivate(descriptor.getSetter().getVisibility())) { + if (accessor != null && accessor.isSetter() && DescriptorVisibilities.isPrivate(descriptor.getSetter().getVisibility())) { return !isDefaultAccessor; } @@ -254,12 +254,12 @@ public class PropertyCodegen { if (hasJvmFieldAnnotation(descriptor)) return false; if (kind == OwnerKind.ERASED_INLINE_CLASS) return false; - Visibility visibility = descriptor.getVisibility(); + DescriptorVisibility visibility = descriptor.getVisibility(); if (InlineClassesUtilsKt.isInlineClass(descriptor.getContainingDeclaration())) { return visibility.isPublicAPI(); } else { - return !Visibilities.isPrivate(visibility); + return !DescriptorVisibilities.isPrivate(visibility); } } @@ -512,7 +512,7 @@ public class PropertyCodegen { private void generateAccessor(@Nullable KtPropertyAccessor accessor, @NotNull PropertyAccessorDescriptor descriptor) { if (context instanceof MultifileClassFacadeContext && - (Visibilities.isPrivate(descriptor.getVisibility()) || + (DescriptorVisibilities.isPrivate(descriptor.getVisibility()) || AsmUtil.getVisibilityAccessFlag(descriptor) == Opcodes.ACC_PRIVATE)) { return; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index 29b070a5094..29a24b5f62d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -106,7 +106,7 @@ public class SamWrapperCodegen { SimpleFunctionDescriptor erasedInterfaceFunction = samType.getOriginalAbstractMethod().copy( classDescriptor, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, CallableMemberDescriptor.Kind.SYNTHESIZED, /*copyOverrides=*/ false ); @@ -268,12 +268,12 @@ public class SamWrapperCodegen { if (!(descriptor instanceof CallableMemberDescriptor)) continue; CallableMemberDescriptor member = (CallableMemberDescriptor) descriptor; if (member.getModality() == Modality.ABSTRACT || - Visibilities.isPrivate(member.getVisibility()) || - member.getVisibility() == Visibilities.INVISIBLE_FAKE || + DescriptorVisibilities.isPrivate(member.getVisibility()) || + member.getVisibility() == DescriptorVisibilities.INVISIBLE_FAKE || DescriptorUtils.isMethodOfAny(member)) continue; for (Map.Entry entry : CodegenUtil.INSTANCE.copyFunctions( - member, member, classDescriptor, Modality.OPEN, Visibilities.PUBLIC, CallableMemberDescriptor.Kind.DECLARATION, false + member, member, classDescriptor, Modality.OPEN, DescriptorVisibilities.PUBLIC, CallableMemberDescriptor.Kind.DECLARATION, false ).entrySet()) { ClassBodyCodegen.generateDelegationToDefaultImpl(entry.getKey(), entry.getValue(), receiverType, functionCodegen, state, false); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index f030af62da3..ebd8be89fcc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -616,7 +616,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid { String nameForClassOrPackageMember = getNameForClassOrPackageMember(functionDescriptor); if (functionDescriptor instanceof SimpleFunctionDescriptor && functionDescriptor.isSuspend() && - !functionDescriptor.getVisibility().equals(Visibilities.LOCAL)) { + !functionDescriptor.getVisibility().equals(DescriptorVisibilities.LOCAL)) { if (nameForClassOrPackageMember != null) { nameStack.push(nameForClassOrPackageMember); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index 45db9c8cc49..96eee68693c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.config.JvmDefaultMode; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities; import org.jetbrains.kotlin.resolve.sam.SamConstructorDescriptor; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; @@ -625,7 +625,7 @@ public abstract class CodegenContext { } if (descriptorContext == null && - JavaVisibilities.PROTECTED_STATIC_VISIBILITY == descriptor.getVisibility() && + JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY == descriptor.getVisibility() && (!(descriptor.getOriginal() instanceof SamConstructorDescriptor))) { //seems we need static receiver in resolved call descriptorContext = ExpressionCodegen.getParentContextSubclassOf((ClassDescriptor) enclosed, this); @@ -672,7 +672,7 @@ public abstract class CodegenContext { PropertySetterDescriptor setter = propertyDescriptor.getSetter(); int setterAccessFlag = propertyAccessFlag; - if (setter != null && setter.getVisibility().normalize() != Visibilities.INVISIBLE_FAKE) { + if (setter != null && setter.getVisibility().normalize() != DescriptorVisibilities.INVISIBLE_FAKE) { setterAccessFlag = propertyAccessFlag | getVisibilityAccessFlag(setter); } boolean setterAccessorRequired = isAccessorRequired(setterAccessFlag, unwrappedDescriptor, descriptorContext, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt index 73656fda769..df8b393aaac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt @@ -94,7 +94,7 @@ abstract class AbstractCoroutineCodegen( }, builtIns.nullableAnyType, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, userDataForDoResume ) } @@ -220,7 +220,7 @@ class CoroutineCodegenForLambda private constructor( state.languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) ), funDescriptor.modality, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) } @@ -816,4 +816,4 @@ private object FailingFunctionGenerationStrategy : FunctionGenerationStrategy() fun reportSuspensionPointInsideMonitor(element: KtElement, state: GenerationState, stackTraceElement: String) { state.diagnostics.report(ErrorsJvm.SUSPENSION_POINT_INSIDE_MONITOR.on(element, stackTraceElement)) -} \ No newline at end of file +} 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 f064ab86e4a..70913f148aa 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt @@ -494,7 +494,7 @@ fun Method.getImplForOpenMethod(ownerInternalName: String) = fun FunctionDescriptor.isSuspendLambdaOrLocalFunction() = this.isSuspend && when (this) { is AnonymousFunctionDescriptor -> this.isSuspendLambda - is SimpleFunctionDescriptor -> this.visibility == Visibilities.LOCAL + is SimpleFunctionDescriptor -> this.visibility == DescriptorVisibilities.LOCAL else -> false } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FictitiousArrayConstructor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FictitiousArrayConstructor.kt index 2616e328523..cbb7fcf9243 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FictitiousArrayConstructor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FictitiousArrayConstructor.kt @@ -31,7 +31,7 @@ internal class FictitiousArrayConstructor(arrayClass: ClassDescriptor) : SimpleF return FictitiousArrayConstructor(arrayClass).apply { this.initialize( null, null, arrayConstructor.typeParameters, arrayConstructor.valueParameters, arrayClass.defaultType, - Modality.FINAL, Visibilities.PUBLIC + Modality.FINAL, DescriptorVisibilities.PUBLIC ) this.isInline = true } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt index f84e1f81941..10da4a93ccd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.kt @@ -63,15 +63,15 @@ class JvmSerializerExtension @JvmOverloads constructor( override fun shouldUseTypeTable(): Boolean = useTypeTable override fun shouldSerializeFunction(descriptor: FunctionDescriptor): Boolean { - return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != Visibilities.PRIVATE + return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != DescriptorVisibilities.PRIVATE } override fun shouldSerializeProperty(descriptor: PropertyDescriptor): Boolean { - return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != Visibilities.PRIVATE + return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != DescriptorVisibilities.PRIVATE } override fun shouldSerializeTypeAlias(descriptor: TypeAliasDescriptor): Boolean { - return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != Visibilities.PRIVATE + return classBuilderMode != ClassBuilderMode.ABI || descriptor.visibility != DescriptorVisibilities.PRIVATE } override fun shouldSerializeNestedClass(descriptor: ClassDescriptor): Boolean { @@ -233,7 +233,7 @@ class JvmSerializerExtension @JvmOverloads constructor( private fun FunctionDescriptor.needsInlineParameterNullCheckRequirement(): Boolean = isInline && !isSuspend && !isParamAssertionsDisabled && - !Visibilities.isPrivate(visibility) && + !DescriptorVisibilities.isPrivate(visibility) && (valueParameters.any { it.type.isFunctionType } || extensionReceiverParameter?.type?.isFunctionType == true) override fun serializeProperty( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index cee0a2fe39c..8ebd8c1892d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -202,7 +202,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics( fun processMember(member: DeclarationDescriptor?) { if (member !is CallableMemberDescriptor) return // a member of super is not visible: no override - if (member.visibility == Visibilities.INVISIBLE_FAKE) return + if (member.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return // if a signature clashes with a SAM-adapter or something like that, there's no harm if (isOrOverridesSamAdapter(member)) return @@ -231,7 +231,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics( descriptor.getParentJavaStaticClassScope()?.run { getContributedDescriptors(DescriptorKindFilter.FUNCTIONS) .filter { - it is FunctionDescriptor && Visibilities.isVisibleIgnoringReceiver(it, descriptor) + it is FunctionDescriptor && DescriptorVisibilities.isVisibleIgnoringReceiver(it, descriptor) } .forEach(::processMember) } 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 4e5ed42857d..43cb5c49e4d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -449,7 +449,7 @@ class KotlinTypeMapper @JvmOverloads constructor( else mapClass(ownerForDefault) - if (isInterface && (superCall || descriptor.visibility == Visibilities.PRIVATE || isAccessor(descriptor))) { + if (isInterface && (superCall || descriptor.visibility == DescriptorVisibilities.PRIVATE || isAccessor(descriptor))) { thisClass = mapClass(functionParent) dispatchReceiverKotlinType = functionParent.defaultType if (declarationOwner is JavaClassDescriptor || @@ -495,7 +495,7 @@ class KotlinTypeMapper @JvmOverloads constructor( isInterfaceMember = true } else -> { - val isPrivateFunInvocation = Visibilities.isPrivate(functionDescriptor.visibility) && !functionDescriptor.isSuspend + val isPrivateFunInvocation = DescriptorVisibilities.isPrivate(functionDescriptor.visibility) && !functionDescriptor.isSuspend invokeOpcode = if (superCall || isPrivateFunInvocation) INVOKESPECIAL else INVOKEVIRTUAL isInterfaceMember = false } @@ -677,7 +677,7 @@ class KotlinTypeMapper @JvmOverloads constructor( newName = sanitizeNameIfNeeded(newName, languageVersionSettings) if (isTopLevelDeclaration(descriptor)) { - if (Visibilities.isPrivate(descriptor.visibility) && descriptor !is ConstructorDescriptor && "" != newName) { + if (DescriptorVisibilities.isPrivate(descriptor.visibility) && descriptor !is ConstructorDescriptor && "" != newName) { val partName = getPartSimpleNameForMangling(descriptor) if (partName != null) return "$newName$$partName" } @@ -685,7 +685,7 @@ class KotlinTypeMapper @JvmOverloads constructor( } return if (descriptor !is ConstructorDescriptor && - descriptor.visibility === Visibilities.INTERNAL && + descriptor.visibility === DescriptorVisibilities.INTERNAL && !descriptor.isPublishedApi() ) { InternalNameMapper.mangleInternalName(newName, getModuleName(descriptor)) @@ -1297,7 +1297,7 @@ class KotlinTypeMapper @JvmOverloads constructor( val visibility = descriptor.visibility return if (!publicFacade || isNonConstProperty(descriptor) || - Visibilities.isPrivate(visibility) || + DescriptorVisibilities.isPrivate(visibility) || isAccessor/*Cause of KT-9603*/) { JvmFileClassUtil.getFileClassInternalName(file) } else { diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmVisibilityConverter.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmVisibilityConverter.kt index edfb88a5a18..be6e3eefd23 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmVisibilityConverter.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmVisibilityConverter.kt @@ -8,16 +8,15 @@ package org.jetbrains.kotlin.fir.backend.jvm import org.jetbrains.kotlin.fir.JavaVisibilities import org.jetbrains.kotlin.fir.Visibility import org.jetbrains.kotlin.fir.backend.Fir2IrVisibilityConverter -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility -import org.jetbrains.kotlin.load.java.JavaVisibilities as OldJavaVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility object FirJvmVisibilityConverter : Fir2IrVisibilityConverter() { override fun convertPlatformVisibility(visibility: Visibility): OldVisibility { return when (visibility) { - JavaVisibilities.PackageVisibility -> OldJavaVisibilities.PACKAGE_VISIBILITY - JavaVisibilities.ProtectedStaticVisibility -> OldJavaVisibilities.PROTECTED_STATIC_VISIBILITY - JavaVisibilities.ProtectedAndPackage -> OldJavaVisibilities.PROTECTED_AND_PACKAGE + JavaVisibilities.PackageVisibility -> org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PACKAGE_VISIBILITY + JavaVisibilities.ProtectedStaticVisibility -> org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY + JavaVisibilities.ProtectedAndPackage -> org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE else -> error("Unknown visibility: $this") } } 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 8f3d08bab65..257edc3ce55 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 @@ -56,7 +56,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility @OptIn(ObsoleteDescriptorBasedAPI::class) class Fir2IrDeclarationStorage( diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisibilityConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisibilityConverter.kt index 65d90f2c529..b95dda37731 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisibilityConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisibilityConverter.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.fir.backend import org.jetbrains.kotlin.fir.Visibilities import org.jetbrains.kotlin.fir.Visibility -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility -import org.jetbrains.kotlin.descriptors.Visibilities as OldVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities as OldVisibilities abstract class Fir2IrVisibilityConverter { object Default : Fir2IrVisibilityConverter() { @@ -19,14 +19,14 @@ abstract class Fir2IrVisibilityConverter { fun convertToOldVisibility(visibility: Visibility): OldVisibility { return when (visibility) { - Visibilities.Private -> OldVisibilities.PRIVATE - Visibilities.PrivateToThis -> OldVisibilities.PRIVATE_TO_THIS - Visibilities.Protected -> OldVisibilities.PROTECTED - Visibilities.Internal -> OldVisibilities.INTERNAL - Visibilities.Public -> OldVisibilities.PUBLIC - Visibilities.Local -> OldVisibilities.LOCAL - Visibilities.InvisibleFake -> OldVisibilities.INVISIBLE_FAKE - Visibilities.Unknown -> OldVisibilities.UNKNOWN + Visibilities.Private -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE + Visibilities.PrivateToThis -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE_TO_THIS + Visibilities.Protected -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PROTECTED + Visibilities.Internal -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.INTERNAL + Visibilities.Public -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC + Visibilities.Local -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.LOCAL + Visibilities.InvisibleFake -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.INVISIBLE_FAKE + Visibilities.Unknown -> org.jetbrains.kotlin.descriptors.DescriptorVisibilities.UNKNOWN else -> convertPlatformVisibility(visibility) } } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt index ba02bded66f..ae56c1d2995 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtPropertyDelegate import org.jetbrains.kotlin.psi2ir.generators.hasNoSideEffects import org.jetbrains.kotlin.utils.SmartList -import org.jetbrains.kotlin.descriptors.Visibilities as OldVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities as OldVisibilities class CallAndReferenceGenerator( private val components: Fir2IrComponents, @@ -254,7 +254,7 @@ class CallAndReferenceGenerator( IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE, irAdapterSymbol, adaptee.name, - OldVisibilities.LOCAL, + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.LOCAL, Modality.FINAL, returnType, isInline = firAdaptee.isInline, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt index 6dd35595ecb..d102a51c999 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.DataClassMembersGenerator import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.descriptors.Visibilities as OldVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities as OldVisibilities /** * A generator that generates synthetic members of data class as well as part of inline class. diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt index 8d40975a121..bd62b5e57b8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.backend.generators import org.jetbrains.kotlin.backend.common.ir.isFinalClass import org.jetbrains.kotlin.backend.common.ir.isOverridable import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities as OldVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities as OldVisibilities import org.jetbrains.kotlin.fir.Visibilities import org.jetbrains.kotlin.fir.backend.* import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter @@ -142,7 +142,7 @@ internal class DelegatedMemberGenerator( private fun IrDeclaration.isOverridable(): Boolean { return when (this) { is IrSimpleFunction -> this.isOverridable - is IrProperty -> visibility != OldVisibilities.PRIVATE && modality != Modality.FINAL && (parent as? IrClass)?.isFinalClass != true + is IrProperty -> visibility != org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE && modality != Modality.FINAL && (parent as? IrClass)?.isFinalClass != true else -> false } } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt index 2d8df2a0557..628691a2f5b 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.types.IrErrorType import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.IrTypeProjection -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name class FakeOverrideGenerator( @@ -46,7 +46,7 @@ class FakeOverrideGenerator( private fun FirCallableMemberDeclaration<*>.allowsToHaveFakeOverrideIn(klass: FirClass<*>): Boolean { if (!allowsToHaveFakeOverride) return false - if (this.visibility != JavaVisibilities.PACKAGE_VISIBILITY) return true + if (this.visibility != JavaDescriptorVisibilities.PACKAGE_VISIBILITY) return true return this.symbol.callableId.packageName == klass.symbol.classId.packageFqName } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt index 14255170f9b..92359665f1f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility class Fir2IrLazyClass( components: Fir2IrComponents, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt index 9cb618cc6be..e5772c4a43c 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.util.parentClassOrNull import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility class Fir2IrLazyConstructor( components: Fir2IrComponents, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt index 7f9fa7d0430..73dfb82656a 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.util.isInterface import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility class Fir2IrLazyProperty( components: Fir2IrComponents, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt index 163c3d6e4d0..b27494c3522 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility class Fir2IrLazySimpleFunction( components: Fir2IrComponents, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index e5ff945ced0..6a40d2dfee2 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt @@ -40,9 +40,7 @@ import org.jetbrains.kotlin.load.java.typeEnhancement.TypeComponentPosition import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance.* -import org.jetbrains.kotlin.descriptors.Visibilities as OldVisibilities -import org.jetbrains.kotlin.descriptors.Visibility as OldVisibility -import org.jetbrains.kotlin.load.java.JavaVisibilities as OldJavaVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility as OldVisibility internal val JavaModifierListOwner.modality: Modality get() = when { @@ -527,16 +525,16 @@ private fun JavaType.toFirResolvedTypeRef( } fun OldVisibility.toFirVisibility(): Visibility = when (this) { - OldVisibilities.PRIVATE -> Visibilities.Private - OldVisibilities.PRIVATE_TO_THIS -> Visibilities.PrivateToThis - OldVisibilities.PROTECTED -> Visibilities.Protected - OldVisibilities.INTERNAL -> Visibilities.Internal - OldVisibilities.PUBLIC -> Visibilities.Public - OldVisibilities.LOCAL -> Visibilities.Local - OldVisibilities.INVISIBLE_FAKE -> Visibilities.InvisibleFake - OldVisibilities.UNKNOWN -> Visibilities.Unknown - OldJavaVisibilities.PACKAGE_VISIBILITY -> JavaVisibilities.PackageVisibility - OldJavaVisibilities.PROTECTED_AND_PACKAGE -> JavaVisibilities.ProtectedAndPackage - OldJavaVisibilities.PROTECTED_STATIC_VISIBILITY -> JavaVisibilities.ProtectedStaticVisibility + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE -> Visibilities.Private + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE_TO_THIS -> Visibilities.PrivateToThis + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PROTECTED -> Visibilities.Protected + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.INTERNAL -> Visibilities.Internal + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC -> Visibilities.Public + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.LOCAL -> Visibilities.Local + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.INVISIBLE_FAKE -> Visibilities.InvisibleFake + org.jetbrains.kotlin.descriptors.DescriptorVisibilities.UNKNOWN -> Visibilities.Unknown + org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PACKAGE_VISIBILITY -> JavaVisibilities.PackageVisibility + org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE -> JavaVisibilities.ProtectedAndPackage + org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY -> JavaVisibilities.ProtectedStaticVisibility else -> error("Unknown visiblity: $this") } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.kt index f5085cd1021..ed8e69130ba 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiTypeParameter import com.intellij.psi.search.SearchScope import org.jetbrains.kotlin.asJava.KtLightClassMarker import org.jetbrains.kotlin.asJava.isSyntheticValuesOrValueOfMethod -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -111,7 +111,7 @@ class JavaClassImpl(psiClass: PsiClass) : JavaClassifierImpl(psiClass) override val isFinal: Boolean get() = JavaElementUtil.isFinal(this) - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = JavaElementUtil.getVisibility(this) override val lightClassOriginKind: LightClassOriginKind? diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java index 89dd96b37c1..baaf090e85e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java @@ -20,9 +20,9 @@ import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.descriptors.Visibilities; -import org.jetbrains.kotlin.descriptors.Visibility; -import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities; +import org.jetbrains.kotlin.descriptors.DescriptorVisibility; +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities; import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; import org.jetbrains.kotlin.name.FqName; @@ -50,18 +50,18 @@ import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectio } @NotNull - public static Visibility getVisibility(@NotNull JavaModifierListOwnerImpl owner) { + public static DescriptorVisibility getVisibility(@NotNull JavaModifierListOwnerImpl owner) { PsiModifierListOwner psiOwner = owner.getPsi(); if (psiOwner.hasModifierProperty(PsiModifier.PUBLIC)) { - return Visibilities.PUBLIC; + return DescriptorVisibilities.PUBLIC; } if (psiOwner.hasModifierProperty(PsiModifier.PRIVATE)) { - return Visibilities.PRIVATE; + return DescriptorVisibilities.PRIVATE; } if (psiOwner.hasModifierProperty(PsiModifier.PROTECTED)) { - return owner.isStatic() ? JavaVisibilities.PROTECTED_STATIC_VISIBILITY : JavaVisibilities.PROTECTED_AND_PACKAGE; + return owner.isStatic() ? JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY : JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE; } - return JavaVisibilities.PACKAGE_VISIBILITY; + return JavaDescriptorVisibilities.PACKAGE_VISIBILITY; } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java index 250485886a1..f4f2f100cd0 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiDocCommentOwner; import com.intellij.psi.PsiMember; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.DescriptorVisibility; import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; import org.jetbrains.kotlin.load.java.structure.JavaClass; import org.jetbrains.kotlin.load.java.structure.JavaMember; @@ -76,7 +76,7 @@ public abstract class JavaMemberImpl extends JavaElementI @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return JavaElementUtil.getVisibility(this); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java index e83421b403f..1d3e562205c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiParameter; import com.intellij.psi.impl.compiled.ClsParameterImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.descriptors.Visibilities; -import org.jetbrains.kotlin.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities; +import org.jetbrains.kotlin.descriptors.DescriptorVisibility; import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; import org.jetbrains.kotlin.load.java.structure.JavaType; import org.jetbrains.kotlin.load.java.structure.JavaValueParameter; @@ -60,8 +60,8 @@ public class JavaValueParameterImpl extends JavaElementImpl @NotNull @Override - public Visibility getVisibility() { - return Visibilities.LOCAL; + public DescriptorVisibility getVisibility() { + return DescriptorVisibilities.LOCAL; } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/commonMixins.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/commonMixins.kt index 64fcb8b9b9e..39f71aedd0a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/commonMixins.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/commonMixins.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.load.java.structure.impl.classFiles -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.structure.JavaModifierListOwner import org.jetbrains.kotlin.load.java.structure.MapBasedJavaAnnotationOwner import org.jetbrains.org.objectweb.asm.Opcodes @@ -33,13 +33,13 @@ internal interface BinaryJavaModifierListOwner : JavaModifierListOwner, MapBased override val isAbstract get() = isSet(Opcodes.ACC_ABSTRACT) override val isStatic get() = isSet(Opcodes.ACC_STATIC) override val isFinal get() = isSet(Opcodes.ACC_FINAL) - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = when { - isSet(Opcodes.ACC_PRIVATE) -> Visibilities.PRIVATE + isSet(Opcodes.ACC_PRIVATE) -> DescriptorVisibilities.PRIVATE isSet(Opcodes.ACC_PROTECTED) -> - if (isStatic) JavaVisibilities.PROTECTED_STATIC_VISIBILITY else JavaVisibilities.PROTECTED_AND_PACKAGE - isSet(Opcodes.ACC_PUBLIC) -> Visibilities.PUBLIC - else -> JavaVisibilities.PACKAGE_VISIBILITY + if (isStatic) JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY else JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE + isSet(Opcodes.ACC_PUBLIC) -> DescriptorVisibilities.PUBLIC + else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY } override val isDeprecatedInJavaDoc get() = isSet(Opcodes.ACC_DEPRECATED) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt index 396c1092ac3..4b9ece0b228 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.psi.KtExpression @@ -70,7 +70,7 @@ class JavaTypeAccessibilityChecker : AdditionalTypeChecker { val declarationDescriptor = type.constructor.declarationDescriptor if (declarationDescriptor is JavaClassDescriptor) { - if (!Visibilities.isVisibleIgnoringReceiver(declarationDescriptor, scopeOwner)) { + if (!DescriptorVisibilities.isVisibleIgnoringReceiver(declarationDescriptor, scopeOwner)) { inaccessibleClasses.add(declarationDescriptor) } } @@ -81,4 +81,4 @@ class JavaTypeAccessibilityChecker : AdditionalTypeChecker { } } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmAnnotationsTargetNonExistentAccessorChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmAnnotationsTargetNonExistentAccessorChecker.kt index 445c27cc2e8..a99e05b5992 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmAnnotationsTargetNonExistentAccessorChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmAnnotationsTargetNonExistentAccessorChecker.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.* import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce @@ -34,7 +34,7 @@ class JvmAnnotationsTargetNonExistentAccessorChecker : DeclarationChecker { if (descriptor !is MemberDescriptor) return if (declaration !is KtParameter && declaration !is KtProperty) return - if (!Visibilities.isPrivate(descriptor.visibility) && !isSpecialStaticProperty(descriptor)) return + if (!DescriptorVisibilities.isPrivate(descriptor.visibility) && !isSpecialStaticProperty(descriptor)) return val hasGetterWithBody = declaration is KtProperty && declaration.getter?.hasBody() == true val hasSetterWithBody = declaration is KtProperty && declaration.setter?.hasBody() == true diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt index 1a8aca4500a..f537a3eb1ba 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt @@ -63,7 +63,7 @@ class JvmFieldApplicabilityChecker : DeclarationChecker { declaration.hasDelegate() -> DELEGATE !descriptor.hasBackingField(context.trace.bindingContext) -> return descriptor.isOverridable -> NOT_FINAL - Visibilities.isPrivate(descriptor.visibility) -> PRIVATE + DescriptorVisibilities.isPrivate(descriptor.visibility) -> PRIVATE declaration.hasCustomAccessor() -> CUSTOM_ACCESSOR descriptor.overriddenDescriptors.isNotEmpty() -> OVERRIDES descriptor.isLateInit -> LATEINIT @@ -92,7 +92,7 @@ class JvmFieldApplicabilityChecker : DeclarationChecker { )) { if (next !is PropertyDescriptor) continue - if (next.visibility != Visibilities.PUBLIC || next.isVar || next.modality != Modality.FINAL) return false + if (next.visibility != DescriptorVisibilities.PUBLIC || next.isVar || next.modality != Modality.FINAL) return false if (!DescriptorsJvmAbiUtil.hasJvmFieldAnnotation(next)) return false } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt index a0edbb71d23..2450134ab52 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.annotations.hasJvmStaticAnnotation import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker @@ -32,7 +32,7 @@ class ProtectedInSuperClassCompanionCallChecker : CallChecker { val targetDescriptor = resolvedCall.resultingDescriptor.original // Protected non-JVM static - if (targetDescriptor.visibility != Visibilities.PROTECTED) return + if (targetDescriptor.visibility != DescriptorVisibilities.PROTECTED) return if (targetDescriptor.hasJvmStaticAnnotation()) return val containerDescriptor = targetDescriptor.containingDeclaration // Declared in companion object diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedSyntheticExtensionCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedSyntheticExtensionCallChecker.kt index ec5c6d4d817..38134cefc59 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedSyntheticExtensionCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedSyntheticExtensionCallChecker.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext @@ -43,7 +43,7 @@ object ProtectedSyntheticExtensionCallChecker : CallChecker { val from = context.scope.ownerDescriptor // Already reported - if (!Visibilities.isVisibleIgnoringReceiver(descriptor, from)) return + if (!DescriptorVisibilities.isVisibleIgnoringReceiver(descriptor, from)) return if (resolvedCall.dispatchReceiver != null && resolvedCall.extensionReceiver !is ReceiverValue) return @@ -53,7 +53,7 @@ object ProtectedSyntheticExtensionCallChecker : CallChecker { context.languageVersionSettings ) - if (receiverTypes.none { Visibilities.isVisible(getReceiverValueWithSmartCast(null, it), sourceFunction, from) }) { + if (receiverTypes.none { DescriptorVisibilities.isVisible(getReceiverValueWithSmartCast(null, it), sourceFunction, from) }) { context.trace.report(Errors.INVISIBLE_MEMBER.on(reportOn, descriptor, descriptor.visibility, from)) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt index fd2b7ced0ec..05270d14842 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt @@ -50,7 +50,7 @@ class LocalFunInlineChecker : DeclarationChecker { if (InlineUtil.isInline(descriptor) && declaration is KtNamedFunction && descriptor is FunctionDescriptor && - descriptor.visibility == Visibilities.LOCAL) { + descriptor.visibility == DescriptorVisibilities.LOCAL) { context.trace.report(Errors.NOT_YET_SUPPORTED_IN_INLINE.on(declaration, "Local inline functions")) } } @@ -117,7 +117,7 @@ class JvmStaticChecker(jvmTarget: JvmTarget, languageVersionSettings: LanguageVe diagnosticHolder: DiagnosticSink, declaration: KtDeclaration ) { - if (descriptor.visibility != Visibilities.PUBLIC) { + if (descriptor.visibility != DescriptorVisibilities.PUBLIC) { diagnosticHolder.report(ErrorsJvm.JVM_STATIC_ON_NON_PUBLIC_MEMBER.on(declaration)) } else if (descriptor is PropertyDescriptor) { descriptor.setter?.let { checkVisibility(it, diagnosticHolder, declaration) } @@ -234,7 +234,7 @@ class OverloadsAnnotationChecker: DeclarationChecker { ErrorsJvm.OVERLOADS_ANNOTATION_CLASS_CONSTRUCTOR_WARNING diagnosticHolder.report(diagnostic.on(annotationEntry)) - } else if (!descriptor.visibility.isPublicAPI && descriptor.visibility != Visibilities.INTERNAL) { + } else if (!descriptor.visibility.isPublicAPI && descriptor.visibility != DescriptorVisibilities.INTERNAL) { diagnosticHolder.report(ErrorsJvm.OVERLOADS_PRIVATE.on(annotationEntry)) } else if (descriptor.valueParameters.none { it.declaresDefaultValue() || it.isActualParameterWithCorrespondingExpectedDefault }) { diagnosticHolder.report(ErrorsJvm.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS.on(annotationEntry)) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index e8a56cc3ac1..f7384b77a96 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java @@ -97,7 +97,7 @@ public class SignaturesPropagationData { autoValueParameters, autoReturnType, Modality.OPEN, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ); return autoMethodDescriptor; } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt index 10e5af83ff5..3330bbe05ea 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt @@ -278,15 +278,15 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l } private class MyPropertyDescriptor( - containingDeclaration: DeclarationDescriptor, - original: PropertyDescriptor?, - annotations: Annotations, - modality: Modality, - visibility: Visibility, - isVar: Boolean, - name: Name, - kind: CallableMemberDescriptor.Kind, - source: SourceElement + containingDeclaration: DeclarationDescriptor, + original: PropertyDescriptor?, + annotations: Annotations, + modality: Modality, + visibility: DescriptorVisibility, + isVar: Boolean, + name: Name, + kind: CallableMemberDescriptor.Kind, + source: SourceElement ) : SyntheticJavaPropertyDescriptor, PropertyDescriptorImpl( containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, source, /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false, /* isExternal = */ false, @@ -372,13 +372,13 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l } override fun createSubstitutedCopy( - newOwner: DeclarationDescriptor, - newModality: Modality, - newVisibility: Visibility, - original: PropertyDescriptor?, - kind: CallableMemberDescriptor.Kind, - newName: Name, - source: SourceElement + newOwner: DeclarationDescriptor, + newModality: Modality, + newVisibility: DescriptorVisibility, + original: PropertyDescriptor?, + kind: CallableMemberDescriptor.Kind, + newName: Name, + source: SourceElement ): PropertyDescriptorImpl { return MyPropertyDescriptor(newOwner, this, annotations, newModality, newVisibility, isVar, newName, kind, this.source).apply { getMethod = this@MyPropertyDescriptor.getMethod diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt index c4e2c947b92..df49a513e5a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt @@ -32,20 +32,20 @@ fun FunctionDescriptor.hasJavaOriginInHierarchy(): Boolean { original.overriddenDescriptors.any { it.hasJavaOriginInHierarchy() } } -fun Visibility.isVisibleOutside() = this != Visibilities.PRIVATE && this != Visibilities.PRIVATE_TO_THIS && this != Visibilities.INVISIBLE_FAKE +fun DescriptorVisibility.isVisibleOutside() = this != DescriptorVisibilities.PRIVATE && this != DescriptorVisibilities.PRIVATE_TO_THIS && this != DescriptorVisibilities.INVISIBLE_FAKE -fun syntheticVisibility(originalDescriptor: DeclarationDescriptorWithVisibility, isUsedForExtension: Boolean): Visibility { +fun syntheticVisibility(originalDescriptor: DeclarationDescriptorWithVisibility, isUsedForExtension: Boolean): DescriptorVisibility { val originalVisibility = originalDescriptor.visibility return when (originalVisibility) { - Visibilities.PUBLIC -> Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC -> DescriptorVisibilities.PUBLIC - else -> object : Visibility(originalVisibility.name, originalVisibility.isPublicAPI) { + else -> object : DescriptorVisibility(originalVisibility.name, originalVisibility.isPublicAPI) { override fun isVisible( receiver: ReceiverValue?, what: DeclarationDescriptorWithVisibility, from: DeclarationDescriptor ) = originalVisibility.isVisible( - if (isUsedForExtension) Visibilities.ALWAYS_SUITABLE_RECEIVER else receiver, originalDescriptor, from) + if (isUsedForExtension) DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER else receiver, originalDescriptor, from) override fun mustCheckInImports() = throw UnsupportedOperationException("Should never be called for this visibility") @@ -69,4 +69,4 @@ fun ResolvedCall.isResolvedWithSamConversions(): Boo return this.resultingDescriptor is SamAdapterDescriptor<*> || this.resultingDescriptor is SamConstructorDescriptor || this.resultingDescriptor is SamAdapterExtensionFunctionDescriptor -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt index 2ee0695719d..89d1f36b1d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt @@ -487,9 +487,9 @@ class ControlFlowInformationProvider private constructor( val receiverValue = expression.getResolvedCall(trace.bindingContext)?.getDispatchReceiverWithSmartCast() - if (Visibilities.isVisible(receiverValue, variableDescriptor, descriptor) + if (DescriptorVisibilities.isVisible(receiverValue, variableDescriptor, descriptor) && setterDescriptor != null - && !Visibilities.isVisible(receiverValue, setterDescriptor, descriptor) + && !DescriptorVisibilities.isVisible(receiverValue, setterDescriptor, descriptor) ) { report( Errors.INVISIBLE_SETTER.on( @@ -1315,4 +1315,4 @@ fun ParameterDescriptor.index(): Int = is ReceiverParameterDescriptor -> -1 is ValueParameterDescriptor -> index else -> error("expected either receiver or value parameter, but got: $this") - } \ No newline at end of file + } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt index fc8db16d1ff..a15d9df9c63 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt @@ -42,7 +42,7 @@ sealed class LocalVariableAccessorDescriptor( val returnType = if (isGetter) correspondingVariable.type else correspondingVariable.builtIns.unitType @Suppress("LeakingThis") - initialize(null, null, emptyList(), valueParameters, returnType, Modality.FINAL, Visibilities.LOCAL) + initialize(null, null, emptyList(), valueParameters, returnType, Modality.FINAL, DescriptorVisibilities.LOCAL) } private fun createValueParameter(name: Name, type: KotlinType): ValueParameterDescriptorImpl { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java index 0c2d3cf2ae0..7896674a03f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java @@ -92,8 +92,8 @@ public class LocalVariableDescriptor extends VariableDescriptorWithInitializerIm @NotNull @Override - public Visibility getVisibility() { - return Visibilities.LOCAL; + public DescriptorVisibility getVisibility() { + return DescriptorVisibilities.LOCAL; } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index a3c552bc0d0..f11a15b80e6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -123,9 +123,9 @@ public interface Errors { //Elements with "INVISIBLE_REFERENCE" error are marked as unresolved, unlike elements with "INVISIBLE_MEMBER" error //"INVISIBLE_REFERENCE" is used for invisible classes references and references in import - DiagnosticFactory3 INVISIBLE_REFERENCE = + DiagnosticFactory3 INVISIBLE_REFERENCE = DiagnosticFactory3.create(ERROR); - DiagnosticFactory3 INVISIBLE_MEMBER = DiagnosticFactory3.create(ERROR, CALL_ELEMENT); + DiagnosticFactory3 INVISIBLE_MEMBER = DiagnosticFactory3.create(ERROR, CALL_ELEMENT); DiagnosticFactory1 DEPRECATED_ACCESS_BY_SHORT_NAME = DiagnosticFactory1.create(WARNING); DiagnosticFactory1 PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL = DiagnosticFactory1.create(ERROR); @@ -496,9 +496,9 @@ public interface Errors { DiagnosticFactory2 OVERRIDING_FINAL_MEMBER = DiagnosticFactory2.create(ERROR, OVERRIDE_MODIFIER); - DiagnosticFactory3 CANNOT_WEAKEN_ACCESS_PRIVILEGE = + DiagnosticFactory3 CANNOT_WEAKEN_ACCESS_PRIVILEGE = DiagnosticFactory3.create(ERROR, VISIBILITY_MODIFIER); - DiagnosticFactory3 CANNOT_CHANGE_ACCESS_PRIVILEGE = + DiagnosticFactory3 CANNOT_CHANGE_ACCESS_PRIVILEGE = DiagnosticFactory3.create(ERROR, VISIBILITY_MODIFIER); DiagnosticFactory2 RETURN_TYPE_MISMATCH_ON_OVERRIDE = DiagnosticFactory2.create(ERROR, DECLARATION_RETURN_TYPE); @@ -1029,7 +1029,7 @@ public interface Errors { DiagnosticFactory0 LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING = DiagnosticFactory0.create(WARNING); DiagnosticFactory0 LOCAL_VARIABLE_WITH_TYPE_PARAMETERS = DiagnosticFactory0.create(ERROR); - DiagnosticFactory3 INVISIBLE_SETTER = DiagnosticFactory3.create(ERROR); + DiagnosticFactory3 INVISIBLE_SETTER = DiagnosticFactory3.create(ERROR); DiagnosticFactory1 VAL_OR_VAR_ON_LOOP_PARAMETER = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 VAL_OR_VAR_ON_FUN_PARAMETER = DiagnosticFactory1.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index 44643f094dd..1a768205f7a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt @@ -99,7 +99,7 @@ object Renderers { } @JvmField - val VISIBILITY = Renderer { + val VISIBILITY = Renderer { it.externalDisplayName } @@ -134,7 +134,7 @@ object Renderers { @JvmField val NAME_OF_CONTAINING_DECLARATION_OR_FILE = Renderer { - if (DescriptorUtils.isTopLevelDeclaration(it) && it is DeclarationDescriptorWithVisibility && it.visibility == Visibilities.PRIVATE) { + if (DescriptorUtils.isTopLevelDeclaration(it) && it is DeclarationDescriptorWithVisibility && it.visibility == DescriptorVisibilities.PRIVATE) { "file" } else { val containingDeclaration = it.containingDeclaration diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt index 070ad1fa064..1e7da298e68 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt @@ -37,18 +37,18 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner * This class has its own synthetic declaration inside. */ class SyntheticClassOrObjectDescriptor( - c: LazyClassContext, - parentClassOrObject: KtPureClassOrObject, - containingDeclaration: DeclarationDescriptor, - name: Name, - source: SourceElement, - outerScope: LexicalScope, - private val modality: Modality, - private val visibility: Visibility, - override val annotations: Annotations, - constructorVisibility: Visibility, - private val kind: ClassKind, - private val isCompanionObject: Boolean + c: LazyClassContext, + parentClassOrObject: KtPureClassOrObject, + containingDeclaration: DeclarationDescriptor, + name: Name, + source: SourceElement, + outerScope: LexicalScope, + private val modality: Modality, + private val visibility: DescriptorVisibility, + override val annotations: Annotations, + constructorVisibility: DescriptorVisibility, + private val kind: ClassKind, + private val isCompanionObject: Boolean ) : ClassDescriptorBase(c.storageManager, containingDeclaration, name, source, false), ClassDescriptorWithResolutionScopes { val syntheticDeclaration: KtPureClassOrObject = SyntheticDeclaration(parentClassOrObject, name.asString()) @@ -116,7 +116,7 @@ class SyntheticClassOrObjectDescriptor( override fun toString(): String = "synthetic class " + name.toString() + " in " + containingDeclaration - private fun createUnsubstitutedPrimaryConstructor(constructorVisibility: Visibility): ClassConstructorDescriptor { + private fun createUnsubstitutedPrimaryConstructor(constructorVisibility: DescriptorVisibility): ClassConstructorDescriptor { val constructor = DescriptorFactory.createPrimaryConstructorForObject(thisDescriptor, source) constructor.visibility = constructorVisibility constructor.returnType = getDefaultType() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassDescriptorResolver.kt index bf029f01628..4d9ef4eb4ce 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassDescriptorResolver.kt @@ -114,7 +114,7 @@ object DataClassDescriptorResolver { parameterDescriptors, classDescriptor.defaultType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) trace.record(BindingContext.DATA_CLASS_COPY_FUNCTION, classDescriptor, functionDescriptor) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt index ae9402dd3f7..1ab509d1023 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt @@ -601,7 +601,7 @@ class DeclarationsChecker( } private fun checkPrivateExpectedDeclaration(declaration: KtDeclaration, descriptor: MemberDescriptor) { - if (descriptor.isExpect && Visibilities.isPrivate(descriptor.visibility)) { + if (descriptor.isExpect && DescriptorVisibilities.isPrivate(descriptor.visibility)) { trace.report(EXPECTED_PRIVATE_DECLARATION.on(declaration.modifierList?.getModifier(KtTokens.PRIVATE_KEYWORD) ?: declaration)) } } @@ -884,15 +884,15 @@ class DeclarationsChecker( } } else { if (propertyDescriptor.isOverridable - && accessorDescriptor.visibility == Visibilities.PRIVATE - && propertyDescriptor.visibility != Visibilities.PRIVATE) { + && accessorDescriptor.visibility == DescriptorVisibilities.PRIVATE + && propertyDescriptor.visibility != DescriptorVisibilities.PRIVATE) { if (propertyDescriptor.modality == Modality.ABSTRACT) { reportVisibilityModifierDiagnostics(tokens.values, Errors.PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY) } else { reportVisibilityModifierDiagnostics(tokens.values, Errors.PRIVATE_SETTER_FOR_OPEN_PROPERTY) } } else { - val compare = Visibilities.compare(accessorDescriptor.visibility, propertyDescriptor.visibility) + val compare = DescriptorVisibilities.compare(accessorDescriptor.visibility, propertyDescriptor.visibility) if (compare == null || compare > 0) { reportVisibilityModifierDiagnostics(tokens.values, Errors.SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt index d372c5fbbf1..5ea77980e75 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt @@ -78,7 +78,7 @@ class DelegationResolver private constructor( .setOwner(ownerDescriptor) .setDispatchReceiverParameter(ownerDescriptor.thisAsReceiverParameter) .setModality(newModality) - .setVisibility(Visibilities.INHERITED) + .setVisibility(DescriptorVisibilities.INHERITED) .setKind(DELEGATION) .setCopyOverrides(false) .build() as T diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index fc91b307cea..79292081a6a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -263,29 +263,29 @@ public class DescriptorResolver { } } - public static Visibility getDefaultVisibility(KtModifierListOwner modifierListOwner, DeclarationDescriptor containingDescriptor) { - Visibility defaultVisibility; + public static DescriptorVisibility getDefaultVisibility(KtModifierListOwner modifierListOwner, DeclarationDescriptor containingDescriptor) { + DescriptorVisibility defaultVisibility; if (containingDescriptor instanceof ClassDescriptor) { KtModifierList modifierList = modifierListOwner.getModifierList(); defaultVisibility = modifierList != null && modifierList.hasModifier(OVERRIDE_KEYWORD) - ? Visibilities.INHERITED - : Visibilities.DEFAULT_VISIBILITY; + ? DescriptorVisibilities.INHERITED + : DescriptorVisibilities.DEFAULT_VISIBILITY; } else if (containingDescriptor instanceof FunctionDescriptor || containingDescriptor instanceof PropertyDescriptor) { - defaultVisibility = Visibilities.LOCAL; + defaultVisibility = DescriptorVisibilities.LOCAL; } else { - defaultVisibility = Visibilities.DEFAULT_VISIBILITY; + defaultVisibility = DescriptorVisibilities.DEFAULT_VISIBILITY; } return defaultVisibility; } - public static Modality getDefaultModality(DeclarationDescriptor containingDescriptor, Visibility visibility, boolean isBodyPresent) { + public static Modality getDefaultModality(DeclarationDescriptor containingDescriptor, DescriptorVisibility visibility, boolean isBodyPresent) { Modality defaultModality; if (containingDescriptor instanceof ClassDescriptor) { boolean isTrait = ((ClassDescriptor) containingDescriptor).getKind() == ClassKind.INTERFACE; boolean isDefinitelyAbstract = isTrait && !isBodyPresent; - Modality basicModality = isTrait && !Visibilities.isPrivate(visibility) ? Modality.OPEN : Modality.FINAL; + Modality basicModality = isTrait && !DescriptorVisibilities.isPrivate(visibility) ? Modality.OPEN : Modality.FINAL; defaultModality = isDefinitelyAbstract ? Modality.ABSTRACT : basicModality; } else { @@ -720,7 +720,7 @@ public class DescriptorResolver { } KtModifierList modifierList = typeAlias.getModifierList(); - Visibility visibility = resolveVisibilityFromModifiers(typeAlias, getDefaultVisibility(typeAlias, containingDeclaration)); + DescriptorVisibility visibility = resolveVisibilityFromModifiers(typeAlias, getDefaultVisibility(typeAlias, containingDeclaration)); Annotations allAnnotations = annotationResolver.resolveAnnotationsWithArguments(scope, modifierList, trace); Name name = KtPsiUtil.safeName(typeAlias.getName()); @@ -874,7 +874,7 @@ public class DescriptorResolver { KtModifierList modifierList = variableDeclaration.getModifierList(); boolean isVar = variableDeclaration.isVar(); - Visibility visibility = resolveVisibilityFromModifiers(variableDeclaration, getDefaultVisibility(variableDeclaration, container)); + DescriptorVisibility visibility = resolveVisibilityFromModifiers(variableDeclaration, getDefaultVisibility(variableDeclaration, container)); Modality modality = container instanceof ClassDescriptor ? resolveMemberModalityFromModifiers(variableDeclaration, getDefaultModality(container, visibility, propertyInfo.getHasBody()), @@ -1032,7 +1032,7 @@ public class DescriptorResolver { return type; } - if (!Visibilities.isPrivate(descriptor.getVisibility())) { + if (!DescriptorVisibilities.isPrivate(descriptor.getVisibility())) { if (type.getConstructor().getSupertypes().size() == 1) { return type.getConstructor().getSupertypes().iterator().next(); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ExposedVisibilityChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ExposedVisibilityChecker.kt index ff8c455c251..99dfa56d74d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ExposedVisibilityChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ExposedVisibilityChecker.kt @@ -50,7 +50,7 @@ class ExposedVisibilityChecker(private val trace: BindingTrace? = null) { fun checkDeclarationWithVisibility( modifierListOwner: KtModifierListOwner, descriptor: DeclarationDescriptorWithVisibility, - visibility: Visibility + visibility: DescriptorVisibility ): Boolean { return when { modifierListOwner is KtFunction && @@ -78,7 +78,7 @@ class ExposedVisibilityChecker(private val trace: BindingTrace? = null) { function: KtFunction, functionDescriptor: FunctionDescriptor, // for checking situation with modified basic visibility - visibility: Visibility = functionDescriptor.visibility + visibility: DescriptorVisibility = functionDescriptor.visibility ): Boolean { val functionVisibility = functionDescriptor.effectiveVisibility(visibility) var result = true @@ -116,7 +116,7 @@ class ExposedVisibilityChecker(private val trace: BindingTrace? = null) { property: KtProperty, propertyDescriptor: PropertyDescriptor, // for checking situation with modified basic visibility - visibility: Visibility = propertyDescriptor.visibility + visibility: DescriptorVisibility = propertyDescriptor.visibility ): Boolean { val propertyVisibility = propertyDescriptor.effectiveVisibility(visibility) val restricting = propertyDescriptor.type.leastPermissiveDescriptor(propertyVisibility) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionsFromAny.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionsFromAny.kt index a442c20efee..1ccaaeadf23 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionsFromAny.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionsFromAny.kt @@ -83,7 +83,7 @@ object FunctionsFromAny { functionFromAny.valueParameters.map { it.copy(functionDescriptor, it.name, it.index) }, functionFromAny.returnType, Modality.OPEN, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return functionDescriptor @@ -98,4 +98,4 @@ object FunctionsFromAny { return declaredFunctions.none(checkParameters) && fromSupertypes.none { checkParameters(it) && it.modality == Modality.FINAL } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt index b869b0f31cd..b1bf17b41ef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt @@ -75,7 +75,7 @@ object InlineClassDescriptorResolver { createValueParametersForSpecializedEquals(functionDescriptor, inlinedValue), owner.builtIns.booleanType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return functionDescriptor @@ -102,7 +102,7 @@ object InlineClassDescriptorResolver { if (isBoxMethod) listOf(createValueParameterForBoxing(functionDescriptor, inlinedValue)) else emptyList(), if (isBoxMethod) owner.defaultType else inlinedValue.returnType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return functionDescriptor @@ -141,4 +141,4 @@ object InlineClassDescriptorResolver { false, false, false, null, SourceElement.NO_SOURCE ) } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt index 2847e494dce..103a18a1055 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt @@ -167,7 +167,7 @@ class LocalVariableResolver( containingDeclaration, annotationResolver.resolveAnnotationsWithArguments(scope, variable.modifierList, trace), Modality.FINAL, - Visibilities.INTERNAL, + DescriptorVisibilities.INTERNAL, variable.isVar, KtPsiUtil.safeName(variable.name), CallableMemberDescriptor.Kind.DECLARATION, @@ -207,7 +207,7 @@ class LocalVariableResolver( private fun initializeWithDefaultGetterSetter(propertyDescriptor: PropertyDescriptorImpl) { var getter = propertyDescriptor.getter - if (getter == null && !Visibilities.isPrivate(propertyDescriptor.visibility)) { + if (getter == null && !DescriptorVisibilities.isPrivate(propertyDescriptor.visibility)) { getter = DescriptorFactory.createDefaultGetter(propertyDescriptor, Annotations.EMPTY) getter.initialize(propertyDescriptor.type) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MissingSupertypesResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MissingSupertypesResolver.kt index 9d5ff5d8963..aa5334732c8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MissingSupertypesResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MissingSupertypesResolver.kt @@ -32,7 +32,7 @@ class MissingSupertypesResolver( * Type parameters are skipped here in favor to explicit checks for bounds, local declarations are ignored for optimization */ if (supertypeDeclaration !is ClassDescriptor || supertypeDeclaration.isExpect) continue - if (supertypeDeclaration.visibility == Visibilities.LOCAL) continue + if (supertypeDeclaration.visibility == DescriptorVisibilities.LOCAL) continue val superTypeClassId = supertypeDeclaration.classId ?: continue val dependency = moduleDescriptor.findClassAcrossModuleDependencies(superTypeClassId) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index d9d3c71ed6d..7c29ab39f7e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -134,19 +134,19 @@ public class ModifiersChecker { } @NotNull - public static Visibility resolveVisibilityFromModifiers( + public static DescriptorVisibility resolveVisibilityFromModifiers( @NotNull KtModifierListOwner modifierListOwner, - @NotNull Visibility defaultVisibility + @NotNull DescriptorVisibility defaultVisibility ) { return resolveVisibilityFromModifiers(modifierListOwner.getModifierList(), defaultVisibility); } - public static Visibility resolveVisibilityFromModifiers(@Nullable KtModifierList modifierList, @NotNull Visibility defaultVisibility) { + public static DescriptorVisibility resolveVisibilityFromModifiers(@Nullable KtModifierList modifierList, @NotNull DescriptorVisibility defaultVisibility) { if (modifierList == null) return defaultVisibility; - if (modifierList.hasModifier(PRIVATE_KEYWORD)) return Visibilities.PRIVATE; - if (modifierList.hasModifier(PUBLIC_KEYWORD)) return Visibilities.PUBLIC; - if (modifierList.hasModifier(PROTECTED_KEYWORD)) return Visibilities.PROTECTED; - if (modifierList.hasModifier(INTERNAL_KEYWORD)) return Visibilities.INTERNAL; + if (modifierList.hasModifier(PRIVATE_KEYWORD)) return DescriptorVisibilities.PRIVATE; + if (modifierList.hasModifier(PUBLIC_KEYWORD)) return DescriptorVisibilities.PUBLIC; + if (modifierList.hasModifier(PROTECTED_KEYWORD)) return DescriptorVisibilities.PROTECTED; + if (modifierList.hasModifier(INTERNAL_KEYWORD)) return DescriptorVisibilities.INTERNAL; return defaultVisibility; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt index feddac38ed8..c555af13e31 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt @@ -232,7 +232,7 @@ class OverloadResolver( private fun DeclarationDescriptor.isPrivate() = this is DeclarationDescriptorWithVisibility && - Visibilities.isPrivate(this.visibility) + DescriptorVisibilities.isPrivate(this.visibility) private fun checkOverloadsInClass(members: Collection) { if (members.size == 1) return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt index 01240c4e112..39e331dafa3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.kt @@ -504,7 +504,7 @@ class OverrideResolver( private fun checkVisibilityForMember(declaration: KtDeclaration, memberDescriptor: CallableMemberDescriptor) { val visibility = memberDescriptor.visibility for (descriptor in memberDescriptor.overriddenDescriptors) { - val compare = Visibilities.compare(visibility, descriptor.visibility) + val compare = DescriptorVisibilities.compare(visibility, descriptor.visibility) if (compare == null) { trace.report( CANNOT_CHANGE_ACCESS_PRIVILEGE.on( @@ -601,7 +601,7 @@ class OverrideResolver( val relevantDirectlyOverridden = getRelevantDirectlyOverridden(overriddenDeclarationsByDirectParent, allFilteredOverriddenDeclarations) - if (descriptor.visibility === Visibilities.INVISIBLE_FAKE) { + if (descriptor.visibility === DescriptorVisibilities.INVISIBLE_FAKE) { checkInvisibleFakeOverride(descriptor, relevantDirectlyOverridden, reportingStrategy) return } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index 2fbb40c5f3c..a80287751e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -811,10 +811,10 @@ internal fun isVisible( val visibility = descriptor.visibility if (position == QualifierPosition.IMPORT) { - if (Visibilities.isPrivate(visibility)) return Visibilities.inSameFile(descriptor, shouldBeVisibleFrom) + if (DescriptorVisibilities.isPrivate(visibility)) return DescriptorVisibilities.inSameFile(descriptor, shouldBeVisibleFrom) if (!visibility.mustCheckInImports()) return true } - return Visibilities.isVisibleIgnoringReceiver(descriptor, shouldBeVisibleFrom) + return DescriptorVisibilities.isVisibleIgnoringReceiver(descriptor, shouldBeVisibleFrom) } internal enum class QualifierPosition { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ShadowedExtensionChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ShadowedExtensionChecker.kt index e6b829f9e68..7fac64ee0ec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ShadowedExtensionChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ShadowedExtensionChecker.kt @@ -88,7 +88,7 @@ class ShadowedExtensionChecker(val typeSpecificityComparator: TypeSpecificityCom } private fun DeclarationDescriptorWithVisibility.isPublic() = - visibility.normalize() == Visibilities.PUBLIC + visibility.normalize() == DescriptorVisibilities.PUBLIC private fun isExtensionFunctionShadowedByMemberFunction(extension: FunctionDescriptor, member: FunctionDescriptor): Boolean { // Permissive check: diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index e1979105159..410934cb361 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -324,7 +324,7 @@ class TypeResolver( type: KotlinType, source: SourceElement ) : VariableDescriptorImpl(containingDeclaration, annotations, name, type, source) { - override fun getVisibility() = Visibilities.LOCAL + override fun getVisibility() = DescriptorVisibilities.LOCAL override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor? { throw UnsupportedOperationException("Should not be called for descriptor of type ${this::class.java}") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index cdb0addd792..c0b258ba51f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -87,13 +87,13 @@ class VarianceCheckerCore( } fun checkMember(member: KtCallableDeclaration, descriptor: CallableMemberDescriptor) = - Visibilities.isPrivate(descriptor.visibility) || checkCallableDeclaration(context, member, descriptor) + DescriptorVisibilities.isPrivate(descriptor.visibility) || checkCallableDeclaration(context, member, descriptor) private fun TypeParameterDescriptor.varianceWithManual() = if (manualVariance != null && this.original == manualVariance.descriptor) manualVariance.variance else variance fun recordPrivateToThisIfNeeded(descriptor: CallableMemberDescriptor) { - if (isIrrelevant(descriptor) || descriptor.visibility != Visibilities.PRIVATE) return + if (isIrrelevant(descriptor) || descriptor.visibility != DescriptorVisibilities.PRIVATE) return val psiElement = descriptor.source.getPsi() as? KtCallableDeclaration ?: return @@ -185,11 +185,11 @@ class VarianceCheckerCore( private fun recordPrivateToThis(descriptor: CallableMemberDescriptor) { when (descriptor) { - is FunctionDescriptorImpl -> descriptor.visibility = Visibilities.PRIVATE_TO_THIS + is FunctionDescriptorImpl -> descriptor.visibility = DescriptorVisibilities.PRIVATE_TO_THIS is PropertyDescriptorImpl -> { - descriptor.visibility = Visibilities.PRIVATE_TO_THIS + descriptor.visibility = DescriptorVisibilities.PRIVATE_TO_THIS for (accessor in descriptor.accessors) { - (accessor as PropertyAccessorDescriptorImpl).visibility = Visibilities.PRIVATE_TO_THIS + (accessor as PropertyAccessorDescriptorImpl).visibility = DescriptorVisibilities.PRIVATE_TO_THIS } } else -> throw IllegalStateException("Unexpected descriptor type: ${descriptor::class.java.name}") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt index 8995bd7e99d..8e47249548b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt @@ -177,14 +177,14 @@ class CandidateResolver( } private fun CallCandidateResolutionContext<*>.checkVisibilityWithoutReceiver() = checkAndReport { - checkVisibilityWithDispatchReceiver(Visibilities.ALWAYS_SUITABLE_RECEIVER, null) + checkVisibilityWithDispatchReceiver(DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER, null) } private fun CallCandidateResolutionContext<*>.checkVisibilityWithDispatchReceiver( receiverArgument: ReceiverValue?, smartCastType: KotlinType? ): ResolutionStatus { - val invisibleMember = Visibilities.findInvisibleMember( + val invisibleMember = DescriptorVisibilities.findInvisibleMember( getReceiverValueWithSmartCast(receiverArgument, smartCastType), candidateDescriptor, scope.ownerDescriptor ) return if (invisibleMember != null) { @@ -204,7 +204,7 @@ class CandidateResolver( private fun CallCandidateResolutionContext<*>.isCandidateVisible( receiverArgument: ReceiverValue?, smartCastType: KotlinType? - ) = Visibilities.findInvisibleMember( + ) = DescriptorVisibilities.findInvisibleMember( getReceiverValueWithSmartCast(receiverArgument, smartCastType), candidateDescriptor, scope.ownerDescriptor ) == null @@ -474,7 +474,7 @@ class CandidateResolver( if (!context.isDebuggerContext && candidateCall.dispatchReceiver != null // Do not report error if it's already reported when checked without receiver - && context.isCandidateVisible(receiverArgument = Visibilities.ALWAYS_SUITABLE_RECEIVER, smartCastType = null)) { + && context.isCandidateVisible(receiverArgument = DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER, smartCastType = null)) { resultStatus = resultStatus.combine( context.checkVisibilityWithDispatchReceiver( candidateCall.dispatchReceiver, candidateCall.smartCastDispatchReceiverType diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt index bdb62952ac6..f07b7091f74 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.kt @@ -259,7 +259,7 @@ internal class InlineChecker(private val descriptor: FunctionDescriptor) : CallC val isInlineFunPublicOrPublishedApi = inlineFunEffectiveVisibility.publicApi if (isInlineFunPublicOrPublishedApi && !isCalledFunPublicOrPublishedApi && - calledDescriptor.visibility !== Visibilities.LOCAL) { + calledDescriptor.visibility !== DescriptorVisibilities.LOCAL) { context.trace.report(NON_PUBLIC_CALL_FROM_PUBLIC_INLINE.on(expression, calledDescriptor, descriptor)) } else { checkPrivateClassMemberAccess(calledDescriptor, expression, context) @@ -267,8 +267,8 @@ internal class InlineChecker(private val descriptor: FunctionDescriptor) : CallC if (calledDescriptor !is ConstructorDescriptor && isInlineFunPublicOrPublishedApi && - inlineFunEffectiveVisibility.toVisibility() !== Visibilities.PROTECTED && - calledFunEffectiveVisibility.toVisibility() === Visibilities.PROTECTED) { + inlineFunEffectiveVisibility.toVisibility() !== DescriptorVisibilities.PROTECTED && + calledFunEffectiveVisibility.toVisibility() === DescriptorVisibilities.PROTECTED) { if (prohibitProtectedCallFromInline) { context.trace.report(PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR.on(expression, calledDescriptor)) } else { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ProtectedConstructorCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ProtectedConstructorCallChecker.kt index a41800a6188..9d725c0632a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ProtectedConstructorCallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ProtectedConstructorCallChecker.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.checkers import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.KtConstructorCalleeExpression @@ -35,9 +35,9 @@ object ProtectedConstructorCallChecker : CallChecker { val actualConstructor = (descriptor as? TypeAliasConstructorDescriptor)?.underlyingConstructorDescriptor ?: descriptor - if (actualConstructor.visibility.normalize() != Visibilities.PROTECTED) return + if (actualConstructor.visibility.normalize() != DescriptorVisibilities.PROTECTED) return // Error already reported - if (!Visibilities.isVisibleWithAnyReceiver(descriptor, scopeOwner)) return + if (!DescriptorVisibilities.isVisibleWithAnyReceiver(descriptor, scopeOwner)) return val calleeExpression = resolvedCall.call.calleeExpression @@ -55,7 +55,7 @@ object ProtectedConstructorCallChecker : CallChecker { // And without ProtectedConstructorCallChecker such calls would be allowed only because they are performed within subclass // of constructor owner @Suppress("DEPRECATION") - if (Visibilities.findInvisibleMember(Visibilities.FALSE_IF_PROTECTED, descriptor, scopeOwner) == actualConstructor.original) { + if (DescriptorVisibilities.findInvisibleMember(DescriptorVisibilities.FALSE_IF_PROTECTED, descriptor, scopeOwner) == actualConstructor.original) { context.trace.report(Errors.PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL.on(reportOn, descriptor)) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt index 63869c67b98..a863014205e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueKindUtils.kt @@ -130,7 +130,7 @@ private fun isAccessedBeforeAllClosureWriters( private fun DeclarationDescriptorWithVisibility.isInvisibleFromOtherModules(): Boolean { - if (Visibilities.INVISIBLE_FROM_OTHER_MODULES.contains(visibility)) return true + if (DescriptorVisibilities.INVISIBLE_FROM_OTHER_MODULES.contains(visibility)) return true val containingDeclaration = containingDeclaration return containingDeclaration is DeclarationDescriptorWithVisibility && containingDeclaration.isInvisibleFromOtherModules() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt index c6130d7c1f0..549d3c63ea6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt @@ -89,7 +89,7 @@ class DynamicCallableDescriptors(private val storageManager: StorageManager, bui owner, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, true, name, CallableMemberDescriptor.Kind.DECLARATION, @@ -132,7 +132,7 @@ class DynamicCallableDescriptors(private val storageManager: StorageManager, bui createValueParameters(functionDescriptor, call), dynamicType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) functionDescriptor.setHasSynthesizedParameterNames(true) functionDescriptor.isOperator = isConventionCall(call) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt index 5c00be43967..eace2e2ea89 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt @@ -105,8 +105,8 @@ class ExplicitApiDeclarationChecker : DeclarationChecker { val callableMemberDescriptor = descriptor as? CallableMemberDescriptor val visibility = callableMemberDescriptor?.effectiveVisibility()?.toVisibility() - return (checkForPublicApi && visibility?.isPublicAPI == true) || (checkForInternal && visibility == Visibilities.INTERNAL) || - (checkForPrivate && visibility == Visibilities.PRIVATE) + return (checkForPublicApi && visibility?.isPublicAPI == true) || (checkForInternal && visibility == DescriptorVisibilities.INTERNAL) || + (checkForPrivate && visibility == DescriptorVisibilities.PRIVATE) } fun returnTypeCheckIsApplicable(element: KtCallableDeclaration): Boolean { @@ -120,4 +120,4 @@ class ExplicitApiDeclarationChecker : DeclarationChecker { return true } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt index 0a3a874c059..8879441b42b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/InlineClassDeclarationChecker.kt @@ -47,7 +47,7 @@ object InlineClassDeclarationChecker : DeclarationChecker { } val primaryConstructorVisibility = descriptor.unsubstitutedPrimaryConstructor?.visibility - if (primaryConstructorVisibility != null && primaryConstructorVisibility != Visibilities.PUBLIC) { + if (primaryConstructorVisibility != null && primaryConstructorVisibility != DescriptorVisibilities.PUBLIC) { trace.report(Errors.NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS.on(primaryConstructor.visibilityModifier() ?: inlineKeyword)) return } @@ -173,4 +173,4 @@ class ReservedMembersAndConstructsForInlineClass : DeclarationChecker { } } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/KClassWithIncorrectTypeArgumentChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/KClassWithIncorrectTypeArgumentChecker.kt index a6c77eece5f..0a4a919c004 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/KClassWithIncorrectTypeArgumentChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/KClassWithIncorrectTypeArgumentChecker.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf object KClassWithIncorrectTypeArgumentChecker : DeclarationChecker { override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { - if (descriptor !is CallableMemberDescriptor || descriptor.visibility == Visibilities.LOCAL) return + if (descriptor !is CallableMemberDescriptor || descriptor.visibility == DescriptorVisibilities.LOCAL) return if (declaration !is KtCallableDeclaration || declaration.typeReference != null) 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 c5987b39dfa..b4669a92bef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PublishedApiUsageChecker.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.resolve.BindingContext @@ -32,7 +32,7 @@ object PublishedApiUsageChecker { descriptor: DeclarationDescriptor, trace: BindingTrace ) { - if (descriptor !is DeclarationDescriptorWithVisibility || descriptor.visibility == Visibilities.INTERNAL) return + if (descriptor !is DeclarationDescriptorWithVisibility || descriptor.visibility == DescriptorVisibilities.INTERNAL) return // Don't report the diagnostic twice if (descriptor is PropertyAccessorDescriptor) return 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 a74303ed84b..04eb74373a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ResultClassInReturnTypeChecker.kt @@ -45,7 +45,7 @@ class ResultClassInReturnTypeChecker : DeclarationChecker { } val visibility = (declarationDescriptor as DeclarationDescriptorWithVisibility).visibility - return !Visibilities.isPrivate(visibility) && visibility != Visibilities.LOCAL + return !DescriptorVisibilities.isPrivate(visibility) && visibility != DescriptorVisibilities.LOCAL } return true diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt index b7a741aceca..f71a0931c52 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt @@ -51,8 +51,8 @@ class FunctionImportedFromObject( override fun getOriginal() = _original as FunctionDescriptor override fun copy( - newOwner: DeclarationDescriptor?, modality: Modality?, visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean + newOwner: DeclarationDescriptor?, modality: Modality?, visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean ): FunctionDescriptor { throw UnsupportedOperationException("copy() should not be called on ${this::class.java.simpleName}, was called for $this") } @@ -71,8 +71,8 @@ class PropertyImportedFromObject( override fun getOriginal() = _original as PropertyDescriptor override fun copy( - newOwner: DeclarationDescriptor?, modality: Modality?, visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean + newOwner: DeclarationDescriptor?, modality: Modality?, visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean ): FunctionDescriptor { throw UnsupportedOperationException("copy() should not be called on ${this::class.java.simpleName}, was called for $this") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt index 57e036c2ac9..61c6ca76337 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt @@ -142,7 +142,7 @@ class InlineAnalyzerExtension( return } - if (Visibilities.isPrivate(callableDescriptor.visibility)) { + if (DescriptorVisibilities.isPrivate(callableDescriptor.visibility)) { return } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/inlineOnly.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/inlineOnly.kt index dbb162536eb..69dfd0e11e5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/inlineOnly.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/inlineOnly.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.resolve.inline import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.MemberDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -31,7 +31,7 @@ fun MemberDescriptor.isInlineOnly(): Boolean = (hasInlineOnlyAnnotation() || DescriptorUtils.getDirectMember(this).hasInlineOnlyAnnotation()) private fun MemberDescriptor.isPrivateInlineSuspend(): Boolean = - this is FunctionDescriptor && isSuspend && isInline && visibility == Visibilities.PRIVATE + this is FunctionDescriptor && isSuspend && isInline && visibility == DescriptorVisibilities.PRIVATE fun MemberDescriptor.isInlineWithReified(): Boolean = this is CallableMemberDescriptor && (hasReifiedParameters() || DescriptorUtils.getDirectMember(this).hasReifiedParameters()) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt index 36a72ad74f5..68c045b9773 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt @@ -269,7 +269,7 @@ class FileScopeFactory( override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? { if (name in excludedNames) return null val classifier = scope.getContributedClassifier(name, location) ?: return null - val visible = Visibilities.isVisibleIgnoringReceiver(classifier as DeclarationDescriptorWithVisibility, fromDescriptor) + val visible = DescriptorVisibilities.isVisibleIgnoringReceiver(classifier as DeclarationDescriptorWithVisibility, fromDescriptor) return classifier.takeIf { filteringKind == if (visible) FilteringKind.VISIBLE_CLASSES else FilteringKind.INVISIBLE_CLASSES } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt index fbd7fc7c775..a0f77d91c53 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt @@ -240,7 +240,7 @@ class LazyImportScope( val visibility = (descriptor as DeclarationDescriptorWithVisibility).visibility val includeVisible = filteringKind == FilteringKind.VISIBLE_CLASSES if (!visibility.mustCheckInImports()) return includeVisible - return Visibilities.isVisibleIgnoringReceiver(descriptor, components.moduleDescriptor) == includeVisible + return DescriptorVisibilities.isVisibleIgnoringReceiver(descriptor, components.moduleDescriptor) == includeVisible } override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 53c51b2c48a..10ec479ba0d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -56,8 +56,8 @@ import java.util.Collections; import java.util.List; import static kotlin.collections.CollectionsKt.firstOrNull; -import static org.jetbrains.kotlin.descriptors.Visibilities.PRIVATE; -import static org.jetbrains.kotlin.descriptors.Visibilities.PUBLIC; +import static org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE; +import static org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.KtTokens.INNER_KEYWORD; import static org.jetbrains.kotlin.resolve.BindingContext.TYPE; @@ -79,7 +79,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private final LazyClassTypeConstructor typeConstructor; private final NotNullLazyValue modality; - private final Visibility visibility; + private final DescriptorVisibility visibility; private final ClassKind kind; private final boolean isInner; private final boolean isData; @@ -149,7 +149,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes } boolean isLocal = classOrObject != null && KtPsiUtil.isLocal(classOrObject); - this.visibility = isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, Visibilities.DEFAULT_VISIBILITY); + this.visibility = isLocal ? DescriptorVisibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, DescriptorVisibilities.DEFAULT_VISIBILITY); this.isInner = modifierList != null && modifierList.hasModifier(INNER_KEYWORD) && !isIllegalInner(this); this.isData = modifierList != null && modifierList.hasModifier(KtTokens.DATA_KEYWORD); @@ -292,7 +292,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes ) { { initialize(null, null, Collections.emptyList(), Collections.emptyList(), - null, Modality.FINAL, Visibilities.PRIVATE); + null, Modality.FINAL, DescriptorVisibilities.PRIVATE); } @NotNull @@ -513,7 +513,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return visibility; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt index e45b30d305c..3b4698f416c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt @@ -38,7 +38,7 @@ class LazyTypeAliasDescriptor( annotations: Annotations, name: Name, sourceElement: SourceElement, - visibility: Visibility + visibility: DescriptorVisibility ) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, sourceElement, visibility), TypeAliasDescriptor { override val constructors: Collection by storageManager.createLazyValue { @@ -122,7 +122,7 @@ class LazyTypeAliasDescriptor( annotations: Annotations, name: Name, sourceElement: SourceElement, - visibility: Visibility + visibility: DescriptorVisibility ): LazyTypeAliasDescriptor = LazyTypeAliasDescriptor( storageManager, trace, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index ee5c5bb7d32..64431b2ee50 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -230,7 +230,7 @@ public class ControlStructureTypingUtils { valueParameters, returnType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ); return function; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt index 5e2b40c9376..2f2a5942567 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt @@ -628,7 +628,7 @@ class DoubleColonExpressionResolver( createValueParametersForInvokeInFunctionType(functionDescriptor, type.arguments.dropLast(1)), type.arguments.last().type, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) context.trace.record(BindingContext.FUNCTION, expression, functionDescriptor) @@ -826,7 +826,7 @@ class DoubleColonExpressionResolver( ): Boolean { val receiver = receiverTypeFor(descriptor, lhs)?.let(::TransientReceiver) val setter = descriptor.setter - return descriptor.isVar && (setter == null || Visibilities.isVisible(receiver, setter, scopeOwnerDescriptor)) + return descriptor.isVar && (setter == null || DescriptorVisibilities.isVisible(receiver, setter, scopeOwnerDescriptor)) } fun createKCallableTypeForReference( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 51b61d0a987..a0a3b501c0b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -239,7 +239,7 @@ public class ExpressionTypingUtils { public static boolean isLocalFunction(@Nullable DeclarationDescriptor descriptor) { if (descriptor != null && descriptor.getClass() == SimpleFunctionDescriptorImpl.class) { - return ((SimpleFunctionDescriptorImpl) descriptor).getVisibility() == Visibilities.LOCAL; + return ((SimpleFunctionDescriptorImpl) descriptor).getVisibility() == DescriptorVisibilities.LOCAL; } return false; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/declarationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/declarationUtil.kt index 2114b5cf989..44e67bceeff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/declarationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/declarationUtil.kt @@ -109,8 +109,8 @@ fun getNonPrivateTraitMembersForDelegation( ): CallableMemberDescriptor? { val traitMember = findInterfaceImplementation(descriptor, returnImplNotDelegate) if (traitMember == null || - Visibilities.isPrivate(traitMember.visibility) || - traitMember.visibility == Visibilities.INVISIBLE_FAKE + DescriptorVisibilities.isPrivate(traitMember.visibility) || + traitMember.visibility == DescriptorVisibilities.INVISIBLE_FAKE ) return null return traitMember -} \ No newline at end of file +} diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt index 8ea39c193d9..12a02468282 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/CheckIrElementVisitor.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.backend.common import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* @@ -311,7 +311,7 @@ class CheckIrElementVisitor( if (declaration is IrOverridableDeclaration<*>) { for (overriddenSymbol in declaration.overriddenSymbols) { val overriddenDeclaration = overriddenSymbol.owner as? IrDeclarationWithVisibility ?: continue - if (overriddenDeclaration.visibility == Visibilities.PRIVATE) { + if (overriddenDeclaration.visibility == DescriptorVisibilities.PRIVATE) { reportError(declaration, "Overrides private declaration $overriddenDeclaration") } } diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt index 79da23c31e9..5499b69967c 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.deepCopyWithVariables import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI @@ -86,7 +86,7 @@ val IrCall.isSuspend get() = (symbol.owner as? IrSimpleFunction)?.isSuspend == t val IrFunctionReference.isSuspend get() = (symbol.owner as? IrSimpleFunction)?.isSuspend == true val IrSimpleFunction.isOverridable: Boolean - get() = visibility != Visibilities.PRIVATE && modality != Modality.FINAL && (parent as? IrClass)?.isFinalClass != true + get() = visibility != DescriptorVisibilities.PRIVATE && modality != Modality.FINAL && (parent as? IrClass)?.isFinalClass != true val IrSimpleFunction.isOverridableOrOverrides: Boolean get() = isOverridable || overriddenSymbols.isNotEmpty() @@ -456,7 +456,7 @@ fun IrClass.addFakeOverridesViaIncorrectHeuristic(implementedMembers: List = listOf() + irParent: IrDeclarationParent, + name: Name, + oldFunction: IrFunction, + dispatchReceiverType: IrType? = oldFunction.dispatchReceiverParameter?.type, + origin: IrDeclarationOrigin = oldFunction.origin, + modality: Modality = Modality.FINAL, + visibility: DescriptorVisibility = oldFunction.visibility, + isFakeOverride: Boolean = oldFunction.isFakeOverride, + copyMetadata: Boolean = true, + typeParametersFromContext: List = listOf() ): IrSimpleFunction { val descriptor = (oldFunction.descriptor as? DescriptorWithContainerSource)?.let { WrappedFunctionDescriptorWithContainerSource() diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractSuspendFunctionsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractSuspendFunctionsLowering.kt index 2571e487eec..0dcff24a5f2 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractSuspendFunctionsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractSuspendFunctionsLowering.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.* import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.builders.* @@ -449,7 +449,7 @@ abstract class AbstractSuspendFunctionsLowering(val co endOffset = irFunction.endOffset origin = DECLARATION_ORIGIN_COROUTINE_IMPL name = Name.identifier("create") - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED returnType = coroutineClass.defaultType }.apply { parent = coroutineClass @@ -505,7 +505,7 @@ abstract class AbstractSuspendFunctionsLowering(val co endOffset = irFunction.endOffset origin = DECLARATION_ORIGIN_COROUTINE_IMPL name = Name.identifier("invoke") - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED returnType = context.irBuiltIns.anyNType isSuspend = true }.apply { @@ -623,7 +623,7 @@ abstract class AbstractSuspendFunctionsLowering(val co this.origin = DECLARATION_ORIGIN_COROUTINE_IMPL this.name = name this.type = type - this.visibility = Visibilities.PRIVATE + this.visibility = DescriptorVisibilities.PRIVATE this.isFinal = !isMutable }.also { it.parent = this diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt index 2c2400dbc38..7924df0f263 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.ir.ir2string -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.* @@ -264,7 +264,7 @@ class ClosureAnnotator(irElement: IrElement, declaration: IrDeclaration) { private fun processMemberAccess(declaration: IrDeclaration, parentClosure: ClosureBuilder?) { if (declaration.isLocal) { - if (declaration is IrSimpleFunction && declaration.visibility != Visibilities.LOCAL) { + if (declaration is IrSimpleFunction && declaration.visibility != DescriptorVisibilities.LOCAL) { return } @@ -275,4 +275,4 @@ class ClosureAnnotator(irElement: IrElement, declaration: IrDeclaration) { } } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index 5a417243b9f..f202ad6cd9e 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.backend.common.* import org.jetbrains.kotlin.backend.common.descriptors.synthesizedString import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* @@ -229,7 +229,7 @@ open class DefaultArgumentStubGenerator( error("This method should be overridden") } - protected open fun defaultArgumentStubVisibility(function: IrFunction) = Visibilities.PUBLIC + protected open fun defaultArgumentStubVisibility(function: IrFunction) = DescriptorVisibilities.PUBLIC protected open fun useConstructorMarker(function: IrFunction) = function is IrConstructor @@ -415,7 +415,7 @@ open class DefaultParameterInjector( protected open fun nullConst(startOffset: Int, endOffset: Int, type: IrType): IrExpression = IrConstImpl.defaultValueForType(startOffset, endOffset, type) - protected open fun defaultArgumentStubVisibility(function: IrFunction) = Visibilities.PUBLIC + protected open fun defaultArgumentStubVisibility(function: IrFunction) = DescriptorVisibilities.PUBLIC protected open fun useConstructorMarker(function: IrFunction) = function is IrConstructor @@ -465,12 +465,12 @@ class DefaultParameterPatchOverridenSymbolsLowering( } private fun IrFunction.generateDefaultsFunction( - context: CommonBackendContext, - skipInlineMethods: Boolean, - skipExternalMethods: Boolean, - forceSetOverrideSymbols: Boolean, - visibility: Visibility, - useConstructorMarker: Boolean + context: CommonBackendContext, + skipInlineMethods: Boolean, + skipExternalMethods: Boolean, + forceSetOverrideSymbols: Boolean, + visibility: DescriptorVisibility, + useConstructorMarker: Boolean ): IrFunction? { if (skipInlineMethods && isInline) return null if (skipExternalMethods && isExternalOrInheritedFromExternal()) return null @@ -520,11 +520,11 @@ private fun IrFunction.generateDefaultsFunction( @OptIn(ObsoleteDescriptorBasedAPI::class) private fun IrFunction.generateDefaultsFunctionImpl( - context: CommonBackendContext, - newOrigin: IrDeclarationOrigin, - newVisibility: Visibility, - isFakeOverride: Boolean, - useConstructorMarker: Boolean + context: CommonBackendContext, + newOrigin: IrDeclarationOrigin, + newVisibility: DescriptorVisibility, + isFakeOverride: Boolean, + useConstructorMarker: Boolean ): IrFunction { val newFunction = when (this) { is IrConstructor -> diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index ce05f66b044..e70ab3041ff 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.backend.common.runOnFilePostfix import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.* import org.jetbrains.kotlin.ir.builders.declarations.buildConstructor import org.jetbrains.kotlin.ir.builders.declarations.buildField @@ -49,14 +49,14 @@ interface LocalNameProvider { } interface VisibilityPolicy { - fun forClass(declaration: IrClass, inInlineFunctionScope: Boolean): Visibility = + fun forClass(declaration: IrClass, inInlineFunctionScope: Boolean): DescriptorVisibility = declaration.visibility - fun forConstructor(declaration: IrConstructor, inInlineFunctionScope: Boolean): Visibility = - Visibilities.PRIVATE + fun forConstructor(declaration: IrConstructor, inInlineFunctionScope: Boolean): DescriptorVisibility = + DescriptorVisibilities.PRIVATE - fun forCapturedField(value: IrValueSymbol): Visibility = - Visibilities.PRIVATE + fun forCapturedField(value: IrValueSymbol): DescriptorVisibility = + DescriptorVisibilities.PRIVATE companion object { val DEFAULT = object : VisibilityPolicy {} @@ -597,7 +597,7 @@ class LocalDeclarationsLowering( val newDeclaration = context.irFactory.buildFun { updateFrom(oldDeclaration) name = newName - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE modality = Modality.FINAL } @@ -721,13 +721,13 @@ class LocalDeclarationsLowering( } private fun createFieldForCapturedValue( - startOffset: Int, - endOffset: Int, - name: Name, - visibility: Visibility, - parent: IrClass, - fieldType: IrType, - isCrossinline: Boolean + startOffset: Int, + endOffset: Int, + name: Name, + visibility: DescriptorVisibility, + parent: IrClass, + fieldType: IrType, + isCrossinline: Boolean ): IrField = context.irFactory.buildField { this.startOffset = startOffset @@ -883,7 +883,7 @@ class LocalDeclarationsLowering( override fun visitSimpleFunction(declaration: IrSimpleFunction, data: Data) { super.visitSimpleFunction(declaration, data.withInline(declaration.isInline)) - if (declaration.visibility == Visibilities.LOCAL) { + if (declaration.visibility == DescriptorVisibilities.LOCAL) { val enclosingScope = data.currentClass ?: enclosingClass?.scopeWithCounter // File is required for K/N because file declarations are not split by classes. @@ -924,4 +924,4 @@ class LocalDeclarationsLowering( } // Local inner classes capture anything through outer -internal fun IrClass.isLocalNotInner(): Boolean = visibility == Visibilities.LOCAL && !isInner +internal fun IrClass.isLocalNotInner(): Boolean = visibility == DescriptorVisibilities.LOCAL && !isInner diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt index 7cd0e7fd55d..426afe259a2 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SingleAbstractMethodLowering.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.* @@ -62,7 +62,7 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) : protected val inlineCachedImplementations = mutableMapOf() protected var enclosingContainer: IrDeclarationContainer? = null - abstract fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List): Visibility + abstract fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List): DescriptorVisibility abstract fun getSuperTypeForWrapper(typeOperand: IrType): IrType @@ -143,14 +143,14 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) : // Construct a class that wraps an invokable object into an implementation of an interface: // class sam$n(private val invokable: F) : Interface { override fun method(...) = invokable(...) } - private fun createObjectProxy(superType: IrType, wrapperVisibility: Visibility, createFor: IrElement): IrClass { + private fun createObjectProxy(superType: IrType, wrapperVisibility: DescriptorVisibility, createFor: IrElement): IrClass { val superClass = superType.classifierOrFail.owner as IrClass // The language documentation prohibits casting lambdas to classes, but if it was allowed, // the `irDelegatingConstructorCall` in the constructor below would need to be modified. assert(superClass.kind == ClassKind.INTERFACE) { "SAM conversion to an abstract class not allowed" } val superFqName = superClass.fqNameWhenAvailable!!.asString().replace('.', '_') - val inlinePrefix = if (wrapperVisibility == Visibilities.PUBLIC) "\$i" else "" + val inlinePrefix = if (wrapperVisibility == DescriptorVisibilities.PUBLIC) "\$i" else "" val wrapperName = Name.identifier("sam$inlinePrefix\$$superFqName$SAM_WRAPPER_SUFFIX") val superMethod = superClass.functions.single { it.modality == Modality.ABSTRACT } val extensionReceiversCount = if (superMethod.extensionReceiverParameter == null) 0 else 1 @@ -178,7 +178,7 @@ abstract class SingleAbstractMethodLowering(val context: CommonBackendContext) : name = Name.identifier(FUNCTION_FIELD_NAME) type = wrappedFunctionType origin = subclass.origin - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE setSourceRange(createFor) } diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/optimizations/PropertyAccessorInlineLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/optimizations/PropertyAccessorInlineLowering.kt index a4cbef848a0..d48efb021e9 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/optimizations/PropertyAccessorInlineLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/optimizations/PropertyAccessorInlineLowering.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.ir.isTopLevel import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid class PropertyAccessorInlineLowering(private val context: CommonBackendContext) : BodyLoweringPass { - private val IrProperty.isSafeToInline: Boolean get() = isTopLevel || (modality === Modality.FINAL || visibility == Visibilities.PRIVATE) || (parent as IrClass).modality === Modality.FINAL + private val IrProperty.isSafeToInline: Boolean get() = isTopLevel || (modality === Modality.FINAL || visibility == DescriptorVisibilities.PRIVATE) || (parent as IrClass).modality === Modality.FINAL // TODO: implement general function inlining optimization and replace it with private inner class AccessorInliner : IrElementTransformerVoid() { @@ -129,4 +129,4 @@ class PropertyAccessorInlineLowering(private val context: CommonBackendContext) override fun lower(irBody: IrBody, container: IrDeclaration) { irBody.transformChildrenVoid(AccessorInliner()) } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt index 83d9d6b6831..9f89fbdb1f3 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt @@ -65,14 +65,14 @@ inline fun IrClass.addField(builder: IrFieldBuilder.() -> Unit) = declarations.add(field) } -fun IrClass.addField(fieldName: Name, fieldType: IrType, fieldVisibility: Visibility = Visibilities.PRIVATE): IrField = +fun IrClass.addField(fieldName: Name, fieldType: IrType, fieldVisibility: DescriptorVisibility = DescriptorVisibilities.PRIVATE): IrField = addField { name = fieldName type = fieldType visibility = fieldVisibility } -fun IrClass.addField(fieldName: String, fieldType: IrType, fieldVisibility: Visibility = Visibilities.PRIVATE): IrField = +fun IrClass.addField(fieldName: String, fieldType: IrType, fieldVisibility: DescriptorVisibility = DescriptorVisibilities.PRIVATE): IrField = addField(Name.identifier(fieldName), fieldType, fieldVisibility) @PublishedApi @@ -162,14 +162,14 @@ inline fun IrClass.addFunction(builder: IrFunctionBuilder.() -> Unit): IrSimpleF factory.addFunction(this, builder) fun IrClass.addFunction( - name: String, - returnType: IrType, - modality: Modality = Modality.FINAL, - visibility: Visibility = Visibilities.PUBLIC, - isStatic: Boolean = false, - isSuspend: Boolean = false, - isFakeOverride: Boolean = false, - origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFINED + name: String, + returnType: IrType, + modality: Modality = Modality.FINAL, + visibility: DescriptorVisibility = DescriptorVisibilities.PUBLIC, + isStatic: Boolean = false, + isSuspend: Boolean = false, + isFakeOverride: Boolean = false, + origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFINED ): IrSimpleFunction = addFunction { this.name = Name.identifier(name) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/MutableController.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/MutableController.kt index fb71154352f..67cd75ac4a3 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/MutableController.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/MutableController.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.backend.js -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.PersistentIrBodyBase @@ -152,7 +152,7 @@ open class MutableController(val context: JsIrBackendContext, val lowerings: Lis } override fun canAccessDeclarationsOf(irClass: IrClass): Boolean { - return !declarationListsRestricted || irClass.visibility == Visibilities.LOCAL && irClass !in context.extractedLocalClasses + return !declarationListsRestricted || irClass.visibility == DescriptorVisibilities.LOCAL && irClass !in context.extractedLocalClasses } private var restrictedToDeclaration: IrDeclaration? = null diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt index 01147df89b9..28428c5bf14 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.ir.isExpect import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.backend.js.* import org.jetbrains.kotlin.ir.backend.js.lower.ES6AddInternalParametersToConstructorPhase.* import org.jetbrains.kotlin.ir.backend.js.utils.getJsNameOrKotlinName @@ -356,7 +356,7 @@ private fun getExportCandidate(declaration: IrDeclaration): IrDeclarationWithNam // Only actual public declarations with name can be exported if (declaration !is IrDeclarationWithVisibility || declaration !is IrDeclarationWithName || - declaration.visibility != Visibilities.PUBLIC || + declaration.visibility != DescriptorVisibilities.PUBLIC || declaration.isExpect ) { return null diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt index d6b862fa88a..f9115d9142f 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.ir.isElseBranch -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext @@ -57,7 +57,7 @@ abstract class AbstractBlockDecomposerLowering( val initFunction = context.irFactory.buildFun { name = Name.identifier(container.name.asString() + "\$init\$") returnType = container.type - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE origin = JsIrBuilder.SYNTHESIZED_DECLARATION }.apply { parent = container.parent @@ -766,4 +766,4 @@ class BlockDecomposerTransformer( } } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt index bbab07db60b..1c5fad632b7 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclaration import org.jetbrains.kotlin.backend.common.ir.moveBodyTo import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.common.runOnFilePostfix -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.* @@ -116,7 +116,7 @@ class CallableReferenceLowering(private val context: CommonBackendContext) : Bod private fun buildReferenceClass(): IrClass { return context.irFactory.buildClass { setSourceRange(reference) - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL // A callable reference results in a synthetic class, while a lambda is not synthetic. // We don't produce GENERATED_SAM_IMPLEMENTATION, which is always synthetic. origin = if (isKReference || !isLambda) FUNCTION_REFERENCE_IMPL else LAMBDA_IMPL @@ -377,4 +377,4 @@ class CallableReferenceLowering(private val context: CommonBackendContext) : Bod val BOUND_RECEIVER_NAME = Name.identifier("\$boundThis") } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt index dc399ea1044..bf3c94fe70e 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CreateScriptFunctionsPhase.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.declarations.buildFun @@ -91,7 +91,7 @@ class CreateScriptFunctionsPhase(val context: CommonBackendContext) : FileLoweri this.endOffset = endOffset this.origin = SCRIPT_FUNCTION this.name = Name.identifier(name) - this.visibility = Visibilities.PRIVATE + this.visibility = DescriptorVisibilities.PRIVATE this.returnType = returnType }.also { it.parent = irScript diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6AddInternalParametersToConstructorPhase.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6AddInternalParametersToConstructorPhase.kt index 6e58e3c7d5b..d74c4e4c7f4 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6AddInternalParametersToConstructorPhase.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ES6AddInternalParametersToConstructorPhase.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext @@ -109,7 +109,7 @@ class ES6AddInternalParametersToConstructorPhase(val context: JsIrBackendContext return context.irFactory.buildFun { name = Name.identifier(functionName) returnType = context.irBuiltIns.unitType - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED modality = Modality.FINAL isInline = constructor.isInline isExternal = constructor.isExternal diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt index 469cdbe0c6f..7779c4f315b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/InteropCallableReferenceLowering.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.copyToWithoutSuperTypes -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext @@ -114,7 +114,7 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo endOffset = invokeFun.endOffset // Since box/unbox is done on declaration side in case of suspend function use the specified type returnType = if (invokeFun.isSuspend) invokeFun.returnType else superInvokeFun.returnType - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL name = lambdaName isSuspend = invokeFun.isSuspend } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt index 3150fd62807..36cb6555d26 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsInnerClassesSupport.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.getOrPut import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.copyTypeParametersFrom import org.jetbrains.kotlin.backend.common.lower.InnerClassesSupport -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.backend.js.JsMapping import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder.SYNTHESIZED_DECLARATION @@ -41,7 +41,7 @@ class JsInnerClassesSupport(mapping: JsMapping, private val irFactory: IrFactory origin = InnerClassesSupport.FIELD_FOR_OUTER_THIS name = Name.identifier("\$this") type = outerClass.defaultType - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED isFinal = true isExternal = false isStatic = false diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsSingleAbstractMethodLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsSingleAbstractMethodLowering.kt index a0dc91f82a1..0fc71862551 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsSingleAbstractMethodLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsSingleAbstractMethodLowering.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.lower.SingleAbstractMethodLowering import org.jetbrains.kotlin.backend.common.ScopeWithIr -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.ir.util.render class JsSingleAbstractMethodLowering(context: JsIrBackendContext) : SingleAbstractMethodLowering(context), BodyLoweringPass { - override fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List): Visibility { - return Visibilities.PRIVATE + override fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List): DescriptorVisibility { + return DescriptorVisibilities.PRIVATE } override val IrType.needEqualsHashCodeMethods get() = false @@ -62,4 +62,4 @@ class JsSingleAbstractMethodLowering(context: JsIrBackendContext) : SingleAbstra // we don't have to be more saint than a pope here. return typeOperand.classOrNull?.defaultType ?: error("Unsupported SAM conversion: ${typeOperand.render()}") } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrimaryConstructorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrimaryConstructorLowering.kt index 46bc3f31900..4319416ea54 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrimaryConstructorLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrimaryConstructorLowering.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.DeclarationTransformer -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext import org.jetbrains.kotlin.ir.builders.declarations.addConstructor @@ -48,7 +48,7 @@ class PrimaryConstructorLowering(context: JsCommonBackendContext) : DeclarationT irClass.addConstructor { origin = SYNTHETIC_PRIMARY_CONSTRUCTOR isPrimary = true - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE } } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrivateMembersLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrivateMembersLowering.kt index 521bb448bb0..8f004e396b6 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrivateMembersLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrivateMembersLowering.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.DeclarationTransformer import org.jetbrains.kotlin.backend.common.ir.copyTo -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext import org.jetbrains.kotlin.ir.builders.declarations.buildFun import org.jetbrains.kotlin.ir.builders.declarations.buildValueParameter @@ -47,7 +47,7 @@ class PrivateMembersLowering(val context: JsIrBackendContext) : DeclarationTrans private fun transformMemberToStaticFunction(function: IrSimpleFunction): IrSimpleFunction? { - if (function.visibility != Visibilities.PRIVATE || function.dispatchReceiverParameter == null) return null + if (function.visibility != DescriptorVisibilities.PRIVATE || function.dispatchReceiverParameter == null) return null val staticFunction = context.irFactory.buildFun { updateFrom(function) @@ -215,4 +215,4 @@ class PrivateMemberBodiesLowering(val context: JsIrBackendContext) : BodyLowerin } }, null) } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt index dc381c0f11c..b20f8460c1d 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/SecondaryCtorLowering.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.getOrPut import org.jetbrains.kotlin.backend.common.ir.copyTo import org.jetbrains.kotlin.backend.common.ir.copyTypeParametersFrom import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET @@ -172,7 +172,7 @@ private fun JsIrBackendContext.buildInitDeclaration(constructor: IrConstructor, return irFactory.buildFun { name = Name.identifier(functionName) returnType = type - visibility = Visibilities.INTERNAL + visibility = DescriptorVisibilities.INTERNAL modality = Modality.FINAL isInline = constructor.isInline isExternal = constructor.isExternal @@ -306,4 +306,4 @@ private class CallsiteRedirectionTransformer(private val context: JsIrBackendCon putValueArgument(i, call.getValueArgument(i)) } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/AbstractSuspendFunctionsLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/AbstractSuspendFunctionsLowering.kt index 65cff8f7a51..5909c7a59d1 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/AbstractSuspendFunctionsLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/AbstractSuspendFunctionsLowering.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.* import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.backend.js.lower.CallableReferenceLowering import org.jetbrains.kotlin.ir.builders.* @@ -334,7 +334,7 @@ abstract class AbstractSuspendFunctionsLowering(val co endOffset = function.endOffset origin = DECLARATION_ORIGIN_COROUTINE_IMPL name = Name.identifier("create") - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED returnType = coroutineClass.defaultType }.apply { parent = coroutineClass @@ -522,7 +522,7 @@ abstract class AbstractSuspendFunctionsLowering(val co this.origin = DECLARATION_ORIGIN_COROUTINE_IMPL this.name = name this.type = type - this.visibility = Visibilities.PRIVATE + this.visibility = DescriptorVisibilities.PRIVATE this.isFinal = !isMutable }.also { it.parent = this diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt index 01a4d687d95..58dc913e054 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.backend.js.export.isExported import org.jetbrains.kotlin.ir.backend.js.utils.* import org.jetbrains.kotlin.ir.declarations.* @@ -100,7 +100,7 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo if (property.getter?.extensionReceiverParameter != null || property.setter?.extensionReceiverParameter != null) continue - if (property.visibility != Visibilities.PUBLIC) + if (property.visibility != DescriptorVisibilities.PUBLIC) continue if (property.isFakeOverride) @@ -108,7 +108,7 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo fun IrSimpleFunction.accessorRef(): JsNameRef? = when (visibility) { - Visibilities.PRIVATE -> null + DescriptorVisibilities.PRIVATE -> null else -> JsNameRef( context.getNameForMemberFunction(this), classPrototypeRef diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt index 6daf18f2f95..c6979ef4953 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCachedDeclarations.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.backend.jvm.ir.copyCorrespondingPropertyFrom import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.builders.declarations.buildClass import org.jetbrains.kotlin.ir.builders.declarations.buildField import org.jetbrains.kotlin.ir.builders.declarations.buildFun @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.load.java.DescriptorsJvmAbiUtil.isMappedIntrinsicCompanionObject -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.deprecation.DeprecationResolver @@ -74,8 +74,8 @@ class JvmCachedDeclarations( isFinal = true isStatic = true visibility = when { - !useProperVisibilityForCompanion -> Visibilities.PUBLIC - originalVisibility == Visibilities.PROTECTED -> JavaVisibilities.PROTECTED_STATIC_VISIBILITY + !useProperVisibilityForCompanion -> DescriptorVisibilities.PUBLIC + originalVisibility == DescriptorVisibilities.PROTECTED -> JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY else -> originalVisibility } @@ -93,7 +93,7 @@ class JvmCachedDeclarations( origin = JvmLoweredDeclarationOrigin.INTERFACE_COMPANION_PRIVATE_INSTANCE isFinal = true isStatic = true - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY }.apply { parent = singleton } @@ -170,7 +170,7 @@ class JvmCachedDeclarations( // Interface functions are public or private, with one exception: clone in Cloneable, which is protected. // However, Cloneable has no DefaultImpls, so this merely replicates the incorrect behavior of the old backend. // We should rather not generate a bridge to clone when interface inherits from Cloneable at all. - visibility = if (interfaceFun.visibility == Visibilities.PRIVATE) Visibilities.PRIVATE else Visibilities.PUBLIC, + visibility = if (interfaceFun.visibility == DescriptorVisibilities.PRIVATE) DescriptorVisibilities.PRIVATE else DescriptorVisibilities.PUBLIC, isFakeOverride = false, typeParametersFromContext = parent.typeParameters 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 4ebc62d8ce7..9402c6867ee 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 @@ -52,7 +52,7 @@ class JvmGeneratorExtensions(private val generateFacades: Boolean = true) : Gene companion object Instance : JvmSamConversion() } - override fun computeFieldVisibility(descriptor: PropertyDescriptor): Visibility? = + override fun computeFieldVisibility(descriptor: PropertyDescriptor): DescriptorVisibility? = if (descriptor.hasJvmFieldAnnotation() || descriptor is JavaCallableMemberDescriptor) descriptor.visibility else diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt index 9561cb0f617..9d30b4bb0e4 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt @@ -13,11 +13,10 @@ import org.jetbrains.kotlin.backend.common.lower.optimizations.foldConstantLower import org.jetbrains.kotlin.backend.common.phaser.* import org.jetbrains.kotlin.backend.jvm.codegen.shouldContainSuspendMarkers import org.jetbrains.kotlin.backend.jvm.lower.* -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* -import org.jetbrains.kotlin.ir.symbols.IrValueParameterSymbol import org.jetbrains.kotlin.ir.symbols.IrValueSymbol import org.jetbrains.kotlin.ir.util.PatchDeclarationParentsVisitor import org.jetbrains.kotlin.ir.util.isAnonymousObject @@ -25,7 +24,7 @@ import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.NameUtils private fun makePatchParentsPhase(number: Int): NamedCompilerPhase = makeIrFilePhase( @@ -112,7 +111,7 @@ internal val localDeclarationsPhase = makeIrFilePhase( NameUtils.sanitizeAsJavaIdentifier(super.localName(declaration)) }, object : VisibilityPolicy { - override fun forClass(declaration: IrClass, inInlineFunctionScope: Boolean): Visibility = + override fun forClass(declaration: IrClass, inInlineFunctionScope: Boolean): DescriptorVisibility = if (declaration.origin == JvmLoweredDeclarationOrigin.LAMBDA_IMPL || declaration.origin == JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL || declaration.origin == JvmLoweredDeclarationOrigin.GENERATED_PROPERTY_REFERENCE @@ -122,17 +121,17 @@ internal val localDeclarationsPhase = makeIrFilePhase( declaration.visibility } - override fun forConstructor(declaration: IrConstructor, inInlineFunctionScope: Boolean): Visibility = + override fun forConstructor(declaration: IrConstructor, inInlineFunctionScope: Boolean): DescriptorVisibility = if (declaration.parentAsClass.isAnonymousObject) scopedVisibility(inInlineFunctionScope) else declaration.visibility - override fun forCapturedField(value: IrValueSymbol): Visibility = - JavaVisibilities.PACKAGE_VISIBILITY // avoid requiring a synthetic accessor for it + override fun forCapturedField(value: IrValueSymbol): DescriptorVisibility = + JavaDescriptorVisibilities.PACKAGE_VISIBILITY // avoid requiring a synthetic accessor for it - private fun scopedVisibility(inInlineFunctionScope: Boolean): Visibility = - if (inInlineFunctionScope) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + private fun scopedVisibility(inInlineFunctionScope: Boolean): DescriptorVisibility = + if (inInlineFunctionScope) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY } ) }, 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 738c7ca2c2c..8abbb630bcc 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 @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CREATE_METHOD_NA import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.* import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin @@ -277,7 +277,7 @@ class JvmSymbols( continuationClass.typeWith(irBuiltIns.anyNType).makeNullable() ) } - klass.addFunction(INVOKE_SUSPEND_METHOD_NAME, irBuiltIns.anyNType, Modality.ABSTRACT, Visibilities.PROTECTED).apply { + klass.addFunction(INVOKE_SUSPEND_METHOD_NAME, irBuiltIns.anyNType, Modality.ABSTRACT, DescriptorVisibilities.PROTECTED).apply { addValueParameter(SUSPEND_CALL_RESULT_NAME, resultClassStub.typeWith(irBuiltIns.anyNType)) } klass.addFunction(SUSPEND_FUNCTION_CREATE_METHOD_NAME, continuationClass.typeWith(irBuiltIns.unitType), Modality.OPEN).apply { @@ -306,7 +306,7 @@ class JvmSymbols( addValueParameter("receiver", irBuiltIns.anyNType) } - klass.addField("receiver", irBuiltIns.anyNType, Visibilities.PROTECTED) + klass.addField("receiver", irBuiltIns.anyNType, DescriptorVisibilities.PROTECTED) generateCallableReferenceMethods(klass) } @@ -440,7 +440,7 @@ class JvmSymbols( backingField = irFactory.buildField { name = receiverFieldName type = irBuiltIns.anyNType - visibility = Visibilities.PROTECTED + visibility = DescriptorVisibilities.PROTECTED }.also { field -> field.parent = klass } 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 84c21afb683..3767620c87e 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.TypePathInfo import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JvmTarget.JVM_1_6 import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.ir.declarations.* @@ -81,7 +81,7 @@ abstract class AnnotationCodegen( KotlinTarget.CLASS !in applicableTargets && KotlinTarget.ANNOTATION_CLASS !in applicableTargets ) { - if (annotated.visibility == Visibilities.LOCAL) { + if (annotated.visibility == DescriptorVisibilities.LOCAL) { assert(KotlinTarget.EXPRESSION in applicableTargets) { "Inconsistent target list for object literal annotation: $applicableTargets on $annotated" } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index 733cc0fc7a9..8cf2f2beed6 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.inline.* import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.builders.declarations.buildFun import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor @@ -426,7 +426,7 @@ private val Modality.flags: Int else -> throw AssertionError("Unsupported modality $this") } -private val Visibility.flags: Int +private val DescriptorVisibility.flags: Int get() = AsmUtil.getVisibilityAccessFlag(this) ?: throw AssertionError("Unsupported visibility $this") internal val IrDeclaration.OtherOrigin: JvmDeclarationOrigin diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt index 39f5fef9b8d..cf3045bcd99 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.isReleaseCoroutines import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* @@ -258,7 +258,7 @@ class ExpressionCodegen( return val notCallableFromJava = inlinedInto != null || - (Visibilities.isPrivate(irFunction.visibility) && !(irFunction is IrSimpleFunction && irFunction.isOperator)) || + (DescriptorVisibilities.isPrivate(irFunction.visibility) && !(irFunction is IrSimpleFunction && irFunction.isOperator)) || irFunction.origin.isSynthetic || // TODO: refine this condition to not generate nullability assertions on parameters // corresponding to captured variables and anonymous object super constructor arguments diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt index a5720242fcd..2314a29de47 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt @@ -21,12 +21,12 @@ import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.visitAnnotableParameterCount import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.util.* -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.annotations.JVM_THROWS_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.jvm.annotations.JVM_SYNTHETIC_ANNOTATION_FQ_NAME @@ -155,8 +155,8 @@ class FunctionCodegen( private fun IrFunction.getVisibilityForDefaultArgumentStub(): Int = when (visibility) { - Visibilities.PUBLIC -> Opcodes.ACC_PUBLIC - JavaVisibilities.PACKAGE_VISIBILITY -> AsmUtil.NO_FLAG_PACKAGE_PRIVATE + DescriptorVisibilities.PUBLIC -> Opcodes.ACC_PUBLIC + JavaDescriptorVisibilities.PACKAGE_VISIBILITY -> AsmUtil.NO_FLAG_PACKAGE_PRIVATE else -> throw IllegalStateException("Default argument stub should be either public or package private: ${ir2string(this)}") } @@ -182,7 +182,7 @@ class FunctionCodegen( else -> if (parentAsClass.isJvmInterface && body == null) Opcodes.ACC_ABSTRACT else 0 } val isSynthetic = origin.isSynthetic || hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) || - (isSuspend && Visibilities.isPrivate(visibility) && !isInline) || isReifiable() + (isSuspend && DescriptorVisibilities.isPrivate(visibility) && !isInline) || isReifiable() val isStrict = hasAnnotation(STRICTFP_ANNOTATION_FQ_NAME) val isSynchronized = hasAnnotation(SYNCHRONIZED_ANNOTATION_FQ_NAME) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapping.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapping.kt index d0fecb34e99..6982d244b25 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapping.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrTypeMapping.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.jvm.codegen import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrType @@ -63,7 +63,7 @@ private fun IrSimpleType.buildPossiblyInnerType(classifier: IrClass?, index: Int val toIndex = classifier.typeParameters.size + index if (!classifier.isInner) { - assert(toIndex == arguments.size || classifier.visibility == Visibilities.LOCAL) { + assert(toIndex == arguments.size || classifier.visibility == DescriptorVisibilities.LOCAL) { "${arguments.size - toIndex} trailing arguments were found in this type: ${render()}" } 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 c8f9ec0b0b5..2b5bf9ede3b 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 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.state.JVM_SUPPRESS_WILDCARDS_ANNOTATION_FQ_N import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.codegen.state.extractTypeMappingModeFromAnnotation import org.jetbrains.kotlin.codegen.state.isMethodWithDeclarationSiteWildcardsFqName -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyFunctionBase @@ -106,7 +106,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { val newName = JvmCodegenUtil.sanitizeNameIfNeeded(name, context.state.languageVersionSettings) if (function.isTopLevel) { - if (Visibilities.isPrivate(function.suspendFunctionOriginal().visibility) && + if (DescriptorVisibilities.isPrivate(function.suspendFunctionOriginal().visibility) && newName != "" && (function.parent as? IrClass)?.attributeOwnerId in context.multifileFacadeForPart ) { return "$newName$${function.parentAsClass.name.asString()}" @@ -123,7 +123,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { private fun IrFunction.shouldMangleAsInternal() = this !is IrConstructor && origin != JvmLoweredDeclarationOrigin.STATIC_INLINE_CLASS_CONSTRUCTOR && - visibility == Visibilities.INTERNAL && + visibility == DescriptorVisibilities.INTERNAL && !isPublishedApi() private fun getModuleName(function: IrFunction): String = @@ -313,8 +313,8 @@ class MethodSignatureMapper(private val context: JvmBackendContext) { val invokeOpcode = when { callee.dispatchReceiverParameter == null -> Opcodes.INVOKESTATIC isSuperCall -> Opcodes.INVOKESPECIAL - isInterface && !Visibilities.isPrivate(callee.visibility) -> Opcodes.INVOKEINTERFACE - Visibilities.isPrivate(callee.visibility) && !callee.isSuspend -> Opcodes.INVOKESPECIAL + isInterface && !DescriptorVisibilities.isPrivate(callee.visibility) -> Opcodes.INVOKEINTERFACE + DescriptorVisibilities.isPrivate(callee.visibility) && !callee.isSuspend -> Opcodes.INVOKESPECIAL else -> Opcodes.INVOKEVIRTUAL } 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 50dbdde157b..a699f9f5e04 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 @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.util.* -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker @@ -133,7 +133,7 @@ fun IrClass.calculateInnerClassAccessFlags(context: JvmBackendContext): Int { } val visibility = when { isLambda -> getVisibilityAccessFlagForAnonymous() - visibility === Visibilities.LOCAL -> Opcodes.ACC_PUBLIC + visibility === DescriptorVisibilities.LOCAL -> Opcodes.ACC_PUBLIC else -> getVisibilityAccessFlag() } return visibility or @@ -163,15 +163,15 @@ fun IrDeclarationWithVisibility.getVisibilityAccessFlag(kind: OwnerKind? = null) return it } return when (visibility) { - Visibilities.PRIVATE -> Opcodes.ACC_PRIVATE - Visibilities.PRIVATE_TO_THIS -> Opcodes.ACC_PRIVATE - Visibilities.PROTECTED -> Opcodes.ACC_PROTECTED - JavaVisibilities.PROTECTED_STATIC_VISIBILITY -> Opcodes.ACC_PROTECTED - JavaVisibilities.PROTECTED_AND_PACKAGE -> Opcodes.ACC_PROTECTED - Visibilities.PUBLIC -> Opcodes.ACC_PUBLIC - Visibilities.INTERNAL -> Opcodes.ACC_PUBLIC - Visibilities.LOCAL -> NO_FLAG_LOCAL - JavaVisibilities.PACKAGE_VISIBILITY -> AsmUtil.NO_FLAG_PACKAGE_PRIVATE + DescriptorVisibilities.PRIVATE -> Opcodes.ACC_PRIVATE + DescriptorVisibilities.PRIVATE_TO_THIS -> Opcodes.ACC_PRIVATE + DescriptorVisibilities.PROTECTED -> Opcodes.ACC_PROTECTED + JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY -> Opcodes.ACC_PROTECTED + JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE -> Opcodes.ACC_PROTECTED + DescriptorVisibilities.PUBLIC -> Opcodes.ACC_PUBLIC + DescriptorVisibilities.INTERNAL -> Opcodes.ACC_PUBLIC + DescriptorVisibilities.LOCAL -> NO_FLAG_LOCAL + JavaDescriptorVisibilities.PACKAGE_VISIBILITY -> AsmUtil.NO_FLAG_PACKAGE_PRIVATE else -> throw IllegalStateException("$visibility is not a valid visibility in backend for ${ir2string(this)}") } } @@ -180,7 +180,7 @@ private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?): // if (JvmCodegenUtil.isNonIntrinsicPrivateCompanionObjectInInterface(memberDescriptor)) { // return ACC_PUBLIC // } - if (this is IrClass && Visibilities.isPrivate(visibility) && isCompanion && hasInterfaceParent()) { + if (this is IrClass && DescriptorVisibilities.isPrivate(visibility) && isCompanion && hasInterfaceParent()) { // TODO: non-intrinsic return Opcodes.ACC_PUBLIC } @@ -200,7 +200,7 @@ private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?): } // if (memberVisibility === Visibilities.LOCAL && memberDescriptor is CallableMemberDescriptor) { - if (visibility === Visibilities.LOCAL && this is IrFunction) { + if (visibility === DescriptorVisibilities.LOCAL && this is IrFunction) { return Opcodes.ACC_PUBLIC } @@ -251,13 +251,13 @@ private fun IrDeclarationWithVisibility.specialCaseVisibility(kind: OwnerKind?): // } // } // } - if (this is IrSimpleFunction && visibility === Visibilities.PROTECTED && + if (this is IrSimpleFunction && visibility === DescriptorVisibilities.PROTECTED && allOverridden().any { it.parentAsClass.isJvmInterface } ) { return Opcodes.ACC_PUBLIC } - if (!Visibilities.isPrivate(visibility)) { + if (!DescriptorVisibilities.isPrivate(visibility)) { return null } @@ -299,7 +299,7 @@ fun IrDeclarationWithVisibility.isInlineOnlyPrivateInBytecode(): Boolean = (this is IrFunction && isInlineOnly()) || isPrivateInlineSuspend() private fun IrDeclarationWithVisibility.isPrivateInlineSuspend(): Boolean = - this is IrFunction && isSuspend && isInline && visibility == Visibilities.PRIVATE + this is IrFunction && isSuspend && isInline && visibility == DescriptorVisibilities.PRIVATE private fun IrDeclarationWithVisibility.isInlineOnlyPropertyAccessor(): Boolean { if (this !is IrSimpleFunction) return false @@ -392,11 +392,11 @@ fun IrClass.getVisibilityAccessFlagForClass(): Int { if (kind == ClassKind.ENUM_ENTRY) { return AsmUtil.NO_FLAG_PACKAGE_PRIVATE } - return if (visibility === Visibilities.PUBLIC || - visibility === Visibilities.PROTECTED || + return if (visibility === DescriptorVisibilities.PUBLIC || + visibility === DescriptorVisibilities.PROTECTED || // TODO: should be package private, but for now Kotlin's reflection can't access members of such classes - visibility === Visibilities.LOCAL || - visibility === Visibilities.INTERNAL + visibility === DescriptorVisibilities.LOCAL || + visibility === DescriptorVisibilities.INTERNAL ) { Opcodes.ACC_PUBLIC } else AsmUtil.NO_FLAG_PACKAGE_PRIVATE diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt index 05da0ba6320..6652237975c 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrUtils.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX import org.jetbrains.kotlin.config.JvmDefaultMode import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection import org.jetbrains.kotlin.ir.types.impl.originalKotlinType import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -169,7 +169,7 @@ fun IrClass.hasJvmDefaultNoCompatibilityAnnotation(): Boolean = hasAnnotation(JV fun IrFunction.hasPlatformDependent(): Boolean = propertyIfAccessor.hasAnnotation(PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME) fun IrFunction.getJvmVisibilityOfDefaultArgumentStub() = - if (Visibilities.isPrivate(visibility) || isInlineOnly()) JavaVisibilities.PACKAGE_VISIBILITY else Visibilities.PUBLIC + if (DescriptorVisibilities.isPrivate(visibility) || isInlineOnly()) JavaDescriptorVisibilities.PACKAGE_VISIBILITY else DescriptorVisibilities.PUBLIC fun IrValueParameter.isInlineParameter() = index >= 0 && !isNoinline && (type.isFunction() || type.isSuspendFunctionTypeOrSubtype()) && @@ -340,7 +340,7 @@ fun IrProperty.needsAccessor(accessor: IrSimpleFunction): Boolean = when { // @JvmField properties have no getters/setters resolveFakeOverride()?.backingField?.hasAnnotation(JvmAbi.JVM_FIELD_ANNOTATION_FQ_NAME) == true -> false // We do not produce default accessors for private fields - else -> accessor.origin != IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR || !Visibilities.isPrivate(accessor.visibility) + else -> accessor.origin != IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR || !DescriptorVisibilities.isPrivate(accessor.visibility) } val IrDeclaration.isStaticInlineClassReplacement: Boolean diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt index e7e99b5b49f..34e6b0f09e9 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.backend.jvm.localDeclarationsPhase import org.jetbrains.kotlin.codegen.coroutines.* import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.util.OperatorNameConventions @@ -163,7 +163,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : JvmLoweredDeclarationOrigin.SUSPEND_LAMBDA, // Since inline functions can be inlined to different package, we should generate lambdas inside these functions // as public - if (insideInlineFunction) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + if (insideInlineFunction) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY ).apply { copyAttributes(info.reference) copyTypeParametersFrom(info.function) @@ -178,7 +178,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : annotations = emptyList() ) - addField(COROUTINE_LABEL_FIELD_NAME, context.irBuiltIns.intType, JavaVisibilities.PACKAGE_VISIBILITY) + addField(COROUTINE_LABEL_FIELD_NAME, context.irBuiltIns.intType, JavaDescriptorVisibilities.PACKAGE_VISIBILITY) val receiverField = info.function.extensionReceiverParameter?.let { assert(info.arity != 0) @@ -188,7 +188,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : // NB extension receiver can't be crossinline origin = LocalDeclarationsLowering.DECLARATION_ORIGIN_FIELD_FOR_CAPTURED_VALUE type = it.type - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE } } @@ -201,7 +201,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : else LocalDeclarationsLowering.DECLARATION_ORIGIN_FIELD_FOR_CAPTURED_VALUE isFinal = info.reference.getValueArgument(it.index) != null - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY } } val fieldsForBound = parametersFields.filter { it.isFinal } @@ -361,7 +361,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : private fun IrClass.createContinuationClassFor( parent: IrDeclarationParent, newOrigin: IrDeclarationOrigin, - newVisibility: Visibility + newVisibility: DescriptorVisibility ): IrClass = context.irFactory.buildClass { name = Name.special("") origin = newOrigin @@ -382,7 +382,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : addConstructor { isPrimary = true returnType = defaultType - visibility = if (insideInlineFunction) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + visibility = if (insideInlineFunction) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY }.also { constructor -> for ((param, arg) in info.reference.getArguments()) { constructor.addValueParameter(name = param.name.asString(), type = arg.type) @@ -423,25 +423,25 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : .createContinuationClassFor( irFunction, JvmLoweredDeclarationOrigin.CONTINUATION_CLASS, - if (capturesCrossinline) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + if (capturesCrossinline) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY ).apply { copyTypeParametersFrom(irFunction) val resultField = addField { origin = JvmLoweredDeclarationOrigin.CONTINUATION_CLASS_RESULT_FIELD name = Name.identifier(context.state.languageVersionSettings.dataFieldName()) type = context.irBuiltIns.anyNType - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY } val capturedThisField = dispatchReceiverParameter?.let { addField { name = Name.identifier("this$0") type = it.type origin = InnerClassesSupport.FIELD_FOR_OUTER_THIS - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY isFinal = true } } - val labelField = addField(COROUTINE_LABEL_FIELD_NAME, context.irBuiltIns.intType, JavaVisibilities.PACKAGE_VISIBILITY) + val labelField = addField(COROUTINE_LABEL_FIELD_NAME, context.irBuiltIns.intType, JavaDescriptorVisibilities.PACKAGE_VISIBILITY) addConstructorForNamedFunction(capturedThisField, capturesCrossinline) addInvokeSuspendForNamedFunction( irFunction, @@ -458,7 +458,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : addConstructor { isPrimary = true returnType = defaultType - visibility = if (capturesCrossinline) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + visibility = if (capturesCrossinline) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY }.also { constructor -> val capturedThisParameter = capturedThisField?.let { constructor.addValueParameter(it.name.asString(), it.type) } val completionParameterSymbol = constructor.addCompletionValueParameter() @@ -615,7 +615,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : modality = view.modality isSuspend = view.isSuspend isInline = view.isInline - visibility = if (view.isInline) Visibilities.PRIVATE else view.visibility + visibility = if (view.isInline) DescriptorVisibilities.PRIVATE else view.visibility origin = if (view.isInline) JvmLoweredDeclarationOrigin.FOR_INLINE_STATE_MACHINE_TEMPLATE else JvmLoweredDeclarationOrigin.FOR_INLINE_STATE_MACHINE_TEMPLATE_CAPTURES_CROSSINLINE 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 5162c7de4a9..216685ff19a 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl import org.jetbrains.kotlin.ir.types.getClass import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.IrElementTransformer -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.util.OperatorNameConventions @@ -141,7 +141,7 @@ fun IrClass.buildAssertionsDisabledField(backendContext: JvmBackendContext, topL factory.buildField { name = Name.identifier(ASSERTIONS_DISABLED_FIELD_NAME) origin = JvmLoweredDeclarationOrigin.GENERATED_ASSERTION_ENABLED_FIELD - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY type = backendContext.irBuiltIns.booleanType isFinal = true isStatic = true diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index 787fcbc1f3e..79baf0d999c 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.isJvmAbstract import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.unboxInlineClass import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addFunction @@ -178,7 +178,7 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass // Only overrides may need bridges and so in particular, private and static functions do not. // Note that this includes the static replacements for inline class functions (which are static, but have // overriddenSymbols in order to produce correct signatures in the type mapper). - if (Visibilities.isPrivate(irFunction.visibility) || irFunction.isStatic || irFunction.overriddenSymbols.isEmpty()) + if (DescriptorVisibilities.isPrivate(irFunction.visibility) || irFunction.isStatic || irFunction.overriddenSymbols.isEmpty()) return false // None of the methods of Any have type parameters and so we will not need bridges for them. @@ -384,7 +384,7 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass // Internal functions can be overridden by non-internal functions, which changes their names since the names of internal // functions are mangled. In order to avoid mangling the name twice we reset the visibility for bridges to internal // functions to public and use the mangled name directly. - visibility = bridge.overridden.visibility.takeUnless { it == Visibilities.INTERNAL } ?: Visibilities.PUBLIC + visibility = bridge.overridden.visibility.takeUnless { it == DescriptorVisibilities.INTERNAL } ?: DescriptorVisibilities.PUBLIC name = Name.identifier(bridge.signature.name) returnType = bridge.overridden.returnType.eraseTypeParameters() isSuspend = bridge.overridden.isSuspend diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt index f3340ecb215..7e46240d0ef 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/EnumClassLowering.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder import org.jetbrains.kotlin.backend.jvm.ir.irArray import org.jetbrains.kotlin.codegen.ImplementationBodyCodegen -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addField @@ -87,7 +87,7 @@ private class EnumClassLowering(val context: JvmBackendContext) : ClassLoweringP private fun buildValuesField(): IrField = irClass.addField { name = Name.identifier(ImplementationBodyCodegen.ENUM_VALUES_FIELD_NAME) type = context.irBuiltIns.arrayClass.typeWith(irClass.defaultType) - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE origin = IrDeclarationOrigin.FIELD_FOR_ENUM_VALUES isFinal = true isStatic = true diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt index bdd445ea247..481742282a8 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.config.JvmAnalysisFlags import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.fileClasses.JvmSimpleFileClassInfo @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl import org.jetbrains.kotlin.ir.util.NaiveSourceBasedFileEntryImpl import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi2ir.PsiSourceManager import org.jetbrains.kotlin.resolve.jvm.JvmClassName @@ -100,7 +100,7 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa symbol = IrClassSymbolImpl(descriptor), name = fileClassInfo.fileClassFqName.shortName(), kind = ClassKind.CLASS, - visibility = if (!fileClassInfo.withJvmMultifileClass) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY, + visibility = if (!fileClassInfo.withJvmMultifileClass) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY, modality = Modality.FINAL ).apply { descriptor.bind(this) 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 89238d6e4f5..2ebf83b546f 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 @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.irArray import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addFunction @@ -105,7 +105,7 @@ private class FunctionNVarargBridgeLowering(val context: JvmBackendContext) : name = superFunction.name returnType = context.irBuiltIns.anyNType modality = Modality.FINAL - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC origin = IrDeclarationOrigin.BRIDGE }.apply { overriddenSymbols += superFunction.symbol diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt index 4c947dd8f70..62de75f852d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.ir.* import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addConstructor @@ -168,7 +168,7 @@ internal class FunctionReferenceLowering(private val context: JvmBackendContext) private val functionReferenceClass = context.irFactory.buildClass { setSourceRange(irFunctionReference) - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL // A callable reference results in a synthetic class, while a lambda is not synthetic. // We don't produce GENERATED_SAM_IMPLEMENTATION, which is always synthetic. origin = if (isLambda) JvmLoweredDeclarationOrigin.LAMBDA_IMPL else JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt index 5abc2a21622..fe99c8cd961 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/GenerateMultifileFacades.kt @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.codegen.fileParent import org.jetbrains.kotlin.config.JvmAnalysisFlags +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor import org.jetbrains.kotlin.ir.* import org.jetbrains.kotlin.ir.builders.* @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.inline.INLINE_ONLY_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.jvm.JvmClassName @@ -123,7 +123,7 @@ private fun generateMultifileFacades( superTypes += superClass.typeWith() addConstructor { - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE isPrimary = true }.also { constructor -> constructor.body = context.createIrBuilder(constructor.symbol).irBlockBody { @@ -163,7 +163,7 @@ private fun modifyMultifilePartsForHierarchy(context: JvmBackendContext, unsorte for ((klass, superClass) in parts.zip(superClasses)) { klass.modality = Modality.OPEN - klass.visibility = JavaVisibilities.PACKAGE_VISIBILITY + klass.visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY klass.superTypes = listOf(superClass.typeWith()) @@ -191,7 +191,7 @@ private fun moveFieldsOfConstProperties(partClass: IrClass, facadeClass: IrClass private fun IrField.shouldMoveToFacade(): Boolean { val property = correspondingPropertySymbol?.owner - return property != null && property.isConst && !Visibilities.isPrivate(visibility) + return property != null && property.isConst && !DescriptorVisibilities.isPrivate(visibility) } private fun IrSimpleFunction.createMultifileDelegateIfNeeded( @@ -201,7 +201,7 @@ private fun IrSimpleFunction.createMultifileDelegateIfNeeded( ): IrSimpleFunction? { val target = this - if (Visibilities.isPrivate(visibility) || + if (DescriptorVisibilities.isPrivate(visibility) || name == StaticInitializersLowering.clinitName || origin == JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR ) return null diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt index cc16b0b0ee0..ebfd3ae720a 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InheritedDefaultMethodsOnClassesLowering.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface import org.jetbrains.kotlin.backend.jvm.ir.* import org.jetbrains.kotlin.config.JvmDefaultMode import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.builders.irBlockBody @@ -250,7 +250,7 @@ internal fun IrSimpleFunction.findInterfaceImplementation(jvmDefaultMode: JvmDef } if (!implementation.hasInterfaceParent() - || Visibilities.isPrivate(implementation.visibility) + || DescriptorVisibilities.isPrivate(implementation.visibility) || implementation.isDefinitelyNotDefaultImplsMethod(jvmDefaultMode) || implementation.isMethodOfAny() ) { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InlineCallableReferenceToLambda.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InlineCallableReferenceToLambda.kt index 4e22a3a426c..436b6dbac7a 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InlineCallableReferenceToLambda.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InlineCallableReferenceToLambda.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.IrInlineReferenceLocator import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder import org.jetbrains.kotlin.backend.jvm.ir.irArray import org.jetbrains.kotlin.codegen.AsmUtil.BOUND_REFERENCE_RECEIVER -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter import org.jetbrains.kotlin.ir.builders.declarations.buildFun @@ -80,7 +80,7 @@ internal class InlineCallableReferenceToLambdaPhase(val context: JvmBackendConte setSourceRange(expression) origin = IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA name = Name.identifier("stub_for_inline") - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL returnType = field.type isSuspend = false }.apply { @@ -140,7 +140,7 @@ internal class InlineCallableReferenceToLambdaPhase(val context: JvmBackendConte setSourceRange(expression) origin = IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA name = Name.identifier("stub_for_inlining") - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL returnType = referencedFunction.returnType isSuspend = referencedFunction.isSuspend }.apply { @@ -197,4 +197,4 @@ internal class InlineCallableReferenceToLambdaPhase(val context: JvmBackendConte } } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt index 62ee6f67331..6842aa804e4 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface import org.jetbrains.kotlin.backend.jvm.ir.* import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.IrExpression @@ -104,7 +104,7 @@ internal class InterfaceLowering(val context: JvmBackendContext) : IrElementTran val implementation = function.resolveFakeOverride() ?: error("No single implementation found for: ${function.render()}") when { - Visibilities.isPrivate(implementation.visibility) || implementation.isMethodOfAny() -> + DescriptorVisibilities.isPrivate(implementation.visibility) || implementation.isMethodOfAny() -> continue !function.isDefinitelyNotDefaultImplsMethod(jvmDefaultMode, implementation) -> { val defaultImpl = createDefaultImpl(function) @@ -123,7 +123,7 @@ internal class InterfaceLowering(val context: JvmBackendContext) : IrElementTran * 3) Private methods (not compiled to JVM defaults), default parameter dispatchers (not compiled to JVM defaults) * and $annotation methods are always moved without bridges */ - (Visibilities.isPrivate(function.visibility) && !function.isCompiledToJvmDefault(jvmDefaultMode)) + (DescriptorVisibilities.isPrivate(function.visibility) && !function.isCompiledToJvmDefault(jvmDefaultMode)) || (function.origin == IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER && !function.isCompiledToJvmDefault(jvmDefaultMode)) || function.origin == JvmLoweredDeclarationOrigin.SYNTHETIC_METHOD_FOR_PROPERTY_ANNOTATIONS -> { val defaultImpl = createDefaultImpl(function) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt index 6d864d02693..68ec4c7e845 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.addConstructor import org.jetbrains.kotlin.ir.builders.irBlockBody import org.jetbrains.kotlin.ir.builders.irDelegatingConstructorCall @@ -35,11 +35,11 @@ internal val jvmDefaultConstructorPhase = makeIrFilePhase( private class JvmDefaultConstructorLowering(val context: JvmBackendContext) : ClassLoweringPass { override fun lower(irClass: IrClass) { - if (irClass.kind != ClassKind.CLASS || irClass.visibility == Visibilities.LOCAL || irClass.isInline || irClass.isInner) + if (irClass.kind != ClassKind.CLASS || irClass.visibility == DescriptorVisibilities.LOCAL || irClass.isInline || irClass.isInner) return val primaryConstructor = irClass.constructors.firstOrNull { it.isPrimary } ?: return - if (Visibilities.isPrivate(primaryConstructor.visibility)) + if (DescriptorVisibilities.isPrivate(primaryConstructor.visibility)) return if (primaryConstructor.valueParameters.isEmpty() || !primaryConstructor.valueParameters.all { it.hasDefaultValue() }) @@ -62,4 +62,4 @@ private class JvmDefaultConstructorLowering(val context: JvmBackendContext) : Cl } } } -} \ No newline at end of file +} 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 472b18b844b..afbfc1709d9 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 @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.* import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* @@ -468,7 +468,7 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F // Add the default primary constructor irClass.addConstructor { updateFrom(irConstructor) - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE origin = JvmLoweredDeclarationOrigin.SYNTHETIC_INLINE_CLASS_MEMBER returnType = irConstructor.returnType }.apply { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInnerClassesSupport.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInnerClassesSupport.kt index 005e4e8cb92..c2a2798d97b 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInnerClassesSupport.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInnerClassesSupport.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols import org.jetbrains.kotlin.ir.util.defaultType import org.jetbrains.kotlin.ir.util.dump import org.jetbrains.kotlin.ir.util.parentAsClass -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name class JvmInnerClassesSupport(private val irFactory: IrFactory) : InnerClassesSupport { @@ -36,7 +36,7 @@ class JvmInnerClassesSupport(private val irFactory: IrFactory) : InnerClassesSup name = Name.identifier("this$0") type = innerClass.parentAsClass.defaultType origin = InnerClassesSupport.FIELD_FOR_OUTER_THIS - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY isFinal = true }.apply { parent = innerClass diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt index 402f64a76c6..b2742527f55 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSingleAbstractMethodLowering.kt @@ -10,13 +10,13 @@ import org.jetbrains.kotlin.backend.common.lower.SingleAbstractMethodLowering import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.getClass import org.jetbrains.kotlin.ir.util.defaultType -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities internal val singleAbstractMethodPhase = makeIrFilePhase( ::JvmSingleAbstractMethodLowering, @@ -26,7 +26,7 @@ internal val singleAbstractMethodPhase = makeIrFilePhase( private class JvmSingleAbstractMethodLowering(context: JvmBackendContext) : SingleAbstractMethodLowering(context) { override fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List) = - if (inInlineFunctionScope) Visibilities.PUBLIC else JavaVisibilities.PACKAGE_VISIBILITY + if (inInlineFunctionScope) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY override fun getSuperTypeForWrapper(typeOperand: IrType): IrType = typeOperand.erasedUpperBound.defaultType @@ -35,4 +35,4 @@ private class JvmSingleAbstractMethodLowering(context: JvmBackendContext) : Sing get() = getClass()?.origin != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB override val IrType.needEqualsHashCodeMethods get() = isKotlinFunInterface -} \ No newline at end of file +} diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt index 3d82e250dce..c95eb735e35 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmStaticAnnotationLowering.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.copyCorrespondingPropertyFrom import org.jetbrains.kotlin.backend.jvm.ir.isInCurrentModule import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.addFunction import org.jetbrains.kotlin.ir.builders.declarations.buildFun import org.jetbrains.kotlin.ir.builders.irCall @@ -102,7 +102,7 @@ private class CompanionObjectJvmStaticLowering(val context: JvmBackendContext) : modality = if (isInterface) Modality.OPEN else target.modality // Since we already mangle the name above we need to reset internal visibilities to public in order // to avoid mangling the same name twice. - visibility = if (target.visibility == Visibilities.INTERNAL) Visibilities.PUBLIC else target.visibility + visibility = if (target.visibility == DescriptorVisibilities.INTERNAL) DescriptorVisibilities.PUBLIC else target.visibility isSuspend = target.isSuspend }.apply { copyTypeParametersFrom(target) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt index 68cd7ff653e..b2ee70f6065 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.ir.getJvmNameFromAnnotation import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.languageVersionSettings +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.* @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.constructors import org.jetbrains.kotlin.ir.util.functions import org.jetbrains.kotlin.ir.util.isFileClass -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance @@ -122,7 +122,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex private fun IrClass.generateMainMethod(makeBody: IrBlockBodyBuilder.(IrValueParameter) -> Unit) = addFunction { name = Name.identifier("main") - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC returnType = context.irBuiltIns.unitType modality = Modality.FINAL this.origin = JvmLoweredDeclarationOrigin.GENERATED_EXTENDED_MAIN @@ -139,7 +139,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex return irBlock { val wrapperConstructor = backendContext.irFactory.buildClass { name = Name.special("") - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY modality = Modality.FINAL origin = JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL }.let { wrapper -> @@ -159,7 +159,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex wrapper.addField { name = Name.identifier("args") type = stringArrayType - visibility = Visibilities.PRIVATE + visibility = DescriptorVisibilities.PRIVATE origin = LocalDeclarationsLowering.DECLARATION_ORIGIN_FIELD_FOR_CAPTURED_VALUE } } @@ -179,7 +179,7 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex wrapper.addConstructor { isPrimary = true - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY }.also { constructor -> val superClassConstructor = lambdaSuperClass.owner.constructors.single() val param = args?.let { constructor.addValueParameter("args", stringArrayType) } @@ -211,4 +211,4 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex } } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt index d2eb759ae2d..d6815d20c8e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MoveCompanionObjectFieldsLowering.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.replaceThisByStaticReference import org.jetbrains.kotlin.backend.jvm.propertiesPhase -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.addProperty import org.jetbrains.kotlin.ir.builders.declarations.buildField import org.jetbrains.kotlin.ir.declarations.* @@ -92,7 +92,7 @@ private class MoveOrCopyCompanionObjectFieldsLowering(val context: JvmBackendCon } private val IrProperty.hasPublicVisibility: Boolean - get() = !Visibilities.isPrivate(visibility) && visibility != Visibilities.PROTECTED + get() = !DescriptorVisibilities.isPrivate(visibility) && visibility != DescriptorVisibilities.PROTECTED private fun makeAnonymousInitializerStatic(oldInitializer: IrAnonymousInitializer, newParent: IrClass) = with(oldInitializer) { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt index 9d2a0e0cf83..94e29163406 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ObjectClassLowering.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.irExprBody @@ -69,7 +69,7 @@ private class ObjectClassLowering(val context: JvmBackendContext) : IrElementTra // Mark object instance field as deprecated if the object visibility is private or protected, // and ProperVisibilityForCompanionObjectInstanceField language feature is not enabled. if (!context.state.languageVersionSettings.supportsFeature(LanguageFeature.ProperVisibilityForCompanionObjectInstanceField) && - (irClass.visibility == Visibilities.PRIVATE || irClass.visibility == Visibilities.PROTECTED) + (irClass.visibility == DescriptorVisibilities.PRIVATE || irClass.visibility == DescriptorVisibilities.PROTECTED) ) { context.createIrBuilder(irClass.symbol).run { publicInstanceField.annotations += @@ -81,4 +81,4 @@ private class ObjectClassLowering(val context: JvmBackendContext) : IrElementTra (publicInstanceField.parent as IrDeclarationContainer).declarations.add(0, publicInstanceField) } } -} \ No newline at end of file +} diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt index 6880e68e0d3..77a6e347e7a 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.backend.jvm.lower.FunctionReferenceLowering.Companio import org.jetbrains.kotlin.backend.jvm.lower.FunctionReferenceLowering.Companion.kClassToJavaClass import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.isInlineClassFieldGetter +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames @@ -121,7 +121,7 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : Class val needsDummySignature = getter.owner.correspondingPropertySymbol?.owner?.needsAccessor(getter.owner) == false || // Internal underlying vals of inline classes have no getter method - getter.owner.isInlineClassFieldGetter && getter.owner.visibility == Visibilities.INTERNAL + getter.owner.isInlineClassFieldGetter && getter.owner.visibility == DescriptorVisibilities.INTERNAL putValueArgument( 0, @@ -199,7 +199,7 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : Class origin = JvmLoweredDeclarationOrigin.GENERATED_PROPERTY_REFERENCE isFinal = true isStatic = true - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY } var localPropertiesInClass = 0 @@ -283,7 +283,7 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : Class setSourceRange(expression) name = SpecialNames.NO_NAME_PROVIDED origin = JvmLoweredDeclarationOrigin.GENERATED_PROPERTY_REFERENCE - visibility = Visibilities.LOCAL + visibility = DescriptorVisibilities.LOCAL }.apply { parent = irClass superTypes = listOf(superClass.defaultType) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticInitializersLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticInitializersLowering.kt index 68f36c5bfc2..fbd1bd292d9 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticInitializersLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticInitializersLowering.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.declarations.IrField import org.jetbrains.kotlin.ir.expressions.IrSetField import org.jetbrains.kotlin.ir.expressions.impl.IrBlockBodyImpl import org.jetbrains.kotlin.ir.util.patchDeclarationParents -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.Name class StaticInitializersLowering(override val context: JvmBackendContext) : InitializersLoweringBase(context), ClassLoweringPass { @@ -43,7 +43,7 @@ class StaticInitializersLowering(override val context: JvmBackendContext) : Init // TODO: mark as synthesized origin = JvmLoweredDeclarationOrigin.CLASS_STATIC_INITIALIZER returnType = context.irBuiltIns.unitType - visibility = JavaVisibilities.PACKAGE_VISIBILITY + visibility = JavaDescriptorVisibilities.PACKAGE_VISIBILITY }.apply { body = IrBlockBodyImpl(irClass.startOffset, irClass.endOffset, staticInitializerStatements).patchDeclarationParents(this) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticLambdaLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticLambdaLowering.kt index c0a3366af61..ebd78d69abd 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticLambdaLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/StaticLambdaLowering.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.backend.common.lower.createIrBuilder 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.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.declarations.buildField @@ -66,7 +66,7 @@ class StaticLambdaLowering(val backendContext: JvmBackendContext) : FileLowering origin = JvmLoweredDeclarationOrigin.FIELD_FOR_STATIC_LAMBDA_INSTANCE isFinal = true isStatic = true - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC }.apply { parent = lambdaClass } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt index 916cf788025..5f962e44ef5 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.backend.jvm.ir.IrInlineReferenceLocator import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.hasMangledParameters import org.jetbrains.kotlin.codegen.syntheticAccessorToSuperSuffix import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -187,7 +187,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle override fun visitConstructor(declaration: IrConstructor): IrStatement { if (declaration.isOrShouldBeHidden) { pendingAccessorsToAdd.add(handleHiddenConstructor(declaration)) - declaration.visibility = Visibilities.PRIVATE + declaration.visibility = DescriptorVisibilities.PRIVATE } return super.visitConstructor(declaration) @@ -212,7 +212,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle private val IrConstructor.isOrShouldBeHidden: Boolean get() = this in context.hiddenConstructors || ( - !Visibilities.isPrivate(visibility) && !constructedClass.isInline && hasMangledParameters && + !DescriptorVisibilities.isPrivate(visibility) && !constructedClass.isInline && hasMangledParameters && origin != IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER && origin != JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR && origin != JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR_FOR_HIDDEN_CONSTRUCTOR) @@ -240,7 +240,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle // In case of Java `protected static`, access could be done from a public inline function in the same package, // or a subclass of the Java class. Both cases require an accessor, which we cannot add to the Java class. private fun IrDeclarationWithVisibility.accessorParent(parent: IrDeclarationParent = this.parent) = - if (visibility == JavaVisibilities.PROTECTED_STATIC_VISIBILITY) { + if (visibility == JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY) { val classes = allScopes.map { it.irElement }.filterIsInstance() val companions = classes.mapNotNull { it.companionObject() }.filterIsInstance() val objectsInScope = @@ -258,7 +258,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle return factory.buildConstructor { origin = originForConstructorAccessor name = source.name - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC }.also { accessor -> accessor.parent = source.parent @@ -294,7 +294,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle return factory.buildFun { origin = JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR name = source.accessorName(expression.superQualifierSymbol) - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC modality = if (parent is IrClass && parent.isJvmInterface) Modality.OPEN else Modality.FINAL isSuspend = source.isSuspend // synthetic accessors of suspend functions are handled in codegen }.also { accessor -> @@ -326,7 +326,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle context.irFactory.buildFun { origin = JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR name = fieldSymbol.owner.accessorNameForGetter() - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC modality = Modality.FINAL returnType = fieldSymbol.owner.type }.also { accessor -> @@ -362,7 +362,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle context.irFactory.buildFun { origin = JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR name = fieldSymbol.owner.accessorNameForSetter() - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC modality = Modality.FINAL returnType = context.irBuiltIns.unitType }.also { accessor -> @@ -520,7 +520,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle // The only function accessors placed on interfaces are for private functions and JvmDefault implementations. // The two cannot clash. - parentAsClass.isJvmInterface -> if (!Visibilities.isPrivate(visibility)) "\$jd" else "" + parentAsClass.isJvmInterface -> if (!DescriptorVisibilities.isPrivate(visibility)) "\$jd" else "" // Accessor for _s_uper-qualified call superQualifier != null -> "\$s" + superQualifier.owner.syntheticAccessorToSuperSuffix() @@ -555,13 +555,13 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle return "p" + if (isStatic) "\$s" + parentAsClass.syntheticAccessorToSuperSuffix() else "" } - private val Visibility.isPrivate - get() = Visibilities.isPrivate(this) + private val DescriptorVisibility.isPrivate + get() = DescriptorVisibilities.isPrivate(this) - private val Visibility.isProtected - get() = this == Visibilities.PROTECTED || - this == JavaVisibilities.PROTECTED_AND_PACKAGE || - this == JavaVisibilities.PROTECTED_STATIC_VISIBILITY + private val DescriptorVisibility.isProtected + get() = this == DescriptorVisibilities.PROTECTED || + this == JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE || + this == JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY private fun IrSymbol.isAccessible(withSuper: Boolean, thisObjReference: IrClassSymbol?): Boolean { /// We assume that IR code that reaches us has been checked for correctness at the frontend. diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt index 0c1f34e5b3c..2651c849424 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ToArrayLowering.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.codegen.isJvmInterface import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.addDispatchReceiver import org.jetbrains.kotlin.ir.builders.declarations.addFunction import org.jetbrains.kotlin.ir.builders.declarations.addTypeParameter @@ -101,7 +101,7 @@ private class ToArrayLowering(private val context: JvmBackendContext) : ClassLow // This is an explicit override of a method defined in `kotlin.collections.AbstractCollection` // or `java.util.Collection`. From here on, the frontend will check the existence of implementations; // we just need to match visibility in the former case to the latter. - existing.visibility = Visibilities.PUBLIC + existing.visibility = DescriptorVisibilities.PUBLIC return } if (indirectSubclass) { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt index a3b14201455..5c65f1859f8 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.isStaticInlineClassReplacement import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi.mangledNameFor import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter import org.jetbrains.kotlin.ir.builders.declarations.buildFun import org.jetbrains.kotlin.ir.builders.declarations.buildProperty @@ -44,7 +44,7 @@ class MemoizedInlineClassReplacements(private val mangleReturnTypes: Boolean, pr when { // Don't mangle anonymous or synthetic functions it.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA || - (it.origin == IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR && it.visibility == Visibilities.LOCAL) || + (it.origin == IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR && it.visibility == DescriptorVisibilities.LOCAL) || it.isStaticInlineClassReplacement || it.origin.isSynthetic -> null diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt index 26dea06a614..adb5dbf50c9 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/codegen/ModuleTransformer.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.backend.wasm.WasmCompilerResult import org.jetbrains.kotlin.backend.wasm.ast.WasmExport import org.jetbrains.kotlin.backend.wasm.ast.WasmModule import org.jetbrains.kotlin.backend.wasm.ast.wasmModuleToWat -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.jsAssignment import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName import org.jetbrains.kotlin.ir.declarations.* @@ -58,7 +58,7 @@ class IrModuleToWasm(private val backendContext: WasmBackendContext) { if (declaration !is IrDeclarationWithVisibility || declaration !is IrDeclarationWithName || declaration !is IrSimpleFunction || - declaration.visibility != Visibilities.PUBLIC + declaration.visibility != DescriptorVisibilities.PUBLIC ) { return null } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt index 98daabc6f35..ed3ab742278 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt @@ -388,7 +388,7 @@ private fun StatementGenerator.createFunctionForSuspendConversion( IrDeclarationOrigin.ADAPTER_FOR_SUSPEND_CONVERSION, irAdapterSymbol, Name.identifier(scope.inventNameForTemporary("suspendConversion")), - Visibilities.LOCAL, Modality.FINAL, + DescriptorVisibilities.LOCAL, Modality.FINAL, irSuspendFunReturnType, isInline = false, isExternal = false, isTailrec = false, isSuspend = true, diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt index d532b839029..d3d175e2696 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt @@ -79,7 +79,7 @@ class ClassGenerator( } } - fun generateClass(ktClassOrObject: KtPureClassOrObject, visibility_: Visibility? = null): IrClass { + fun generateClass(ktClassOrObject: KtPureClassOrObject, visibility_: DescriptorVisibility? = null): IrClass { val classDescriptor = ktClassOrObject.findClassDescriptor(this.context.bindingContext) val startOffset = ktClassOrObject.getStartOffsetOfClassDeclarationOrNull() ?: ktClassOrObject.pureStartOffset val endOffset = ktClassOrObject.pureEndOffset @@ -169,7 +169,7 @@ class ClassGenerator( getContributedDescriptors() .filterIsInstance() .filter { - Visibilities.isVisibleIgnoringReceiver(it, classDescriptor) + DescriptorVisibilities.isVisibleIgnoringReceiver(it, classDescriptor) } .sortedByRenderer() .forEach { parentStaticMember -> @@ -505,7 +505,7 @@ class ClassGenerator( } if (ktEnumEntry.hasMemberDeclarations()) { - irEnumEntry.correspondingClass = generateClass(ktEnumEntry, Visibilities.PRIVATE) + irEnumEntry.correspondingClass = generateClass(ktEnumEntry, DescriptorVisibilities.PRIVATE) } } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt index 642e1afaadf..8df459bf9a8 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt @@ -57,7 +57,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio } fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtPureElement): IrSimpleFunction? = - functionDescriptor.takeIf { it.visibility != Visibilities.INVISIBLE_FAKE } + functionDescriptor.takeIf { it.visibility != DescriptorVisibilities.INVISIBLE_FAKE } ?.let { declareSimpleFunctionInner(it, ktElement, IrDeclarationOrigin.FAKE_OVERRIDE).buildWithScope { irFunction -> generateFunctionParameterDeclarationsAndReturnType(irFunction, ktElement, null) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt index 741cb487e11..56e9c8008ff 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.psi2ir.generators import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.util.StubGeneratorExtensions import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType @@ -26,7 +26,7 @@ open class GeneratorExtensions : StubGeneratorExtensions() { companion object Instance : SamConversion() } - open fun computeFieldVisibility(descriptor: PropertyDescriptor): Visibility? = null + open fun computeFieldVisibility(descriptor: PropertyDescriptor): DescriptorVisibility? = null open fun getParentClassStaticScope(descriptor: ClassDescriptor): MemberScope? = null } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt index 2da164ce9ef..57babedd01b 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.psi2ir.generators import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin @@ -138,7 +138,7 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio } fun generateFakeOverrideProperty(propertyDescriptor: PropertyDescriptor, ktElement: KtPureElement): IrProperty? { - if (propertyDescriptor.visibility == Visibilities.INVISIBLE_FAKE) return null + if (propertyDescriptor.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return null val startOffset = ktElement.pureStartOffsetOrUndefined val endOffset = ktElement.pureEndOffsetOrUndefined @@ -170,15 +170,15 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio return variableDescriptor as? PropertyDescriptor ?: TODO("not a property: $variableDescriptor") } - private val Visibility.admitsFakeOverride: Boolean - get() = !Visibilities.isPrivate(this) && this != Visibilities.INVISIBLE_FAKE + private val DescriptorVisibility.admitsFakeOverride: Boolean + get() = !DescriptorVisibilities.isPrivate(this) && this != DescriptorVisibilities.INVISIBLE_FAKE - private val PropertyDescriptor.fieldVisibility: Visibility + private val PropertyDescriptor.fieldVisibility: DescriptorVisibility get() = declarationGenerator.context.extensions.computeFieldVisibility(this) ?: when { isLateInit -> setter?.visibility ?: visibility isConst -> visibility - else -> Visibilities.PRIVATE + else -> DescriptorVisibilities.PRIVATE } } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt index 2f5cf512f99..7009a223a62 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt @@ -335,7 +335,7 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE, irAdapterSymbol, adapteeDescriptor.name, - Visibilities.LOCAL, + DescriptorVisibilities.LOCAL, Modality.FINAL, ktExpectedReturnType.toIrType(), isInline = adapteeDescriptor.isInline, // TODO ? @@ -519,4 +519,4 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St arguments.last().type, suspendFunction ) -} \ No newline at end of file +} diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/SyntheticDeclarationsGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/SyntheticDeclarationsGenerator.kt index 873c8e954a1..d5541b847d7 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/SyntheticDeclarationsGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/SyntheticDeclarationsGenerator.kt @@ -56,7 +56,7 @@ class SyntheticDeclarationsGenerator(context: GeneratorContext) : DeclarationDes override fun visitFunctionDescriptor(descriptor: FunctionDescriptor, data: IrDeclarationContainer?) { require(data != null) - if (descriptor.visibility != Visibilities.INVISIBLE_FAKE) { + if (descriptor.visibility != DescriptorVisibilities.INVISIBLE_FAKE) { symbolTable.declareSimpleFunctionIfNotExists(descriptor) { createFunctionStub(descriptor, it).insertDeclaration(data) } @@ -140,7 +140,7 @@ class SyntheticDeclarationsGenerator(context: GeneratorContext) : DeclarationDes override fun visitPropertyDescriptor(descriptor: PropertyDescriptor, data: IrDeclarationContainer?) { require(data != null) - if (descriptor.visibility != Visibilities.INVISIBLE_FAKE) { + if (descriptor.visibility != DescriptorVisibilities.INVISIBLE_FAKE) { symbolTable.declarePropertyIfNotExists(descriptor) { createPropertyStub(descriptor, it).insertDeclaration(data).also { p -> descriptor.getter?.let { g -> p.getter = declareAccessor(g, p) } @@ -165,4 +165,4 @@ class SyntheticDeclarationsGenerator(context: GeneratorContext) : DeclarationDes override fun visitReceiverParameterDescriptor(descriptor: ReceiverParameterDescriptor, data: IrDeclarationContainer?) { error("Unreachable execution $descriptor") } -} \ No newline at end of file +} diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt index 65ed380aab0..e26a54ce096 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt @@ -25,22 +25,22 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrClassImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrClassSymbol, - override val name: Name, - override val kind: ClassKind, - override var visibility: Visibility, - override var modality: Modality, - override val isCompanion: Boolean = false, - override val isInner: Boolean = false, - override val isData: Boolean = false, - override val isExternal: Boolean = false, - override val isInline: Boolean = false, - override val isExpect: Boolean = false, - override val isFun: Boolean = false, - override val source: SourceElement = SourceElement.NO_SOURCE + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrClassSymbol, + override val name: Name, + override val kind: ClassKind, + override var visibility: DescriptorVisibility, + override var modality: Modality, + override val isCompanion: Boolean = false, + override val isInner: Boolean = false, + override val isData: Boolean = false, + override val isExternal: Boolean = false, + override val isInline: Boolean = false, + override val isExpect: Boolean = false, + override val isFun: Boolean = false, + override val source: SourceElement = SourceElement.NO_SOURCE ) : IrClass() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt index de873d3e92f..e07e50f7e24 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody @@ -29,18 +29,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource class IrConstructorImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrConstructorSymbol, - override val name: Name, - override var visibility: Visibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isPrimary: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? = null, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrConstructorSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isPrimary: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? = null, ) : IrConstructor() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt index 3648c038655..8a92370f0b1 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt @@ -30,22 +30,22 @@ object IrFactoryImpl : IrFactory { IrAnonymousInitializerImpl(startOffset, endOffset, origin, symbol, isStatic) override fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: Visibility, - modality: Modality, - isCompanion: Boolean, - isInner: Boolean, - isData: Boolean, - isExternal: Boolean, - isInline: Boolean, - isExpect: Boolean, - isFun: Boolean, - source: SourceElement, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean, + isInner: Boolean, + isData: Boolean, + isExternal: Boolean, + isInline: Boolean, + isExpect: Boolean, + isFun: Boolean, + source: SourceElement, ): IrClass = IrClassImpl( startOffset, endOffset, origin, symbol, name, kind, visibility, modality, @@ -53,18 +53,18 @@ object IrFactoryImpl : IrFactory { ) override fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: Visibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource?, ): IrConstructor = IrConstructorImpl( startOffset, endOffset, origin, symbol, name, visibility, returnType, isInline, isExternal, isPrimary, isExpect, @@ -88,37 +88,37 @@ object IrFactoryImpl : IrFactory { IrErrorDeclarationImpl(startOffset, endOffset, descriptor) override fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: Visibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField = IrFieldImpl(startOffset, endOffset, origin, symbol, name, type, visibility, isFinal, isExternal, isStatic) override fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrSimpleFunction = IrFunctionImpl( startOffset, endOffset, origin, symbol, name, visibility, modality, returnType, @@ -127,20 +127,20 @@ object IrFactoryImpl : IrFactory { ) override fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction = IrFakeOverrideFunctionImpl( startOffset, endOffset, origin, name, visibility, modality, returnType, @@ -159,21 +159,21 @@ object IrFactoryImpl : IrFactory { IrLocalDelegatedPropertyImpl(startOffset, endOffset, origin, symbol, name, type, isVar) override fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrProperty = IrPropertyImpl( startOffset, endOffset, origin, symbol, name, visibility, modality, @@ -182,18 +182,18 @@ object IrFactoryImpl : IrFactory { ) override fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty = IrFakeOverridePropertyImpl( startOffset, endOffset, origin, name, visibility, modality, @@ -201,14 +201,14 @@ object IrFactoryImpl : IrFactory { ) override fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: Visibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias = IrTypeAliasImpl(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index f5f947a2b28..9f3b6d5d21a 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -28,16 +28,16 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrFieldImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrFieldSymbol, - override val name: Name, - override val type: IrType, - override var visibility: Visibility, - override val isFinal: Boolean, - override val isExternal: Boolean, - override val isStatic: Boolean, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrFieldSymbol, + override val name: Name, + override val type: IrType, + override var visibility: DescriptorVisibility, + override val isFinal: Boolean, + override val isExternal: Boolean, + override val isStatic: Boolean, ) : IrField() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt index c991a15867d..d137ea0ffb0 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor @@ -21,20 +21,20 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource abstract class IrFunctionCommonImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: Visibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isTailrec: Boolean, - override val isSuspend: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isTailrec: Boolean, + override val isSuspend: Boolean, + override val isOperator: Boolean, + override val isInfix: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrSimpleFunction() { override val factory: IrFactory get() = IrFactoryImpl @@ -68,23 +68,23 @@ abstract class IrFunctionCommonImpl( } class IrFunctionImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: Visibility, - override val modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ) : IrFunctionCommonImpl( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, @@ -100,20 +100,20 @@ class IrFunctionImpl( } class IrFakeOverrideFunctionImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - override var visibility: Visibility, - override var modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + override var visibility: DescriptorVisibility, + override var modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ) : IrFunctionCommonImpl( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index 75a074c6937..bd9177839b8 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor @@ -28,18 +28,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource abstract class IrPropertyCommonImpl( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: Visibility, - override val isVar: Boolean, - override val isConst: Boolean, - override val isLateinit: Boolean, - override val isDelegated: Boolean, - override val isExternal: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isVar: Boolean, + override val isConst: Boolean, + override val isLateinit: Boolean, + override val isDelegated: Boolean, + override val isExternal: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrProperty() { override val factory: IrFactory get() = IrFactoryImpl @@ -59,21 +59,21 @@ abstract class IrPropertyCommonImpl( } class IrPropertyImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrPropertySymbol, - name: Name, - visibility: Visibility, - override val modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ) : IrPropertyCommonImpl( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource @@ -88,18 +88,18 @@ class IrPropertyImpl( } class IrFakeOverridePropertyImpl( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - override var modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + override var modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ) : IrPropertyCommonImpl( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource = null, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt index 4bb40cd6f32..7822175b5f7 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -15,14 +15,14 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name class IrTypeAliasImpl( - override val startOffset: Int, - override val endOffset: Int, - override val symbol: IrTypeAliasSymbol, - override val name: Name, - override var visibility: Visibility, - override val expandedType: IrType, - override val isActual: Boolean, - override var origin: IrDeclarationOrigin + override val startOffset: Int, + override val endOffset: Int, + override val symbol: IrTypeAliasSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + override val expandedType: IrType, + override val isActual: Boolean, + override var origin: IrDeclarationOrigin ) : IrTypeAlias() { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt index 5ccd9acd8bb..e2ee3e38501 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt @@ -28,22 +28,22 @@ import org.jetbrains.kotlin.name.Name import java.util.* internal class PersistentIrClass( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrClassSymbol, - override val name: Name, - override val kind: ClassKind, - visibility: Visibility, - modality: Modality, - override val isCompanion: Boolean = false, - override val isInner: Boolean = false, - override val isData: Boolean = false, - override val isExternal: Boolean = false, - override val isInline: Boolean = false, - override val isExpect: Boolean = false, - override val isFun: Boolean = false, - override val source: SourceElement = SourceElement.NO_SOURCE + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrClassSymbol, + override val name: Name, + override val kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + override val isCompanion: Boolean = false, + override val isInner: Boolean = false, + override val isData: Boolean = false, + override val isExternal: Boolean = false, + override val isInline: Boolean = false, + override val isExpect: Boolean = false, + override val isFun: Boolean = false, + override val source: SourceElement = SourceElement.NO_SOURCE ) : IrClass(), PersistentIrDeclarationBase, ClassCarrier { @@ -66,9 +66,9 @@ internal class PersistentIrClass( override val descriptor: ClassDescriptor get() = symbol.descriptor - override var visibilityField: Visibility = visibility + override var visibilityField: DescriptorVisibility = visibility - override var visibility: Visibility + override var visibility: DescriptorVisibility get() = getCarrier().visibilityField set(v) { if (visibility !== v) { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt index 82a5abb4600..7628793feb3 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier @@ -31,18 +31,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal class PersistentIrConstructor( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrConstructorSymbol, - override val name: Name, - visibility: Visibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isPrimary: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrConstructorSymbol, + override val name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isPrimary: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? ) : IrConstructor(), PersistentIrDeclarationBase, ConstructorCarrier { @@ -142,9 +142,9 @@ internal class PersistentIrConstructor( } } - override var visibilityField: Visibility = visibility + override var visibilityField: DescriptorVisibility = visibility - override var visibility: Visibility + override var visibility: DescriptorVisibility get() = getCarrier().visibilityField set(v) { if (visibility !== v) { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt index 574ee4cff37..80c7bd69705 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt @@ -30,22 +30,22 @@ object PersistentIrFactory : IrFactory { PersistentIrAnonymousInitializer(startOffset, endOffset, origin, symbol, isStatic) override fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: Visibility, - modality: Modality, - isCompanion: Boolean, - isInner: Boolean, - isData: Boolean, - isExternal: Boolean, - isInline: Boolean, - isExpect: Boolean, - isFun: Boolean, - source: SourceElement, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean, + isInner: Boolean, + isData: Boolean, + isExternal: Boolean, + isInline: Boolean, + isExpect: Boolean, + isFun: Boolean, + source: SourceElement, ): IrClass = PersistentIrClass( startOffset, endOffset, origin, symbol, name, kind, visibility, modality, @@ -53,18 +53,18 @@ object PersistentIrFactory : IrFactory { ) override fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: Visibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource?, ): IrConstructor = PersistentIrConstructor( startOffset, endOffset, origin, symbol, name, visibility, returnType, isInline, isExternal, isPrimary, isExpect, @@ -88,37 +88,37 @@ object PersistentIrFactory : IrFactory { PersistentIrErrorDeclaration(startOffset, endOffset, descriptor) override fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: Visibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField = PersistentIrField(startOffset, endOffset, origin, symbol, name, type, visibility, isFinal, isExternal, isStatic) override fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrSimpleFunction = PersistentIrFunction( startOffset, endOffset, origin, symbol, name, visibility, modality, returnType, @@ -127,20 +127,20 @@ object PersistentIrFactory : IrFactory { ) override fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction = PersistentIrFakeOverrideFunction( startOffset, endOffset, origin, name, visibility, modality, returnType, @@ -161,21 +161,21 @@ object PersistentIrFactory : IrFactory { ) override fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean, + containerSource: DeserializedContainerSource?, ): IrProperty = PersistentIrProperty( startOffset, endOffset, origin, symbol, name, visibility, modality, @@ -184,18 +184,18 @@ object PersistentIrFactory : IrFactory { ) override fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty = PersistentIrFakeOverrideProperty( startOffset, endOffset, origin, name, visibility, modality, @@ -203,14 +203,14 @@ object PersistentIrFactory : IrFactory { ) override fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: Visibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias = PersistentIrTypeAlias(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin) diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt index a8e3b9a830d..d50c3cd3f96 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier @@ -30,16 +30,16 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name internal class PersistentIrField( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrFieldSymbol, - override val name: Name, - override val type: IrType, - override var visibility: Visibility, - override val isFinal: Boolean, - override val isExternal: Boolean, - override val isStatic: Boolean + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrFieldSymbol, + override val name: Name, + override val type: IrType, + override var visibility: DescriptorVisibility, + override val isFinal: Boolean, + override val isExternal: Boolean, + override val isStatic: Boolean ) : IrField(), PersistentIrDeclarationBase, FieldCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt index 9061ec6c4b5..bc31666b91b 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier @@ -23,20 +23,20 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal abstract class PersistentIrFunctionCommon( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val name: Name, - visibility: Visibility, - returnType: IrType, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isTailrec: Boolean, - override val isSuspend: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource? = null + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isTailrec: Boolean, + override val isSuspend: Boolean, + override val isOperator: Boolean, + override val isInfix: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource? = null ) : IrSimpleFunction(), PersistentIrDeclarationBase, FunctionCarrier { @@ -132,9 +132,9 @@ internal abstract class PersistentIrFunctionCommon( } } - override var visibilityField: Visibility = visibility + override var visibilityField: DescriptorVisibility = visibility - override var visibility: Visibility + override var visibility: DescriptorVisibility get() = getCarrier().visibilityField set(v) { if (visibility !== v) { @@ -175,23 +175,23 @@ internal abstract class PersistentIrFunctionCommon( } internal class PersistentIrFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: Visibility, - override val modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? ) : PersistentIrFunctionCommon( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, @@ -207,20 +207,20 @@ internal class PersistentIrFunction( } internal class PersistentIrFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - override var visibility: Visibility, - override var modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + override var visibility: DescriptorVisibility, + override var modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ) : PersistentIrFunctionCommon( startOffset, endOffset, origin, name, visibility, returnType, isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt index 51d6459296a..c773f89c090 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier @@ -30,18 +30,18 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource internal abstract class PersistentIrPropertyCommon( - override val startOffset: Int, - override val endOffset: Int, - origin: IrDeclarationOrigin, - override val name: Name, - override var visibility: Visibility, - override val isVar: Boolean, - override val isConst: Boolean, - override val isLateinit: Boolean, - override val isDelegated: Boolean, - override val isExternal: Boolean, - override val isExpect: Boolean, - override val containerSource: DeserializedContainerSource?, + override val startOffset: Int, + override val endOffset: Int, + origin: IrDeclarationOrigin, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isVar: Boolean, + override val isConst: Boolean, + override val isLateinit: Boolean, + override val isDelegated: Boolean, + override val isExternal: Boolean, + override val isExpect: Boolean, + override val containerSource: DeserializedContainerSource?, ) : IrProperty(), PersistentIrDeclarationBase, PropertyCarrier { @@ -109,21 +109,21 @@ internal abstract class PersistentIrPropertyCommon( } internal class PersistentIrProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - override val symbol: IrPropertySymbol, - name: Name, - visibility: Visibility, - override val modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource?, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + override val symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + override val modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource?, ) : PersistentIrPropertyCommon( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, containerSource, @@ -138,18 +138,18 @@ internal class PersistentIrProperty( } internal class PersistentIrFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - override var modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + override var modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ) : PersistentIrPropertyCommon( startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt index c1db7726e36..f6a126944fb 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier @@ -17,14 +17,14 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.name.Name internal class PersistentIrTypeAlias( - override val startOffset: Int, - override val endOffset: Int, - override val symbol: IrTypeAliasSymbol, - override val name: Name, - override var visibility: Visibility, - override val expandedType: IrType, - override val isActual: Boolean, - origin: IrDeclarationOrigin + override val startOffset: Int, + override val endOffset: Int, + override val symbol: IrTypeAliasSymbol, + override val name: Name, + override var visibility: DescriptorVisibility, + override val expandedType: IrType, + override val isActual: Boolean, + origin: IrDeclarationOrigin ) : IrTypeAlias(), PersistentIrDeclarationBase, TypeAliasCarrier { diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt index 322de7571fd..fcce1e00726 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent.carriers import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.types.IrType @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.ir.types.IrType internal interface ClassCarrier : DeclarationCarrier { var thisReceiverField: IrValueParameter? var metadataField: MetadataSource? - var visibilityField: Visibility + var visibilityField: DescriptorVisibility var modalityField: Modality var attributeOwnerIdField: IrAttributeContainer var typeParametersField: List @@ -38,15 +38,15 @@ internal interface ClassCarrier : DeclarationCarrier { } internal class ClassCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var thisReceiverField: IrValueParameter?, - override var metadataField: MetadataSource?, - override var visibilityField: Visibility, - override var modalityField: Modality, - override var attributeOwnerIdField: IrAttributeContainer, - override var typeParametersField: List, - override var superTypesField: List + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var thisReceiverField: IrValueParameter?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var modalityField: Modality, + override var attributeOwnerIdField: IrAttributeContainer, + override var typeParametersField: List, + override var superTypesField: List ) : ClassCarrier diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt index f07cde9df7f..2da5223aa70 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent.carriers -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -31,16 +31,16 @@ internal interface ConstructorCarrier : FunctionBaseCarrier { } internal class ConstructorCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var returnTypeFieldField: IrType, - override var dispatchReceiverParameterField: IrValueParameter?, - override var extensionReceiverParameterField: IrValueParameter?, - override var bodyField: IrBody?, - override var metadataField: MetadataSource?, - override var visibilityField: Visibility, - override var typeParametersField: List, - override var valueParametersField: List + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var returnTypeFieldField: IrType, + override var dispatchReceiverParameterField: IrValueParameter?, + override var extensionReceiverParameterField: IrValueParameter?, + override var bodyField: IrBody?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var typeParametersField: List, + override var valueParametersField: List ) : ConstructorCarrier diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionBaseCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionBaseCarrier.kt index 4bbaa1affd3..a677799a357 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionBaseCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionBaseCarrier.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent.carriers -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.IrTypeParameter import org.jetbrains.kotlin.ir.declarations.IrValueParameter import org.jetbrains.kotlin.ir.declarations.MetadataSource @@ -18,7 +18,7 @@ internal interface FunctionBaseCarrier : DeclarationCarrier { var extensionReceiverParameterField: IrValueParameter? var bodyField: IrBody? var metadataField: MetadataSource? - var visibilityField: Visibility + var visibilityField: DescriptorVisibility var typeParametersField: List var valueParametersField: List } diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt index ced59a3300c..fe70baedb10 100644 --- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt +++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.declarations.persistent.carriers -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -40,19 +40,19 @@ internal interface FunctionCarrier : FunctionBaseCarrier { } internal class FunctionCarrierImpl( - override val lastModified: Int, - override var parentField: IrDeclarationParent?, - override var originField: IrDeclarationOrigin, - override var annotationsField: List, - override var returnTypeFieldField: IrType, - override var dispatchReceiverParameterField: IrValueParameter?, - override var extensionReceiverParameterField: IrValueParameter?, - override var bodyField: IrBody?, - override var metadataField: MetadataSource?, - override var visibilityField: Visibility, - override var typeParametersField: List, - override var valueParametersField: List, - override var correspondingPropertySymbolField: IrPropertySymbol?, - override var overriddenSymbolsField: List, - override var attributeOwnerIdField: IrAttributeContainer + override val lastModified: Int, + override var parentField: IrDeclarationParent?, + override var originField: IrDeclarationOrigin, + override var annotationsField: List, + override var returnTypeFieldField: IrType, + override var dispatchReceiverParameterField: IrValueParameter?, + override var extensionReceiverParameterField: IrValueParameter?, + override var bodyField: IrBody?, + override var metadataField: MetadataSource?, + override var visibilityField: DescriptorVisibility, + override var typeParametersField: List, + override var valueParametersField: List, + override var correspondingPropertySymbolField: IrPropertySymbol?, + override var overriddenSymbolsField: List, + override var attributeOwnerIdField: IrAttributeContainer ) : FunctionCarrier diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt index 02f61e836e6..7a3950e2466 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.ir.builders.declarations -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.ir.builders.IrElementBuilder import org.jetbrains.kotlin.ir.declarations.IrDeclaration @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.name.Name abstract class IrDeclarationBuilder : IrElementBuilder() { var origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFINED - var visibility: Visibility = Visibilities.PUBLIC + var visibility: DescriptorVisibility = DescriptorVisibilities.PUBLIC lateinit var name: Name @@ -24,6 +24,6 @@ abstract class IrDeclarationBuilder : IrElementBuilder() { super.updateFrom(from) origin = from.origin - visibility = if (from is IrDeclarationWithVisibility) from.visibility else Visibilities.PUBLIC + visibility = if (from is IrDeclarationWithVisibility) from.visibility else DescriptorVisibilities.PUBLIC } } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt index 063f48db4c1..ae72784598d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.ir.declarations import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElementBase import org.jetbrains.kotlin.ir.IrStatement @@ -56,7 +56,7 @@ interface IrOverridableDeclaration : IrDeclaration { } interface IrDeclarationWithVisibility : IrDeclaration { - var visibility: Visibility + var visibility: DescriptorVisibility } interface IrDeclarationWithName : IrDeclaration { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt index 67a4dba24f7..317029295e1 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt @@ -26,37 +26,37 @@ interface IrFactory { ): IrAnonymousInitializer fun createClass( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - name: Name, - kind: ClassKind, - visibility: Visibility, - modality: Modality, - isCompanion: Boolean = false, - isInner: Boolean = false, - isData: Boolean = false, - isExternal: Boolean = false, - isInline: Boolean = false, - isExpect: Boolean = false, - isFun: Boolean = false, - source: SourceElement = SourceElement.NO_SOURCE, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + name: Name, + kind: ClassKind, + visibility: DescriptorVisibility, + modality: Modality, + isCompanion: Boolean = false, + isInner: Boolean = false, + isData: Boolean = false, + isExternal: Boolean = false, + isInline: Boolean = false, + isExpect: Boolean = false, + isFun: Boolean = false, + source: SourceElement = SourceElement.NO_SOURCE, ): IrClass fun createConstructor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrConstructorSymbol, - name: Name, - visibility: Visibility, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isPrimary: Boolean, - isExpect: Boolean, - containerSource: DeserializedContainerSource? = null + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrConstructorSymbol, + name: Name, + visibility: DescriptorVisibility, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isPrimary: Boolean, + isExpect: Boolean, + containerSource: DeserializedContainerSource? = null ): IrConstructor fun createEnumEntry( @@ -74,53 +74,53 @@ interface IrFactory { ): IrErrorDeclaration fun createField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrFieldSymbol, - name: Name, - type: IrType, - visibility: Visibility, - isFinal: Boolean, - isExternal: Boolean, - isStatic: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrFieldSymbol, + name: Name, + type: IrType, + visibility: DescriptorVisibility, + isFinal: Boolean, + isExternal: Boolean, + isStatic: Boolean, ): IrField fun createFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrSimpleFunctionSymbol, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, - isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrSimpleFunctionSymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, + isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null, ): IrSimpleFunction fun createFakeOverrideFunction( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - returnType: IrType, - isInline: Boolean, - isExternal: Boolean, - isTailrec: Boolean, - isSuspend: Boolean, - isOperator: Boolean, - isInfix: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + returnType: IrType, + isInline: Boolean, + isExternal: Boolean, + isTailrec: Boolean, + isSuspend: Boolean, + isOperator: Boolean, + isInfix: Boolean, + isExpect: Boolean, ): IrSimpleFunction fun createLocalDelegatedProperty( @@ -134,47 +134,47 @@ interface IrFactory { ): IrLocalDelegatedProperty fun createProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrPropertySymbol, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean = false, - isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, - containerSource: DeserializedContainerSource? = null + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrPropertySymbol, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean = false, + isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE, + containerSource: DeserializedContainerSource? = null ): IrProperty fun createFakeOverrideProperty( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - name: Name, - visibility: Visibility, - modality: Modality, - isVar: Boolean, - isConst: Boolean, - isLateinit: Boolean, - isDelegated: Boolean, - isExternal: Boolean, - isExpect: Boolean, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + name: Name, + visibility: DescriptorVisibility, + modality: Modality, + isVar: Boolean, + isConst: Boolean, + isLateinit: Boolean, + isDelegated: Boolean, + isExternal: Boolean, + isExpect: Boolean, ): IrProperty fun createTypeAlias( - startOffset: Int, - endOffset: Int, - symbol: IrTypeAliasSymbol, - name: Name, - visibility: Visibility, - expandedType: IrType, - isActual: Boolean, - origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + symbol: IrTypeAliasSymbol, + name: Name, + visibility: DescriptorVisibility, + expandedType: IrType, + isActual: Boolean, + origin: IrDeclarationOrigin, ): IrTypeAlias fun createTypeParameter( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt index 4bd8816c06d..35d7f4881fd 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt @@ -19,25 +19,25 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor class IrLazyClass( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrClassSymbol, - @OptIn(ObsoleteDescriptorBasedAPI::class) + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrClassSymbol, + @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: ClassDescriptor, - override val name: Name, - override val kind: ClassKind, - override var visibility: Visibility, - override var modality: Modality, - override val isCompanion: Boolean, - override val isInner: Boolean, - override val isData: Boolean, - override val isExternal: Boolean, - override val isInline: Boolean, - override val isExpect: Boolean, - override val isFun: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator + override val name: Name, + override val kind: ClassKind, + override var visibility: DescriptorVisibility, + override var modality: Modality, + override val isCompanion: Boolean, + override val isInner: Boolean, + override val isData: Boolean, + override val isExternal: Boolean, + override val isInline: Boolean, + override val isExpect: Boolean, + override val isFun: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator ) : IrClass(), IrLazyDeclarationBase { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt index 154c37d53e3..c88bbd31576 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.lazy import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody @@ -22,19 +22,19 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @OptIn(ObsoleteDescriptorBasedAPI::class) class IrLazyConstructor( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrConstructorSymbol, - override val descriptor: ClassConstructorDescriptor, - override val name: Name, - override var visibility: Visibility, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isPrimary: Boolean, - override val isExpect: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrConstructorSymbol, + override val descriptor: ClassConstructorDescriptor, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isPrimary: Boolean, + override val isExpect: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator, ) : IrConstructor(), IrLazyFunctionBase { override var parent: IrDeclarationParent by createLazyParent() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt index 0c02ac7e963..8fec4b2a37a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyDeclarationBase.kt @@ -41,7 +41,7 @@ interface IrLazyDeclarationBase : IrDeclaration { fun generateChildStubs(descriptors: Collection, declarations: MutableList) { descriptors.mapNotNullTo(declarations) { descriptor -> - if (descriptor is DeclarationDescriptorWithVisibility && Visibilities.isPrivate(descriptor.visibility)) null + if (descriptor is DeclarationDescriptorWithVisibility && DescriptorVisibilities.isPrivate(descriptor.visibility)) null else stubGenerator.generateMemberStub(descriptor) } } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt index 081b1124f37..73652654171 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.lazy import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin @@ -23,19 +23,19 @@ import org.jetbrains.kotlin.ir.util.TypeTranslator import org.jetbrains.kotlin.name.Name class IrLazyField( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrFieldSymbol, - @OptIn(ObsoleteDescriptorBasedAPI::class) + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrFieldSymbol, + @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: PropertyDescriptor, - override val name: Name, - override var visibility: Visibility, - override val isFinal: Boolean, - override val isExternal: Boolean, - override val isStatic: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isFinal: Boolean, + override val isExternal: Boolean, + override val isStatic: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator, ) : IrField(), IrLazyDeclarationBase { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt index 0af361fa74a..1f40cb9756e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.declarations.lazy import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBody @@ -25,24 +25,24 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @OptIn(ObsoleteDescriptorBasedAPI::class) class IrLazyFunction( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrSimpleFunctionSymbol, - override val descriptor: FunctionDescriptor, - override val name: Name, - override var visibility: Visibility, - override val modality: Modality, - override val isInline: Boolean, - override val isExternal: Boolean, - override val isTailrec: Boolean, - override val isSuspend: Boolean, - override val isExpect: Boolean, - override val isFakeOverride: Boolean, - override val isOperator: Boolean, - override val isInfix: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator, + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrSimpleFunctionSymbol, + override val descriptor: FunctionDescriptor, + override val name: Name, + override var visibility: DescriptorVisibility, + override val modality: Modality, + override val isInline: Boolean, + override val isExternal: Boolean, + override val isTailrec: Boolean, + override val isSuspend: Boolean, + override val isExpect: Boolean, + override val isFakeOverride: Boolean, + override val isOperator: Boolean, + override val isInfix: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator, ) : IrSimpleFunction(), IrLazyFunctionBase { override var parent: IrDeclarationParent by createLazyParent() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt index c7b4edd9390..fb22265d1d5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.declarations.lazy import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -21,25 +21,25 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor class IrLazyProperty( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrPropertySymbol, - @OptIn(ObsoleteDescriptorBasedAPI::class) + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrPropertySymbol, + @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: PropertyDescriptor, - override val name: Name, - override var visibility: Visibility, - override val modality: Modality, - override val isVar: Boolean, - override val isConst: Boolean, - override val isLateinit: Boolean, - override val isDelegated: Boolean, - override val isExternal: Boolean, - override val isExpect: Boolean, - override val isFakeOverride: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator, - bindingContext: BindingContext? = null + override val name: Name, + override var visibility: DescriptorVisibility, + override val modality: Modality, + override val isVar: Boolean, + override val isConst: Boolean, + override val isLateinit: Boolean, + override val isDelegated: Boolean, + override val isExternal: Boolean, + override val isExpect: Boolean, + override val isFakeOverride: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator, + bindingContext: BindingContext? = null ) : IrProperty(), IrLazyDeclarationBase { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt index bbc52c195b0..735577aa8b5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.declarations.lazy import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall @@ -17,17 +17,17 @@ import org.jetbrains.kotlin.ir.util.TypeTranslator import org.jetbrains.kotlin.name.Name class IrLazyTypeAlias( - override val startOffset: Int, - override val endOffset: Int, - override var origin: IrDeclarationOrigin, - override val symbol: IrTypeAliasSymbol, - @OptIn(ObsoleteDescriptorBasedAPI::class) + override val startOffset: Int, + override val endOffset: Int, + override var origin: IrDeclarationOrigin, + override val symbol: IrTypeAliasSymbol, + @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: TypeAliasDescriptor, - override val name: Name, - override var visibility: Visibility, - override val isActual: Boolean, - override val stubGenerator: DeclarationStubGenerator, - override val typeTranslator: TypeTranslator, + override val name: Name, + override var visibility: DescriptorVisibility, + override val isActual: Boolean, + override val stubGenerator: DeclarationStubGenerator, + override val typeTranslator: TypeTranslator, ) : IrTypeAlias(), IrLazyDeclarationBase { init { symbol.bind(this) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt index 6d1b22f3de7..5b84d58749d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt @@ -151,7 +151,7 @@ abstract class IrBasedCallableDescriptor(owner: T) : Callable override fun hasSynthesizedParameterNames() = false - override fun getVisibility(): Visibility { + override fun getVisibility(): DescriptorVisibility { TODO("not implemented") } @@ -414,11 +414,11 @@ open class IrBasedSimpleFunctionDescriptor(owner: IrSimpleFunction) : SimpleFunc else CallableMemberDescriptor.Kind.SYNTHESIZED override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): Nothing { TODO("not implemented") } @@ -482,11 +482,11 @@ open class IrBasedClassConstructorDescriptor(owner: IrConstructor) : ClassConstr } override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: CallableMemberDescriptor.Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: CallableMemberDescriptor.Kind, + copyOverrides: Boolean ): ClassConstructorDescriptor { throw UnsupportedOperationException() } @@ -696,7 +696,7 @@ open class IrBasedEnumEntryDescriptor(owner: IrEnumEntry) : ClassDescriptor, IrB override fun getCompanionObjectDescriptor() = null - override fun getVisibility() = Visibilities.DEFAULT_VISIBILITY + override fun getVisibility() = DescriptorVisibilities.DEFAULT_VISIBILITY override fun isCompanionObject() = false @@ -776,11 +776,11 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) : PropertyDescriptor, Ir override fun getOverriddenDescriptors(): MutableCollection = mutableListOf() override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): CallableMemberDescriptor { TODO("not implemented") } @@ -937,7 +937,7 @@ open class IrBasedTypeAliasDescriptor(owner: IrTypeAlias) : IrBasedDeclarationDe override fun getSource(): SourceElement = SourceElement.NO_SOURCE - override fun getVisibility(): Visibility = owner.visibility + override fun getVisibility(): DescriptorVisibility = owner.visibility override fun isExpect(): Boolean = false @@ -971,11 +971,11 @@ open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedD override fun getOverriddenDescriptors(): MutableCollection = mutableListOf() override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): CallableMemberDescriptor { TODO("not implemented") } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt index f41d1ec356c..998fe2ec9e4 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt @@ -68,7 +68,7 @@ class IrBuiltIns( val symbol = symbolTable.declareSimpleFunctionIfNotExists(operatorDescriptor) { val operator = irFactory.createFunction( - UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, it, Name.identifier(name), Visibilities.PUBLIC, Modality.FINAL, + UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, it, Name.identifier(name), DescriptorVisibilities.PUBLIC, Modality.FINAL, returnType, isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isOperator = false, isInfix = false, isExpect = false, isFakeOverride = false ) @@ -128,7 +128,7 @@ class IrBuiltIns( initialize( null, null, listOf(typeParameterDescriptor), listOf(valueParameterDescriptor), returnKotlinType, - Modality.FINAL, Visibilities.PUBLIC + Modality.FINAL, DescriptorVisibilities.PUBLIC ) } @@ -155,7 +155,7 @@ class IrBuiltIns( return symbolTable.declareSimpleFunctionIfNotExists(operatorDescriptor) { val operator = irFactory.createFunction( - UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, it, name, Visibilities.PUBLIC, Modality.FINAL, returnIrType, + UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, it, name, DescriptorVisibilities.PUBLIC, Modality.FINAL, returnIrType, isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isOperator = false, isInfix = false, isExpect = false, isFakeOverride = false ) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt index 8a5eca55625..012dc390376 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt @@ -42,7 +42,7 @@ abstract class IrBuiltinOperatorDescriptorBase(containingDeclaration: Declaratio throw UnsupportedOperationException() override fun getTypeParameters(): List = emptyList() - override fun getVisibility(): Visibility = Visibilities.PUBLIC + override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.PUBLIC override fun getModality(): Modality = Modality.FINAL override fun getKind(): CallableMemberDescriptor.Kind = CallableMemberDescriptor.Kind.SYNTHESIZED override fun getInitialSignatureDescriptor(): FunctionDescriptor? = null @@ -61,8 +61,8 @@ abstract class IrBuiltinOperatorDescriptorBase(containingDeclaration: Declaratio override fun hasSynthesizedParameterNames(): Boolean = false override fun copy( - newOwner: DeclarationDescriptor?, modality: Modality?, visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean + newOwner: DeclarationDescriptor?, modality: Modality?, visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, copyOverrides: Boolean ) = throw UnsupportedOperationException() @@ -119,7 +119,7 @@ class IrBuiltinValueParameterDescriptorImpl( override val varargElementType: KotlinType? get() = null override fun getCompileTimeInitializer(): ConstantValue<*>? = null override fun isVar(): Boolean = false - override fun getVisibility(): Visibility = Visibilities.LOCAL + override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.LOCAL override fun copy(newOwner: CallableDescriptor, newName: Name, newIndex: Int): ValueParameterDescriptor = throw UnsupportedOperationException() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt index 306fa5ebd21..3383fba1d1f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt @@ -54,7 +54,7 @@ abstract class IrDelegateDescriptorBase( /* original = */ null, annotations, Modality.FINAL, - Visibilities.PRIVATE, + DescriptorVisibilities.PRIVATE, /* isVar = */ false, name, CallableMemberDescriptor.Kind.SYNTHESIZED, @@ -76,7 +76,7 @@ abstract class IrDelegateDescriptorBase( override fun getCompileTimeInitializer(): ConstantValue<*>? = null - override fun getVisibility(): Visibility = Visibilities.PRIVATE + override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor { throw UnsupportedOperationException("Property delegate descriptor shouldn't be substituted: $this") @@ -134,7 +134,7 @@ class IrLocalDelegatedPropertyDelegateDescriptorImpl( override fun isVar(): Boolean = false override fun isLateInit(): Boolean = false override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor? = throw UnsupportedOperationException() - override fun getVisibility(): Visibility = Visibilities.LOCAL + override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.LOCAL override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R = visitor.visitVariableDescriptor(this, data) 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 5a4c3910cde..30b470ff085 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 @@ -303,7 +303,7 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa } irFactory.createFunction( - offset, offset, memberOrigin, it, Name.identifier("invoke"), Visibilities.PUBLIC, Modality.ABSTRACT, + offset, offset, memberOrigin, it, Name.identifier("invoke"), DescriptorVisibilities.PUBLIC, Modality.ABSTRACT, returnType, isInline = false, isExternal = false, @@ -441,7 +441,7 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa val name = functionClassName(isK, isSuspend, n) if (symbol.isBound) return symbol.owner val klass = irFactory.createClass( - offset, offset, classOrigin, symbol, Name.identifier(name), ClassKind.INTERFACE, Visibilities.PUBLIC, Modality.ABSTRACT + offset, offset, classOrigin, symbol, Name.identifier(name), ClassKind.INTERFACE, DescriptorVisibilities.PUBLIC, Modality.ABSTRACT ) val r = klass.createTypeParameters(n, descriptorFactory) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrTemporaryVariableDescriptor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrTemporaryVariableDescriptor.kt index 4a7acfc90ed..240dcbea5bf 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrTemporaryVariableDescriptor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrTemporaryVariableDescriptor.kt @@ -35,7 +35,7 @@ class IrTemporaryVariableDescriptorImpl( IrTemporaryVariableDescriptor { override fun getCompileTimeInitializer(): ConstantValue<*>? = null - override fun getVisibility(): Visibility = Visibilities.LOCAL + override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.LOCAL override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor { throw UnsupportedOperationException("Temporary variable descriptor shouldn't be substituted (so far): $this") @@ -47,4 +47,4 @@ class IrTemporaryVariableDescriptorImpl( override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R = visitor.visitVariableDescriptor(this, data) -} \ No newline at end of file +} diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt index 939db0e3936..77a9b758711 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt @@ -141,7 +141,7 @@ abstract class WrappedCallableDescriptor : CallableDescriptor override fun hasSynthesizedParameterNames() = false - override fun getVisibility(): Visibility { + override fun getVisibility(): DescriptorVisibility { TODO("not implemented") } @@ -409,11 +409,11 @@ open class WrappedSimpleFunctionDescriptor : SimpleFunctionDescriptor, WrappedCa else CallableMemberDescriptor.Kind.SYNTHESIZED override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): Nothing { TODO("not implemented") } @@ -465,11 +465,11 @@ open class WrappedClassConstructorDescriptor : ClassConstructorDescriptor, Wrapp } override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: CallableMemberDescriptor.Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: CallableMemberDescriptor.Kind, + copyOverrides: Boolean ): ClassConstructorDescriptor { throw UnsupportedOperationException() } @@ -695,7 +695,7 @@ open class WrappedEnumEntryDescriptor : ClassDescriptor, WrappedDeclarationDescr override fun getCompanionObjectDescriptor() = null - override fun getVisibility() = Visibilities.DEFAULT_VISIBILITY + override fun getVisibility() = DescriptorVisibilities.DEFAULT_VISIBILITY override fun isCompanionObject() = false @@ -774,11 +774,11 @@ open class WrappedPropertyDescriptor : PropertyDescriptor, WrappedDeclarationDes override fun getOverriddenDescriptors(): MutableCollection = mutableListOf() override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): CallableMemberDescriptor { TODO("not implemented") } @@ -926,7 +926,7 @@ open class WrappedTypeAliasDescriptor : WrappedDeclarationDescriptor = mutableListOf() override fun copy( - newOwner: DeclarationDescriptor?, - modality: Modality?, - visibility: Visibility?, - kind: CallableMemberDescriptor.Kind?, - copyOverrides: Boolean + newOwner: DeclarationDescriptor?, + modality: Modality?, + visibility: DescriptorVisibility?, + kind: CallableMemberDescriptor.Kind?, + copyOverrides: Boolean ): CallableMemberDescriptor { TODO("not implemented") } 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 380d772401a..9613938748d 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns @@ -399,11 +399,11 @@ fun extractTypeParameters(klass: IrDeclarationParent): List { is IrField -> current.parent is IrClass -> when { current.isInner -> current.parent as IrClass - current.visibility == Visibilities.LOCAL -> current.parent + current.visibility == DescriptorVisibilities.LOCAL -> current.parent else -> null } is IrConstructor -> current.parent as IrClass - is IrFunction -> if (current.visibility == Visibilities.LOCAL || current.dispatchReceiverParameter != null) { + is IrFunction -> if (current.visibility == DescriptorVisibilities.LOCAL || current.dispatchReceiverParameter != null) { current.parent } else null else -> null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt index 8b1414ba3ca..f30fe88b73d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ir.util import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.ir.* import org.jetbrains.kotlin.ir.declarations.* @@ -126,7 +126,7 @@ val IrDeclaration.isLocal: Boolean require(current is IrDeclaration) if (current is IrDeclarationWithVisibility) { - if (current.visibility == Visibilities.LOCAL) return true + if (current.visibility == DescriptorVisibilities.LOCAL) return true } if (current.isAnonymousObject) return true diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorToIrUtil.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorToIrUtil.kt index 5f8dea4ab33..bfd6370d3d6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorToIrUtil.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorToIrUtil.kt @@ -27,14 +27,14 @@ val ParameterDescriptor.isNoinline: Boolean get() = this is ValueParameterDescriptor && isNoinline fun IrFactory.createIrClassFromDescriptor( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - symbol: IrClassSymbol, - descriptor: ClassDescriptor, - name: Name = descriptor.name, - visibility: Visibility = descriptor.visibility, - modality: Modality = descriptor.modality + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + symbol: IrClassSymbol, + descriptor: ClassDescriptor, + name: Name = descriptor.name, + visibility: DescriptorVisibility = descriptor.visibility, + modality: Modality = descriptor.modality ): IrClass = createClass( startOffset, endOffset, origin, symbol, name, descriptor.kind, visibility, modality, descriptor.isCompanionObject, descriptor.isInner, descriptor.isData, descriptor.isEffectivelyExternal(), diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt index fc2f361fd58..ec11142afc3 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt @@ -577,13 +577,13 @@ class SymbolTable( @OptIn(ObsoleteDescriptorBasedAPI::class) fun declareField( - startOffset: Int, - endOffset: Int, - origin: IrDeclarationOrigin, - descriptor: PropertyDescriptor, - type: IrType, - visibility: Visibility? = null, - fieldFactory: (IrFieldSymbol) -> IrField = { + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + descriptor: PropertyDescriptor, + type: IrType, + visibility: DescriptorVisibility? = null, + fieldFactory: (IrFieldSymbol) -> IrField = { irFactory.createField( startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor), type, visibility ?: it.descriptor.visibility, !it.descriptor.isVar, it.descriptor.isEffectivelyExternal(), @@ -1114,4 +1114,4 @@ fun SymbolTable.noUnboundLeft(message: String) { "$it ${if (it.isPublicApi) it.signature.toString() else "NON-PUBLIC API $it"}" }.joinToString("\n") } -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt index b3002bc1927..3cca086b0ea 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt @@ -2,7 +2,7 @@ package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* @@ -38,7 +38,7 @@ class FakeOverrideChecker( .getDescriptorsFiltered(DescriptorKindFilter.CALLABLES) .filterIsInstance() .filter { it.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE } - .filterNot { it.visibility == Visibilities.PRIVATE || it.visibility == Visibilities.INVISIBLE_FAKE } + .filterNot { it.visibility == DescriptorVisibilities.PRIVATE || it.visibility == DescriptorVisibilities.INVISIBLE_FAKE } val descriptorSignatures = descriptorFakeOverrides .map { with(descriptorMangler) { it.signatureString }} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt index bab60067057..c159d73fad6 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.backend.common.overrides import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol @@ -193,7 +193,7 @@ class IrOverridingUtil( private fun filterVisibleFakeOverrides(toFilter: Collection): Collection { return toFilter.filter { member: IrOverridableMember -> - !Visibilities.isPrivate(member.visibility) + !DescriptorVisibilities.isPrivate(member.visibility) } } @@ -278,12 +278,12 @@ class IrOverridingUtil( return result } - private fun IrSimpleFunction.updateAccessorModalityAndVisibility(newModality: Modality, newVisibility: Visibility): IrSimpleFunction? { + private fun IrSimpleFunction.updateAccessorModalityAndVisibility(newModality: Modality, newVisibility: DescriptorVisibility): IrSimpleFunction? { require(this is IrFakeOverrideFunction) { "Unexpected fake override accessor kind: $this" } // For descriptors it gets INVISIBLE_FAKE. - if (this.visibility == Visibilities.PRIVATE) return null + if (this.visibility == DescriptorVisibilities.PRIVATE) return null this.visibility = newVisibility this.modality = newModality @@ -335,7 +335,7 @@ class IrOverridingUtil( b: IrOverridableMember ): Boolean { val result = - Visibilities.compare(a.visibility, b.visibility) + DescriptorVisibilities.compare(a.visibility, b.visibility) return result == null || result >= 0 } @@ -666,4 +666,4 @@ class IrOverridingUtil( else -> error("Unxpected declaration for value parameter check: $this") } } -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt index f5a9757687e..5177a76d24d 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.backend.common.overrides -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithVisibility import org.jetbrains.kotlin.ir.declarations.IrOverridableMember @@ -16,7 +16,7 @@ fun isVisibleForOverride( @Suppress("UNUSED_PARAMETER") overriding: IrOverridableMember, fromSuper: IrOverridableMember ): Boolean { - return !Visibilities.isPrivate((fromSuper as IrDeclarationWithVisibility).visibility) + return !DescriptorVisibilities.isPrivate((fromSuper as IrDeclarationWithVisibility).visibility) } fun findMemberWithMaxVisibility(members: Collection): IrOverridableMember { @@ -29,7 +29,7 @@ fun findMemberWithMaxVisibility(members: Collection): IrOve continue } - val result = Visibilities.compare(member.visibility, candidate.visibility) + val result = DescriptorVisibilities.compare(member.visibility, candidate.visibility) if (result != null && result < 0) { member = candidate } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/encodings/BinaryFlags.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/encodings/BinaryFlags.kt index 685afb42210..7d1497b2bfc 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/encodings/BinaryFlags.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/encodings/BinaryFlags.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.serialization.IrFlags import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.types.Variance inline class ClassFlags(val flags: Long) { val modality: Modality get() = ProtoEnumFlags.modality(IrFlags.MODALITY.get(flags.toInt())) - val visibility: Visibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) + val visibility: DescriptorVisibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) val kind: ClassKind get() = ProtoEnumFlags.classKind(IrFlags.CLASS_KIND.get(flags.toInt())) val isCompanion: Boolean get() = IrFlags.CLASS_KIND.get(flags.toInt()) == ProtoBuf.Class.Kind.COMPANION_OBJECT @@ -51,7 +51,7 @@ inline class ClassFlags(val flags: Long) { inline class FunctionFlags(val flags: Long) { val modality: Modality get() = ProtoEnumFlags.modality(IrFlags.MODALITY.get(flags.toInt())) - val visibility: Visibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) + val visibility: DescriptorVisibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) val isOperator: Boolean get() = IrFlags.IS_OPERATOR.get(flags.toInt()) val isInfix: Boolean get() = IrFlags.IS_INFIX.get(flags.toInt()) @@ -101,7 +101,7 @@ inline class FunctionFlags(val flags: Long) { inline class PropertyFlags(val flags: Long) { val modality: Modality get() = ProtoEnumFlags.modality(IrFlags.MODALITY.get(flags.toInt())) - val visibility: Visibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) + val visibility: DescriptorVisibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) val isVar: Boolean get() = IrFlags.IS_VAR.get(flags.toInt()) val isConst: Boolean get() = IrFlags.IS_CONST.get(flags.toInt()) @@ -154,7 +154,7 @@ inline class ValueParameterFlags(val flags: Long) { inline class TypeAliasFlags(val flags: Long) { - val visibility: Visibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) + val visibility: DescriptorVisibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) val isActual: Boolean get() = IrFlags.IS_ACTUAL.get(flags.toInt()) companion object { @@ -188,7 +188,7 @@ inline class TypeParameterFlags(val flags: Long) { inline class FieldFlags(val flags: Long) { - val visibility: Visibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) + val visibility: DescriptorVisibility get() = ProtoEnumFlags.visibility(IrFlags.VISIBILITY.get(flags.toInt())) val isFinal: Boolean get() = IrFlags.IS_FINAL.get(flags.toInt()) val isExternal: Boolean get() = IrFlags.IS_EXTERNAL_FIELD.get(flags.toInt()) val isStatic: Boolean get() = IrFlags.IS_STATIC.get(flags.toInt()) @@ -226,4 +226,4 @@ inline class LocalVariableFlags(val flags: Long) { fun decode(code: Long) = LocalVariableFlags(code) } -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorExportCheckerVisitor.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorExportCheckerVisitor.kt index e8a25113865..d022962f565 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorExportCheckerVisitor.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorExportCheckerVisitor.kt @@ -23,9 +23,9 @@ abstract class DescriptorExportCheckerVisitor : DeclarationDescriptorVisitor, Kot abstract override fun IrDeclaration.isPlatformSpecificExported(): Boolean - private fun IrDeclaration.isExported(annotations: List, visibility: Visibility?): Boolean { + private fun IrDeclaration.isExported(annotations: List, visibility: DescriptorVisibility?): Boolean { val speciallyExported = annotations.hasAnnotation(publishedApiAnnotation) || isPlatformSpecificExported() val selfExported = speciallyExported || visibility == null || visibility.isPubliclyVisible() @@ -35,7 +35,7 @@ abstract class IrExportCheckerVisitor : IrElementVisitor, Kot return selfExported && parent.accept(this@IrExportCheckerVisitor, null) } - private fun Visibility.isPubliclyVisible(): Boolean = isPublicAPI || this === Visibilities.INTERNAL + private fun DescriptorVisibility.isPubliclyVisible(): Boolean = isPublicAPI || this === DescriptorVisibilities.INTERNAL override fun visitElement(element: IrElement, data: Nothing?): Boolean = error("Should bot reach here ${element.render()}") diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/KotlinClassifiersCache.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/KotlinClassifiersCache.kt index a601a8fdc6c..00403e0c0fd 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/KotlinClassifiersCache.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/KotlinClassifiersCache.kt @@ -20,13 +20,13 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiField import com.intellij.psi.PsiLiteralExpression import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName import org.jetbrains.kotlin.javac.JavaClassWithClassId import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.lexer.KtTokens -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -98,15 +98,15 @@ class MockKotlinClassifier(override val classId: ClassId, override val fqName: FqName get() = classId.asSingleFqName() - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = if (classOrObject == null) { - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC } else when (classOrObject.visibilityModifierType()) { - null, KtTokens.PUBLIC_KEYWORD -> Visibilities.PUBLIC - KtTokens.PRIVATE_KEYWORD -> Visibilities.PRIVATE - KtTokens.PROTECTED_KEYWORD -> Visibilities.PROTECTED - else -> JavaVisibilities.PACKAGE_VISIBILITY + null, KtTokens.PUBLIC_KEYWORD -> DescriptorVisibilities.PUBLIC + KtTokens.PRIVATE_KEYWORD -> DescriptorVisibilities.PRIVATE + KtTokens.PROTECTED_KEYWORD -> DescriptorVisibilities.PROTECTED + else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY } override val supertypes: Collection @@ -197,4 +197,4 @@ class MockKotlinField(private val psiField: PsiField) : JavaField { private fun KtClassOrObject.computeClassId(): ClassId? = containingClassOrObject?.computeClassId()?.createNestedClassId(nameAsSafeName) ?: fqName?.let { ClassId.topLevel(it) } -private fun shouldNotBeCalled(): Nothing = throw UnsupportedOperationException("Should not be called") \ No newline at end of file +private fun shouldNotBeCalled(): Nothing = throw UnsupportedOperationException("Should not be called") diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/ResolveHelper.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/ResolveHelper.kt index c13946d37ef..605b4ab5fd4 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/ResolveHelper.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/ResolveHelper.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.javac.resolve import com.sun.source.tree.CompilationUnitTree -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.javac.JavaClassWithClassId import org.jetbrains.kotlin.javac.JavacWrapper -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -81,8 +81,8 @@ internal class ResolveHelper(private val javac: JavacWrapper, private fun JavaClass.findVisibleInnerOrNestedClass(name: Name) = findInnerClass(name)?.let { innerOrNestedClass -> when (innerOrNestedClass.visibility) { - Visibilities.PRIVATE -> null - JavaVisibilities.PACKAGE_VISIBILITY -> { + DescriptorVisibilities.PRIVATE -> null + JavaDescriptorVisibilities.PACKAGE_VISIBILITY -> { val classId = (innerOrNestedClass as? JavaClassWithClassId)?.classId if (classId?.packageFqName?.asString() == (compilationUnit.packageName?.toString() ?: "")) innerOrNestedClass else null } @@ -99,4 +99,4 @@ internal class ResolveHelper(private val javac: JavacWrapper, fun JavaClass.collectAllSupertypes(): Set = hashSetOf(this).apply { supertypes.mapNotNull { it.classifier as? JavaClass }.forEach { addAll(it.collectAllSupertypes()) } - } \ No newline at end of file + } diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/FakeSymbolBasedClass.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/FakeSymbolBasedClass.kt index 4ccafe2b63e..3a0ccd7024d 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/FakeSymbolBasedClass.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/FakeSymbolBasedClass.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.javac.wrappers.symbols import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavaClassWithClassId import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.* @@ -37,7 +37,7 @@ class FakeSymbolBasedClass( override val isFinal: Boolean get() = false - override val visibility: Visibility get() = Visibilities.PUBLIC + override val visibility: DescriptorVisibility get() = DescriptorVisibilities.PUBLIC override val typeParameters: List get() = emptyList() diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt index 2366edc88d9..467cfd591fa 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.javac.wrappers.symbols import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.CommonClassNames import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavaClassWithClassId import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.* @@ -54,7 +54,7 @@ class SymbolBasedClass( override val isFinal: Boolean get() = element.isFinal - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = element.getVisibility() override val typeParameters: List diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedMember.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedMember.kt index 9b5183b5c35..c23ba3bcdcf 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedMember.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedMember.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.javac.wrappers.symbols -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaClass @@ -36,7 +36,7 @@ abstract class SymbolBasedMember( override fun findAnnotation(fqName: FqName) = element.findAnnotation(fqName, javac) - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = element.getVisibility() override val name: Name @@ -54,4 +54,4 @@ abstract class SymbolBasedMember( override val isFinal: Boolean get() = element.isFinal -} \ No newline at end of file +} diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/utils.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/utils.kt index fc08e8f8393..b1732fb558a 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/utils.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/utils.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.javac.wrappers.symbols -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavacWrapper -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.structure.JavaValueParameter import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -36,20 +36,20 @@ internal val Element.isStatic: Boolean internal val Element.isFinal: Boolean get() = modifiers.contains(Modifier.FINAL) -internal fun Element.getVisibility(): Visibility = modifiers.getVisibility() +internal fun Element.getVisibility(): DescriptorVisibility = modifiers.getVisibility() -internal fun Set.getVisibility(): Visibility = +internal fun Set.getVisibility(): DescriptorVisibility = when { - Modifier.PUBLIC in this -> Visibilities.PUBLIC - Modifier.PRIVATE in this -> Visibilities.PRIVATE + Modifier.PUBLIC in this -> DescriptorVisibilities.PUBLIC + Modifier.PRIVATE in this -> DescriptorVisibilities.PRIVATE Modifier.PROTECTED in this -> { if (Modifier.STATIC in this) { - JavaVisibilities.PROTECTED_STATIC_VISIBILITY + JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY } else { - JavaVisibilities.PROTECTED_AND_PACKAGE + JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE } } - else -> JavaVisibilities.PACKAGE_VISIBILITY + else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY } @@ -83,4 +83,4 @@ internal fun AnnotatedConstruct.findAnnotation( javac: JavacWrapper ) = annotationMirrors.find { (it.annotationType.asElement() as TypeElement).qualifiedName.toString() == fqName.asString() -}?.let { SymbolBasedAnnotation(it, javac) } \ No newline at end of file +}?.let { SymbolBasedAnnotation(it, javac) } diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt index 2bc69c8bf27..9f69ce9a059 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt @@ -23,8 +23,8 @@ import com.sun.source.tree.Tree import com.sun.tools.javac.code.Flags import com.sun.tools.javac.tree.JCTree import com.sun.tools.javac.tree.TreeInfo -import org.jetbrains.kotlin.descriptors.Visibilities.PUBLIC -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavaClassWithClassId import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.* @@ -62,7 +62,7 @@ class TreeBasedClass( override val isFinal: Boolean get() = isEnum || tree.modifiers.isFinal - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = if (outerClass?.isInterface == true) PUBLIC else tree.modifiers.visibility override val typeParameters: List diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedConstructor.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedConstructor.kt index 92ea8cfa323..858c1398a42 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedConstructor.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedConstructor.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.javac.wrappers.trees import com.sun.source.tree.CompilationUnitTree import com.sun.tools.javac.tree.JCTree -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaConstructor @@ -45,7 +45,7 @@ class TreeBasedConstructor( override val isFinal: Boolean get() = true - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = tree.modifiers.visibility override val typeParameters: List @@ -54,4 +54,4 @@ class TreeBasedConstructor( override val valueParameters: List get() = tree.parameters.map { TreeBasedValueParameter(it, compilationUnit, javac, this) } -} \ No newline at end of file +} diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedField.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedField.kt index 6dd7b7e123c..0e8437ba78a 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedField.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedField.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.javac.wrappers.trees import com.sun.source.tree.CompilationUnitTree import com.sun.tools.javac.code.Flags import com.sun.tools.javac.tree.JCTree -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.javac.resolve.ConstantEvaluator import org.jetbrains.kotlin.load.java.structure.JavaClass @@ -47,8 +47,8 @@ class TreeBasedField( override val isFinal: Boolean get() = containingClass.isInterface || tree.modifiers.isFinal - override val visibility: Visibility - get() = if (containingClass.isInterface) Visibilities.PUBLIC else tree.modifiers.visibility + override val visibility: DescriptorVisibility + get() = if (containingClass.isInterface) DescriptorVisibilities.PUBLIC else tree.modifiers.visibility override val isEnumEntry: Boolean get() = tree.modifiers.flags and Flags.ENUM.toLong() != 0L @@ -71,4 +71,4 @@ class TreeBasedField( type.classifierQualifiedName == "java.lang.String")) } ?: false -} \ No newline at end of file +} diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedMethod.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedMethod.kt index 152a40cc4e2..6ed70096c54 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedMethod.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedMethod.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.javac.wrappers.trees import com.sun.source.tree.CompilationUnitTree import com.sun.tools.javac.tree.JCTree -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.Name @@ -43,8 +43,8 @@ class TreeBasedMethod( override val isFinal: Boolean get() = tree.modifiers.isFinal - override val visibility: Visibility - get() = if (containingClass.isInterface) Visibilities.PUBLIC else tree.modifiers.visibility + override val visibility: DescriptorVisibility + get() = if (containingClass.isInterface) DescriptorVisibilities.PUBLIC else tree.modifiers.visibility override val typeParameters: List get() = tree.typeParameters.map { TreeBasedTypeParameter(it, compilationUnit, javac, this) } diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/utils.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/utils.kt index be8a5774de1..848033e28fe 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/utils.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/utils.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.javac.wrappers.trees import com.sun.tools.javac.tree.JCTree -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.javac.wrappers.symbols.SymbolBasedArrayAnnotationArgument import org.jetbrains.kotlin.javac.wrappers.symbols.SymbolBasedReferenceAnnotationArgument import org.jetbrains.kotlin.javac.wrappers.symbols.getVisibility @@ -39,7 +39,7 @@ internal val JCTree.JCModifiers.isStatic: Boolean internal val JCTree.JCModifiers.hasDefaultModifier: Boolean get() = Modifier.DEFAULT in getFlags() -internal val JCTree.JCModifiers.visibility: Visibility +internal val JCTree.JCModifiers.visibility: DescriptorVisibility get() = getFlags().getVisibility() internal fun JCTree.annotations(): Collection = when (this) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt index 8b597c99ac1..3228d0993a1 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt @@ -285,9 +285,9 @@ internal class UltraLightMembersCreator( if (outerDeclaration.hasModifier(OVERRIDE_KEYWORD)) { when ((outerDeclaration.resolve() as? CallableDescriptor)?.visibility) { - Visibilities.PUBLIC -> return name == PsiModifier.PUBLIC - Visibilities.PRIVATE -> return name == PsiModifier.PRIVATE - Visibilities.PROTECTED -> return name == PsiModifier.PROTECTED + DescriptorVisibilities.PUBLIC -> return name == PsiModifier.PUBLIC + DescriptorVisibilities.PRIVATE -> return name == PsiModifier.PRIVATE + DescriptorVisibilities.PROTECTED -> return name == PsiModifier.PROTECTED } } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt index e5f4e4b0852..8976aa93173 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt @@ -12,8 +12,8 @@ import com.intellij.psi.* import com.intellij.psi.stubs.StubElement import com.intellij.psi.tree.TokenSet import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.lexer.KotlinLexer import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.lexer.KtTokens @@ -628,12 +628,12 @@ fun isTopLevelInFileOrScript(element: PsiElement): Boolean { } } -fun KtModifierKeywordToken.toVisibility(): Visibility { +fun KtModifierKeywordToken.toVisibility(): DescriptorVisibility { return when (this) { - KtTokens.PUBLIC_KEYWORD -> Visibilities.PUBLIC - KtTokens.PRIVATE_KEYWORD -> Visibilities.PRIVATE - KtTokens.PROTECTED_KEYWORD -> Visibilities.PROTECTED - KtTokens.INTERNAL_KEYWORD -> Visibilities.INTERNAL + KtTokens.PUBLIC_KEYWORD -> DescriptorVisibilities.PUBLIC + KtTokens.PRIVATE_KEYWORD -> DescriptorVisibilities.PRIVATE + KtTokens.PROTECTED_KEYWORD -> DescriptorVisibilities.PROTECTED + KtTokens.INTERNAL_KEYWORD -> DescriptorVisibilities.INTERNAL else -> throw IllegalArgumentException("Unknown visibility modifier:$this") } } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt index 248c384649c..2cc77c6d7a0 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt @@ -153,7 +153,7 @@ fun ConstraintSystemOperation.checkCallableReference( addSubtypeConstraint(toFreshSubstitutor.safeSubstitute(reflectionCandidateType), expectedType, position) } - val invisibleMember = Visibilities.findInvisibleMember( + val invisibleMember = DescriptorVisibilities.findInvisibleMember( dispatchReceiver?.asReceiverValueForVisibilityChecks, candidateDescriptor, ownerDescriptor ) @@ -495,7 +495,7 @@ class CallableReferencesCandidateFactory( is PropertyDescriptor -> { val mutable = descriptor.isVar && run { val setter = descriptor.setter - setter == null || Visibilities.isVisible( + setter == null || DescriptorVisibilities.isVisible( dispatchReceiver?.asReceiverValueForVisibilityChecks, setter, scopeTower.lexicalScope.ownerDescriptor ) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt index acc53f2b50f..8ef5ab48de5 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt @@ -37,13 +37,13 @@ internal object CheckVisibility : ResolutionPart() { val containingDescriptor = scopeTower.lexicalScope.ownerDescriptor val dispatchReceiverArgument = resolvedCall.dispatchReceiverArgument - val receiverValue = dispatchReceiverArgument?.receiver?.receiverValue ?: Visibilities.ALWAYS_SUITABLE_RECEIVER + val receiverValue = dispatchReceiverArgument?.receiver?.receiverValue ?: DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER val invisibleMember = - Visibilities.findInvisibleMember(receiverValue, resolvedCall.candidateDescriptor, containingDescriptor) ?: return + DescriptorVisibilities.findInvisibleMember(receiverValue, resolvedCall.candidateDescriptor, containingDescriptor) ?: return if (dispatchReceiverArgument is ExpressionKotlinCallArgument) { val smartCastReceiver = getReceiverValueWithSmartCast(receiverValue, dispatchReceiverArgument.receiver.stableType) - if (Visibilities.findInvisibleMember(smartCastReceiver, candidateDescriptor, containingDescriptor) == null) { + if (DescriptorVisibilities.findInvisibleMember(smartCastReceiver, candidateDescriptor, containingDescriptor) == null) { addDiagnostic( SmartCastDiagnostic( dispatchReceiverArgument, diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt index 8b2ae621ada..6474680e6ca 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt @@ -64,7 +64,7 @@ internal abstract class AbstractScopeTowerLevel( val shouldSkipVisibilityCheck = scopeTower.isNewInferenceEnabled if (!shouldSkipVisibilityCheck) { - Visibilities.findInvisibleMember( + DescriptorVisibilities.findInvisibleMember( getReceiverValueWithSmartCast(dispatchReceiver?.receiverValue, dispatchReceiverSmartCastType), descriptor, scopeTower.lexicalScope.ownerDescriptor diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt index c1f027bc7ac..494efd77463 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt @@ -455,7 +455,7 @@ object ExpectedActualResolver { a: CallableMemberDescriptor, b: CallableMemberDescriptor ): Boolean { - val compare = Visibilities.compare(a.visibility, b.visibility) + val compare = DescriptorVisibilities.compare(a.visibility, b.visibility) return if (a.isOverridable) { // For overridable declarations visibility should match precisely, see KT-19664 compare == 0 diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt index d59264c439a..79ad5f8baa3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.codegen.`when`.WhenByEnumsMapping.MAPPINGS_CLASS_NAME_POSTFIX import org.jetbrains.kotlin.codegen.binding.CodegenBinding import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension @@ -89,7 +89,7 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() { } private fun shouldFilterClass(descriptor: ClassDescriptor): Boolean { - return descriptor.visibility == Visibilities.LOCAL || descriptor is SyntheticClassDescriptorForLambda + return descriptor.visibility == DescriptorVisibilities.LOCAL || descriptor is SyntheticClassDescriptorForLambda } }) } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/CloneableClassScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/CloneableClassScope.kt index 11f8e98536d..e30680b832b 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/CloneableClassScope.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/CloneableClassScope.kt @@ -22,7 +22,7 @@ class CloneableClassScope( SimpleFunctionDescriptorImpl.create(containingClass, Annotations.EMPTY, CLONE_NAME, DECLARATION, SourceElement.NO_SOURCE).apply { initialize( null, containingClass.thisAsReceiverParameter, emptyList(), emptyList(), containingClass.builtIns.anyType, - Modality.OPEN, Visibilities.PROTECTED + Modality.OPEN, DescriptorVisibilities.PROTECTED ) } ) 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 017f83afe35..208366afdef 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 @@ -198,7 +198,7 @@ open class JvmBuiltInsSettings( cloneFromCloneable: SimpleFunctionDescriptor ): SimpleFunctionDescriptor = cloneFromCloneable.newCopyBuilder().apply { setOwner(arrayClassDescriptor) - setVisibility(Visibilities.PUBLIC) + setVisibility(DescriptorVisibilities.PUBLIC) setReturnType(arrayClassDescriptor.defaultType) setDispatchReceiverParameter(arrayClassDescriptor.thisAsReceiverParameter) }.build()!! diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaDescriptorVisibilities.java similarity index 77% rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaDescriptorVisibilities.java index 14e96e61866..9eb3575e706 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaDescriptorVisibilities.java @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; -public class JavaVisibilities { - private JavaVisibilities() { +public class JavaDescriptorVisibilities { + private JavaDescriptorVisibilities() { } @NotNull - public static final Visibility PACKAGE_VISIBILITY = new Visibility("package", false) { + public static final DescriptorVisibility PACKAGE_VISIBILITY = new DescriptorVisibility("package", false) { @Override public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { return areInSamePackage(what, from); @@ -39,9 +39,9 @@ public class JavaVisibilities { } @Override - protected Integer compareTo(@NotNull Visibility visibility) { + protected Integer compareTo(@NotNull DescriptorVisibility visibility) { if (this == visibility) return 0; - if (Visibilities.isPrivate(visibility)) return 1; + if (DescriptorVisibilities.isPrivate(visibility)) return 1; return -1; } @@ -59,8 +59,8 @@ public class JavaVisibilities { @NotNull @Override - public Visibility normalize() { - return Visibilities.PROTECTED; + public DescriptorVisibility normalize() { + return DescriptorVisibilities.PROTECTED; } @Nullable @@ -71,7 +71,7 @@ public class JavaVisibilities { }; @NotNull - public static final Visibility PROTECTED_STATIC_VISIBILITY = new Visibility("protected_static", true) { + public static final DescriptorVisibility PROTECTED_STATIC_VISIBILITY = new DescriptorVisibility("protected_static", true) { @Override public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { return isVisibleForProtectedAndPackage(receiver, what, from); @@ -96,13 +96,13 @@ public class JavaVisibilities { @NotNull @Override - public Visibility normalize() { - return Visibilities.PROTECTED; + public DescriptorVisibility normalize() { + return DescriptorVisibilities.PROTECTED; } }; @NotNull - public static final Visibility PROTECTED_AND_PACKAGE = new Visibility("protected_and_package", true) { + public static final DescriptorVisibility PROTECTED_AND_PACKAGE = new DescriptorVisibility("protected_and_package", true) { @Override public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { return isVisibleForProtectedAndPackage(receiver, what, from); @@ -114,10 +114,10 @@ public class JavaVisibilities { } @Override - protected Integer compareTo(@NotNull Visibility visibility) { + protected Integer compareTo(@NotNull DescriptorVisibility visibility) { if (this == visibility) return 0; - if (visibility == Visibilities.INTERNAL) return null; - if (Visibilities.isPrivate(visibility)) return 1; + if (visibility == DescriptorVisibilities.INTERNAL) return null; + if (DescriptorVisibilities.isPrivate(visibility)) return 1; return -1; } @@ -135,8 +135,8 @@ public class JavaVisibilities { @NotNull @Override - public Visibility normalize() { - return Visibilities.PROTECTED; + public DescriptorVisibility normalize() { + return DescriptorVisibilities.PROTECTED; } }; @@ -149,7 +149,7 @@ public class JavaVisibilities { return true; } - return Visibilities.PROTECTED.isVisible(receiver, what, from); + return DescriptorVisibilities.PROTECTED.isVisible(receiver, what, from); } private static boolean areInSamePackage(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) { diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java index 91a70f41176..9259258a755 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java @@ -91,7 +91,7 @@ public class JavaMethodDescriptor extends SimpleFunctionDescriptorImpl implement @NotNull List unsubstitutedValueParameters, @Nullable KotlinType unsubstitutedReturnType, @Nullable Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, @Nullable Map, ?> userData ) { SimpleFunctionDescriptorImpl descriptor = super.initialize( diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java index 7f4bc7e7eca..86991c1b62f 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java @@ -41,7 +41,7 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja @NotNull DeclarationDescriptor containingDeclaration, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isVar, @NotNull Name name, @NotNull SourceElement source, @@ -62,7 +62,7 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja @NotNull DeclarationDescriptor containingDeclaration, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isVar, @NotNull Name name, @NotNull SourceElement source, @@ -78,7 +78,7 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja protected PropertyDescriptorImpl createSubstitutedCopy( @NotNull DeclarationDescriptor newOwner, @NotNull Modality newModality, - @NotNull Visibility newVisibility, + @NotNull DescriptorVisibility newVisibility, @Nullable PropertyDescriptor original, @NotNull Kind kind, @NotNull Name newName, 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 ed4629af4a7..a20db936729 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 @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.FakePureImplementationsProvider -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.components.JavaResolverCache import org.jetbrains.kotlin.load.java.components.TypeUsage @@ -90,7 +90,7 @@ class LazyJavaClassDescriptor( // Kotlin considers this "private in package" just as "private" and thinks they are invisible for inheritors, // so their functions are invisible fake which is not true. override fun getVisibility() = - if (visibility == Visibilities.PRIVATE && jClass.outerClass == null) JavaVisibilities.PACKAGE_VISIBILITY else visibility + if (visibility == DescriptorVisibilities.PRIVATE && jClass.outerClass == null) JavaDescriptorVisibilities.PACKAGE_VISIBILITY else visibility override fun isInner() = isInner override fun isData() = false diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 30f49a20b30..deb8d9667db 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -637,10 +637,10 @@ class LazyJavaClassMemberScope( return constructorDescriptor } - private fun getConstructorVisibility(classDescriptor: ClassDescriptor): Visibility { + private fun getConstructorVisibility(classDescriptor: ClassDescriptor): DescriptorVisibility { val visibility = classDescriptor.visibility - if (visibility == JavaVisibilities.PROTECTED_STATIC_VISIBILITY) { - return JavaVisibilities.PROTECTED_AND_PACKAGE + if (visibility == JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY) { + return JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE } return visibility } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt index 45e221f9716..dc618a8746f 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java.structure -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -38,7 +38,7 @@ interface JavaModifierListOwner : JavaElement { val isAbstract: Boolean val isStatic: Boolean val isFinal: Boolean - val visibility: Visibility + val visibility: DescriptorVisibility } interface JavaTypeParameterListOwner : JavaElement { 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 f031e2e1d90..5bcb0f201c7 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 @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound fun shouldHideConstructorDueToInlineClassTypeValueParameters(descriptor: CallableMemberDescriptor): Boolean { val constructorDescriptor = descriptor as? ClassConstructorDescriptor ?: return false - if (Visibilities.isPrivate(constructorDescriptor.visibility)) return false + if (DescriptorVisibilities.isPrivate(constructorDescriptor.visibility)) return false if (constructorDescriptor.constructedClass.isInline) return false if (DescriptorUtils.isSealedClass(constructorDescriptor.constructedClass)) return false diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt index c54a56c74be..ba5e20f0d0c 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.descriptors.runtime.structure -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.structure.JavaModifierListOwner import java.lang.reflect.Modifier @@ -34,15 +34,15 @@ interface ReflectJavaModifierListOwner : JavaModifierListOwner { override val isFinal: Boolean get() = Modifier.isFinal(modifiers) - override val visibility: Visibility + override val visibility: DescriptorVisibility get() = modifiers.let { modifiers -> when { - Modifier.isPublic(modifiers) -> Visibilities.PUBLIC - Modifier.isPrivate(modifiers) -> Visibilities.PRIVATE + Modifier.isPublic(modifiers) -> DescriptorVisibilities.PUBLIC + Modifier.isPrivate(modifiers) -> DescriptorVisibilities.PRIVATE Modifier.isProtected(modifiers) -> - if (Modifier.isStatic(modifiers)) JavaVisibilities.PROTECTED_STATIC_VISIBILITY - else JavaVisibilities.PROTECTED_AND_PACKAGE - else -> JavaVisibilities.PACKAGE_VISIBILITY + if (Modifier.isStatic(modifiers)) JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY + else JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE + else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY } } } 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 9522afea0d6..8c1c498dbd6 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt @@ -75,7 +75,7 @@ class FunctionClassDescriptor( override fun getKind() = ClassKind.INTERFACE override fun getModality() = Modality.ABSTRACT override fun getUnsubstitutedPrimaryConstructor() = null - override fun getVisibility() = Visibilities.PUBLIC + override fun getVisibility() = DescriptorVisibilities.PUBLIC override fun isCompanionObject() = false override fun isInner() = false override fun isData() = false diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt index 5ec22fcebf1..0a018092b38 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt @@ -121,7 +121,7 @@ class FunctionInvokeDescriptor private constructor( .map { createValueParameter(result, it.index, it.value) }, typeParameters.last().defaultType, Modality.ABSTRACT, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) result.setHasSynthesizedParameterNames(true) return result diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt index f559cb8aa4d..a0c9de3ace7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME_RE import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor @@ -31,7 +31,7 @@ private val FAKE_CONTINUATION_CLASS_DESCRIPTOR_EXPERIMENTAL = CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS ).apply { modality = Modality.ABSTRACT - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC setTypeParameterDescriptors( TypeParameterDescriptorImpl.createWithDefaultBound( this, Annotations.EMPTY, false, Variance.IN_VARIANCE, Name.identifier("T"), 0, LockBasedStorageManager.NO_LOCKS @@ -47,7 +47,7 @@ private val FAKE_CONTINUATION_CLASS_DESCRIPTOR_RELEASE = CONTINUATION_INTERFACE_FQ_NAME_RELEASE.shortName(), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS ).apply { modality = Modality.ABSTRACT - visibility = Visibilities.PUBLIC + visibility = DescriptorVisibilities.PUBLIC setTypeParameterDescriptors( TypeParameterDescriptorImpl.createWithDefaultBound( this, Annotations.EMPTY, false, Variance.IN_VARIANCE, Name.identifier("T"), 0, LockBasedStorageManager.NO_LOCKS diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java index 7813b3a3f49..f1724d4e894 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java @@ -55,7 +55,7 @@ public interface CallableMemberDescriptor extends CallableDescriptor, MemberDesc Kind getKind(); @NotNull - CallableMemberDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides); + CallableMemberDescriptor copy(DeclarationDescriptor newOwner, Modality modality, DescriptorVisibility visibility, Kind kind, boolean copyOverrides); @NotNull CopyBuilder newCopyBuilder(); @@ -68,7 +68,7 @@ public interface CallableMemberDescriptor extends CallableDescriptor, MemberDesc CopyBuilder setModality(@NotNull Modality modality); @NotNull - CopyBuilder setVisibility(@NotNull Visibility visibility); + CopyBuilder setVisibility(@NotNull DescriptorVisibility visibility); @NotNull CopyBuilder setKind(@NotNull Kind kind); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassConstructorDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassConstructorDescriptor.kt index 4e1a66c89e0..7ce3505e99a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassConstructorDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassConstructorDescriptor.kt @@ -27,10 +27,10 @@ interface ClassConstructorDescriptor : ConstructorDescriptor { override fun substitute(substitutor: TypeSubstitutor): ClassConstructorDescriptor? override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: CallableMemberDescriptor.Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: CallableMemberDescriptor.Kind, + copyOverrides: Boolean ): ClassConstructorDescriptor -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java index d79874f3bf8..32a28a37868 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java @@ -62,7 +62,7 @@ public interface ClassDescriptor extends ClassifierDescriptorWithTypeParameters, @Override @NotNull - Visibility getVisibility(); + DescriptorVisibility getVisibility(); boolean isCompanionObject(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java index 074227865f4..2e858c7e70a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java @@ -60,7 +60,7 @@ public interface ConstructorDescriptor extends FunctionDescriptor { ConstructorDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java index 1e733a3d805..2242751aed6 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java @@ -20,5 +20,5 @@ import org.jetbrains.annotations.NotNull; public interface DeclarationDescriptorWithVisibility extends DeclarationDescriptor { @NotNull - Visibility getVisibility(); + DescriptorVisibility getVisibility(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibilities.java similarity index 90% rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibilities.java index 945ef2dec5e..f3f1fb30160 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibilities.java @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.utils.CollectionsKt; import java.util.*; -public class Visibilities { +public class DescriptorVisibilities { @NotNull - public static final Visibility PRIVATE = new Visibility("private", false) { + public static final DescriptorVisibility PRIVATE = new DescriptorVisibility("private", false) { @Override public boolean mustCheckInImports() { return true; @@ -102,7 +102,7 @@ public class Visibilities { * } */ @NotNull - public static final Visibility PRIVATE_TO_THIS = new Visibility("private_to_this", false) { + public static final DescriptorVisibility PRIVATE_TO_THIS = new DescriptorVisibility("private_to_this", false) { @Override public boolean isVisible(@Nullable ReceiverValue thisObject, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { if (PRIVATE.isVisible(thisObject, what, from)) { @@ -132,7 +132,7 @@ public class Visibilities { }; @NotNull - public static final Visibility PROTECTED = new Visibility("protected", true) { + public static final DescriptorVisibility PROTECTED = new DescriptorVisibility("protected", true) { @Override public boolean mustCheckInImports() { return false; @@ -198,7 +198,7 @@ public class Visibilities { }; @NotNull - public static final Visibility INTERNAL = new Visibility("internal", false) { + public static final DescriptorVisibility INTERNAL = new DescriptorVisibility("internal", false) { @Override public boolean mustCheckInImports() { return true; @@ -220,7 +220,7 @@ public class Visibilities { }; @NotNull - public static final Visibility PUBLIC = new Visibility("public", true) { + public static final DescriptorVisibility PUBLIC = new DescriptorVisibility("public", true) { @Override public boolean mustCheckInImports() { return false; @@ -233,7 +233,7 @@ public class Visibilities { }; @NotNull - public static final Visibility LOCAL = new Visibility("local", false) { + public static final DescriptorVisibility LOCAL = new DescriptorVisibility("local", false) { @Override public boolean mustCheckInImports() { return true; @@ -246,7 +246,7 @@ public class Visibilities { }; @NotNull - public static final Visibility INHERITED = new Visibility("inherited", false) { + public static final DescriptorVisibility INHERITED = new DescriptorVisibility("inherited", false) { @Override public boolean mustCheckInImports() { throw new IllegalStateException("This method shouldn't be invoked for INHERITED visibility"); @@ -260,7 +260,7 @@ public class Visibilities { /* Visibility for fake override invisible members (they are created for better error reporting) */ @NotNull - public static final Visibility INVISIBLE_FAKE = new Visibility("invisible_fake", false) { + public static final DescriptorVisibility INVISIBLE_FAKE = new DescriptorVisibility("invisible_fake", false) { @Override public boolean mustCheckInImports() { return true; @@ -281,7 +281,7 @@ public class Visibilities { // Currently used as default visibility of FunctionDescriptor // It's needed to prevent NPE when requesting non-nullable visibility of descriptor before `initialize` has been called @NotNull - public static final Visibility UNKNOWN = new Visibility("unknown", false) { + public static final DescriptorVisibility UNKNOWN = new DescriptorVisibility("unknown", false) { @Override public boolean mustCheckInImports() { throw new IllegalStateException("This method shouldn't be invoked for UNKNOWN visibility"); @@ -295,10 +295,10 @@ public class Visibilities { } }; - public static final Set INVISIBLE_FROM_OTHER_MODULES = + public static final Set INVISIBLE_FROM_OTHER_MODULES = Collections.unmodifiableSet(SetsKt.setOf(PRIVATE, PRIVATE_TO_THIS, INTERNAL, LOCAL)); - private Visibilities() { + private DescriptorVisibilities() { } public static boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { @@ -306,15 +306,15 @@ public class Visibilities { } /** - * @see Visibility.isVisible contract + * @see DescriptorVisibility.isVisible contract */ public static boolean isVisibleIgnoringReceiver(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { return findInvisibleMember(ALWAYS_SUITABLE_RECEIVER, what, from) == null; } /** - * @see Visibility.isVisible contract - * @see Visibilities.RECEIVER_DOES_NOT_EXIST + * @see DescriptorVisibility.isVisible contract + * @see DescriptorVisibilities.RECEIVER_DOES_NOT_EXIST */ public static boolean isVisibleWithAnyReceiver(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { return findInvisibleMember(IRRELEVANT_RECEIVER, what, from) == null; @@ -353,10 +353,10 @@ public class Visibilities { return null; } - private static final Map ORDERED_VISIBILITIES; + private static final Map ORDERED_VISIBILITIES; static { - Map visibilities = CollectionsKt.newHashMapWithExpectedSize(4); + Map visibilities = CollectionsKt.newHashMapWithExpectedSize(4); visibilities.put(PRIVATE_TO_THIS, 0); visibilities.put(PRIVATE, 0); visibilities.put(INTERNAL, 1); @@ -367,7 +367,7 @@ public class Visibilities { /*package*/ @Nullable - static Integer compareLocal(@NotNull Visibility first, @NotNull Visibility second) { + static Integer compareLocal(@NotNull DescriptorVisibility first, @NotNull DescriptorVisibility second) { if (first == second) return 0; Integer firstIndex = ORDERED_VISIBILITIES.get(first); Integer secondIndex = ORDERED_VISIBILITIES.get(second); @@ -378,7 +378,7 @@ public class Visibilities { } @Nullable - public static Integer compare(@NotNull Visibility first, @NotNull Visibility second) { + public static Integer compare(@NotNull DescriptorVisibility first, @NotNull DescriptorVisibility second) { Integer result = first.compareTo(second); if (result != null) { return result; @@ -390,7 +390,7 @@ public class Visibilities { return null; } - public static final Visibility DEFAULT_VISIBILITY = PUBLIC; + public static final DescriptorVisibility DEFAULT_VISIBILITY = PUBLIC; /** * This value should be used for receiverValue parameter of Visibility.isVisible @@ -462,7 +462,7 @@ public class Visibilities { } }; - public static boolean isPrivate(@NotNull Visibility visibility) { + public static boolean isPrivate(@NotNull DescriptorVisibility visibility) { return visibility == PRIVATE || visibility == PRIVATE_TO_THIS; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibility.kt similarity index 92% rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibility.kt index db1aefeef1d..9b7eed5fd5e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DescriptorVisibility.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue -abstract class Visibility protected constructor( +abstract class DescriptorVisibility protected constructor( val name: String, val isPublicAPI: Boolean ) { @@ -52,8 +52,8 @@ abstract class Visibility protected constructor( /** * @return null if the answer is unknown */ - protected open fun compareTo(visibility: Visibility): Int? { - return Visibilities.compareLocal(this, visibility) + protected open fun compareTo(visibility: DescriptorVisibility): Int? { + return DescriptorVisibilities.compareLocal(this, visibility) } // internal representation for descriptors @@ -66,7 +66,7 @@ abstract class Visibility protected constructor( final override fun toString() = internalDisplayName - open fun normalize(): Visibility = this + open fun normalize(): DescriptorVisibility = this // Should be overloaded in Java visibilities open fun customEffectiveVisibility(): EffectiveVisibility? = null diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt index b1373d2c60d..91358efa3ef 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt @@ -41,7 +41,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals override fun relation(other: EffectiveVisibility): Permissiveness = if (this == other || Local == other) Permissiveness.SAME else Permissiveness.LESS - override fun toVisibility(): Visibility = Visibilities.PRIVATE + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE } // Effectively same as Private @@ -49,14 +49,14 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals override fun relation(other: EffectiveVisibility): Permissiveness = if (this == other || Private == other) Permissiveness.SAME else Permissiveness.LESS - override fun toVisibility(): Visibility = Visibilities.LOCAL + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.LOCAL } object Public : EffectiveVisibility("public", publicApi = true) { override fun relation(other: EffectiveVisibility): Permissiveness = if (this == other) Permissiveness.SAME else Permissiveness.MORE - override fun toVisibility(): Visibility = Visibilities.PUBLIC + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PUBLIC } abstract class InternalOrPackage protected constructor(internal: Boolean) : EffectiveVisibility( @@ -78,11 +78,11 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals } object Internal : InternalOrPackage(true) { - override fun toVisibility(): Visibility = Visibilities.INTERNAL + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.INTERNAL } object PackagePrivate : InternalOrPackage(false) { - override fun toVisibility(): Visibility = Visibilities.PRIVATE + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE } class Protected( @@ -123,7 +123,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals is InternalOrPackage -> InternalProtected(containerTypeConstructor, typeContext) } - override fun toVisibility(): Visibility = Visibilities.PROTECTED + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PROTECTED } // Lower bound for all protected visibilities @@ -141,7 +141,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals is InternalOrPackage, is InternalProtected -> InternalProtectedBound } - override fun toVisibility(): Visibility = Visibilities.PROTECTED + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PROTECTED } // Lower bound for internal and protected(C) @@ -179,7 +179,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals ProtectedBound -> InternalProtectedBound } - override fun toVisibility(): Visibility = Visibilities.PRIVATE + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE } // Lower bound for internal and protected lower bound @@ -190,7 +190,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals InternalProtectedBound -> Permissiveness.SAME } - override fun toVisibility(): Visibility = Visibilities.PRIVATE + override fun toVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE } enum class Permissiveness { @@ -202,7 +202,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals abstract fun relation(other: EffectiveVisibility): Permissiveness - abstract fun toVisibility(): Visibility + abstract fun toVisibility(): DescriptorVisibility internal open fun lowerBound(other: EffectiveVisibility) = when (relation(other)) { Permissiveness.SAME, Permissiveness.LESS -> this diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibilityUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibilityUtils.kt index ffd26315ea1..2954850740b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibilityUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibilityUtils.kt @@ -9,25 +9,25 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isPublishedApi import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.checker.ClassicTypeCheckerContext -fun Visibility.effectiveVisibility( +fun DescriptorVisibility.effectiveVisibility( descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false ): EffectiveVisibility { return customEffectiveVisibility() ?: normalize().forVisibility(descriptor, checkPublishedApi) } -private fun Visibility.forVisibility(descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false): EffectiveVisibility = +private fun DescriptorVisibility.forVisibility(descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false): EffectiveVisibility = when (this) { - Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS, Visibilities.INVISIBLE_FAKE -> EffectiveVisibility.Private - Visibilities.PROTECTED -> EffectiveVisibility.Protected( + DescriptorVisibilities.PRIVATE, DescriptorVisibilities.PRIVATE_TO_THIS, DescriptorVisibilities.INVISIBLE_FAKE -> EffectiveVisibility.Private + DescriptorVisibilities.PROTECTED -> EffectiveVisibility.Protected( (descriptor.containingDeclaration as? ClassDescriptor)?.defaultType?.constructor, ClassicTypeCheckerContext(errorTypeEqualsToAnything = false) ) - Visibilities.INTERNAL -> if (!checkPublishedApi || + DescriptorVisibilities.INTERNAL -> if (!checkPublishedApi || !descriptor.isPublishedApi() ) EffectiveVisibility.Internal else EffectiveVisibility.Public - Visibilities.PUBLIC -> EffectiveVisibility.Public - Visibilities.LOCAL -> EffectiveVisibility.Local + DescriptorVisibilities.PUBLIC -> EffectiveVisibility.Public + DescriptorVisibilities.LOCAL -> EffectiveVisibility.Local // NB: visibility must be already normalized here, so e.g. no JavaVisibilities are possible at this point else -> throw AssertionError("Visibility $name is not allowed in forVisibility") } @@ -81,7 +81,7 @@ private fun Set.leastPermissive(base: EffectiveVisibilit fun KotlinType.leastPermissiveDescriptor(base: EffectiveVisibility) = dependentDescriptors().leastPermissive(base) fun DeclarationDescriptorWithVisibility.effectiveVisibility( - visibility: Visibility = this.visibility, checkPublishedApi: Boolean = false + visibility: DescriptorVisibility = this.visibility, checkPublishedApi: Boolean = false ): EffectiveVisibility = lowerBound( visibility.effectiveVisibility(this, checkPublishedApi), diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java index a81045dc454..65913e4dae0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java @@ -54,7 +54,7 @@ public interface FunctionDescriptor extends CallableMemberDescriptor { @NotNull @Override - FunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides); + FunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, DescriptorVisibility visibility, Kind kind, boolean copyOverrides); boolean isOperator(); @@ -83,7 +83,7 @@ public interface FunctionDescriptor extends CallableMemberDescriptor { @NotNull @Override - CopyBuilder setVisibility(@NotNull Visibility visibility); + CopyBuilder setVisibility(@NotNull DescriptorVisibility visibility); @NotNull @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java index 10b233bab51..b02e35d22a3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java @@ -24,7 +24,7 @@ public interface MemberDescriptor extends DeclarationDescriptorNonRoot, Declarat @Override @NotNull - Visibility getVisibility(); + DescriptorVisibility getVisibility(); boolean isExpect(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModalityUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModalityUtils.kt index 79b1106e9ed..410bef7819b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModalityUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModalityUtils.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.resolve.DescriptorUtils val CallableMemberDescriptor.isOverridable: Boolean - get() = visibility != Visibilities.PRIVATE + get() = visibility != DescriptorVisibilities.PRIVATE && modality != Modality.FINAL && (containingDeclaration as? ClassDescriptor)?.isFinalClass != true diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/NotFoundClasses.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/NotFoundClasses.kt index 39cfb494a1f..a170029b278 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/NotFoundClasses.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/NotFoundClasses.kt @@ -62,7 +62,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo override fun getKind() = ClassKind.CLASS override fun getModality() = Modality.FINAL - override fun getVisibility() = Visibilities.PUBLIC + override fun getVisibility() = DescriptorVisibilities.PUBLIC override fun getTypeConstructor() = typeConstructor override fun getDeclaredTypeParameters() = declaredTypeParameters override fun isInner() = isInner diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java index 4e5906306ac..32ec5222d04 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java @@ -39,7 +39,7 @@ public interface PropertyAccessorDescriptor extends VariableAccessorDescriptor { PropertyAccessorDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java index 586b2ff1666..520ce27d4c7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java @@ -17,9 +17,6 @@ package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.name.Name; - -import java.util.List; /** * Simple functions are the ones with 'fun' keyword and function literals @@ -27,7 +24,7 @@ import java.util.List; public interface SimpleFunctionDescriptor extends FunctionDescriptor { @NotNull @Override - SimpleFunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides); + SimpleFunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, DescriptorVisibility visibility, Kind kind, boolean copyOverrides); @NotNull @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java index c7b5097419f..ee3b247d129 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java @@ -120,8 +120,8 @@ public abstract class AbstractReceiverParameterDescriptor extends DeclarationDes @NotNull @Override - public Visibility getVisibility() { - return Visibilities.LOCAL; + public DescriptorVisibility getVisibility() { + return DescriptorVisibilities.LOCAL; } @NotNull diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt index ff9c0cde8fc..6fc90c256e7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns -import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.types.* @@ -33,7 +32,7 @@ abstract class AbstractTypeAliasDescriptor( annotations: Annotations, name: Name, sourceElement: SourceElement, - private val visibilityImpl: Visibility + private val visibilityImpl: DescriptorVisibility ) : DeclarationDescriptorNonRootImpl(containingDeclaration, annotations, name, sourceElement), TypeAliasDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassConstructorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassConstructorDescriptorImpl.java index 9a641f42b64..7529f2bcef0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassConstructorDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassConstructorDescriptorImpl.java @@ -67,7 +67,7 @@ public class ClassConstructorDescriptorImpl extends FunctionDescriptorImpl imple public ClassConstructorDescriptorImpl initialize( @NotNull List unsubstitutedValueParameters, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, @NotNull List typeParameterDescriptors ) { super.initialize( @@ -80,7 +80,7 @@ public class ClassConstructorDescriptorImpl extends FunctionDescriptorImpl imple public ClassConstructorDescriptorImpl initialize( @NotNull List unsubstitutedValueParameters, - @NotNull Visibility visibility + @NotNull DescriptorVisibility visibility ) { initialize(unsubstitutedValueParameters, visibility, getContainingDeclaration().getDeclaredTypeParameters()); return this; @@ -175,7 +175,7 @@ public class ClassConstructorDescriptorImpl extends FunctionDescriptorImpl imple public ClassConstructorDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java index e9a3ada4b1b..d0ea87359bd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.MemberScope; -import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.types.ClassTypeConstructorImpl; import org.jetbrains.kotlin.types.KotlinType; @@ -130,8 +129,8 @@ public class ClassDescriptorImpl extends ClassDescriptorBase { @NotNull @Override - public Visibility getVisibility() { - return Visibilities.PUBLIC; + public DescriptorVisibility getVisibility() { + return DescriptorVisibilities.PUBLIC; } @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index ad5f701ba28..31dc3ecbbed 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -119,8 +119,8 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { @NotNull @Override - public Visibility getVisibility() { - return Visibilities.PUBLIC; + public DescriptorVisibility getVisibility() { + return DescriptorVisibilities.PUBLIC; } @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java index 04e49a9923e..ced0a788e53 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java @@ -26,7 +26,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo private ReceiverParameterDescriptor extensionReceiverParameter; private ReceiverParameterDescriptor dispatchReceiverParameter; private Modality modality; - private Visibility visibility = Visibilities.UNKNOWN; + private DescriptorVisibility visibility = DescriptorVisibilities.UNKNOWN; private boolean isOperator = false; private boolean isInfix = false; private boolean isExternal = false; @@ -72,7 +72,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo @NotNull List unsubstitutedValueParameters, @Nullable KotlinType unsubstitutedReturnType, @Nullable Modality modality, - @NotNull Visibility visibility + @NotNull DescriptorVisibility visibility ) { this.typeParameters = CollectionsKt.toList(typeParameters); this.unsubstitutedValueParameters = CollectionsKt.toList(unsubstitutedValueParameters); @@ -101,7 +101,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo return this; } - public void setVisibility(@NotNull Visibility visibility) { + public void setVisibility(@NotNull DescriptorVisibility visibility) { this.visibility = visibility; } @@ -204,7 +204,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return visibility; } @@ -356,7 +356,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo protected @NotNull TypeSubstitution substitution; protected @NotNull DeclarationDescriptor newOwner; protected @NotNull Modality newModality; - protected @NotNull Visibility newVisibility; + protected @NotNull + DescriptorVisibility newVisibility; protected @Nullable FunctionDescriptor original = null; protected @NotNull Kind kind; protected @NotNull List newValueParameterDescriptors; @@ -380,7 +381,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo @NotNull TypeSubstitution substitution, @NotNull DeclarationDescriptor newOwner, @NotNull Modality newModality, - @NotNull Visibility newVisibility, + @NotNull DescriptorVisibility newVisibility, @NotNull Kind kind, @NotNull List newValueParameterDescriptors, @Nullable ReceiverParameterDescriptor newExtensionReceiverParameter, @@ -414,7 +415,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo @Override @NotNull - public CopyConfiguration setVisibility(@NotNull Visibility visibility) { + public CopyConfiguration setVisibility(@NotNull DescriptorVisibility visibility) { this.newVisibility = visibility; return this; } @@ -746,7 +747,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo public FunctionDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index 09b43f65548..0e1e3f556d5 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -224,7 +224,7 @@ public class LazySubstitutingClassDescriptor extends ModuleAwareClassDescriptor @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return original.getVisibility(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 831477747cd..1b525c6b471 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -22,7 +22,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase { private final boolean isInner; private Modality modality; - private Visibility visibility; + private DescriptorVisibility visibility; private TypeConstructor typeConstructor; private List typeParameters; private final Collection supertypes = new ArrayList(); @@ -74,13 +74,13 @@ public class MutableClassDescriptor extends ClassDescriptorBase { return kind; } - public void setVisibility(@NotNull Visibility visibility) { + public void setVisibility(@NotNull DescriptorVisibility visibility) { this.visibility = visibility; } @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return visibility; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java index 6ceca0e4b35..0c7888dd1e3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java @@ -35,13 +35,13 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript private final PropertyDescriptor correspondingProperty; private final boolean isInline; private final Kind kind; - private Visibility visibility; + private DescriptorVisibility visibility; @Nullable private FunctionDescriptor initialSignatureDescriptor = null; public PropertyAccessorDescriptorImpl( @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, @NotNull PropertyDescriptor correspondingProperty, @NotNull Annotations annotations, @NotNull Name name, @@ -146,11 +146,11 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return visibility; } - public void setVisibility(Visibility visibility) { + public void setVisibility(DescriptorVisibility visibility) { this.visibility = visibility; } @@ -189,7 +189,7 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript public PropertyAccessorDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java index 680ec8edd61..d97b5a938c2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java @@ -36,7 +36,7 @@ import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getB @SuppressWarnings("deprecation") public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImpl implements PropertyDescriptor { private final Modality modality; - private Visibility visibility; + private DescriptorVisibility visibility; private Collection overriddenProperties = null; private final PropertyDescriptor original; private final Kind kind; @@ -61,7 +61,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp @Nullable PropertyDescriptor original, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isVar, @NotNull Name name, @NotNull Kind kind, @@ -91,7 +91,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp @NotNull DeclarationDescriptor containingDeclaration, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isVar, @NotNull Name name, @NotNull Kind kind, @@ -145,7 +145,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp this.setterProjectedOut = setterProjectedOut; } - public void setVisibility(@NotNull Visibility visibility) { + public void setVisibility(@NotNull DescriptorVisibility visibility) { this.visibility = visibility; } @@ -186,7 +186,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp @NotNull @Override - public Visibility getVisibility() { + public DescriptorVisibility getVisibility() { return visibility; } @@ -255,7 +255,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp public class CopyConfiguration implements PropertyDescriptor.CopyBuilder { private DeclarationDescriptor owner = getContainingDeclaration(); private Modality modality = getModality(); - private Visibility visibility = getVisibility(); + private DescriptorVisibility visibility = getVisibility(); private PropertyDescriptor original = null; private boolean preserveSourceElement = false; private Kind kind = getKind(); @@ -303,7 +303,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp @NotNull @Override - public CopyConfiguration setVisibility(@NotNull Visibility visibility) { + public CopyConfiguration setVisibility(@NotNull DescriptorVisibility visibility) { this.visibility = visibility; return this; } @@ -492,9 +492,9 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp return substitutedDescriptor; } - private static Visibility normalizeVisibility(Visibility prev, Kind kind) { - if (kind == Kind.FAKE_OVERRIDE && Visibilities.isPrivate(prev.normalize())) { - return Visibilities.INVISIBLE_FAKE; + private static DescriptorVisibility normalizeVisibility(DescriptorVisibility prev, Kind kind) { + if (kind == Kind.FAKE_OVERRIDE && DescriptorVisibilities.isPrivate(prev.normalize())) { + return DescriptorVisibilities.INVISIBLE_FAKE; } return prev; } @@ -512,7 +512,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp protected PropertyDescriptorImpl createSubstitutedCopy( @NotNull DeclarationDescriptor newOwner, @NotNull Modality newModality, - @NotNull Visibility newVisibility, + @NotNull DescriptorVisibility newVisibility, @Nullable PropertyDescriptor original, @NotNull Kind kind, @NotNull Name newName, @@ -577,7 +577,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp @NotNull @Override - public PropertyDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides) { + public PropertyDescriptor copy(DeclarationDescriptor newOwner, Modality modality, DescriptorVisibility visibility, Kind kind, boolean copyOverrides) { //noinspection ConstantConditions return newCopyBuilder() .setOwner(newOwner) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java index c9da3cb08b9..0596772d900 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java @@ -37,7 +37,7 @@ public class PropertyGetterDescriptorImpl extends PropertyAccessorDescriptorImpl @NotNull PropertyDescriptor correspondingProperty, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isDefault, boolean isExternal, boolean isInline, diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java index d51c95c7414..9bdebee173c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java @@ -39,7 +39,7 @@ public class PropertySetterDescriptorImpl extends PropertyAccessorDescriptorImpl @NotNull PropertyDescriptor correspondingProperty, @NotNull Annotations annotations, @NotNull Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, boolean isDefault, boolean isExternal, boolean isInline, diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java index 00b61700331..24bb1fa080f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java @@ -59,7 +59,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme @NotNull List unsubstitutedValueParameters, @Nullable KotlinType unsubstitutedReturnType, @Nullable Modality modality, - @NotNull Visibility visibility + @NotNull DescriptorVisibility visibility ) { return initialize(extensionReceiverParameter, dispatchReceiverParameter, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility, null); @@ -73,7 +73,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme @NotNull List unsubstitutedValueParameters, @Nullable KotlinType unsubstitutedReturnType, @Nullable Modality modality, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, @Nullable Map, ?> userData ) { super.initialize(extensionReceiverParameter, dispatchReceiverParameter, typeParameters, unsubstitutedValueParameters, @@ -117,7 +117,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme public SimpleFunctionDescriptor copy( DeclarationDescriptor newOwner, Modality modality, - Visibility visibility, + DescriptorVisibility visibility, Kind kind, boolean copyOverrides ) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeAliasConstructorDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeAliasConstructorDescriptor.kt index bbc9de8ff01..e4b214f2550 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeAliasConstructorDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeAliasConstructorDescriptor.kt @@ -39,11 +39,11 @@ interface TypeAliasConstructorDescriptor : ConstructorDescriptor, DescriptorDeri val withDispatchReceiver: TypeAliasConstructorDescriptor? override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: Kind, + copyOverrides: Boolean ): TypeAliasConstructorDescriptor } @@ -128,11 +128,11 @@ class TypeAliasConstructorDescriptorImpl private constructor( } override fun copy( - newOwner: DeclarationDescriptor, - modality: Modality, - visibility: Visibility, - kind: Kind, - copyOverrides: Boolean + newOwner: DeclarationDescriptor, + modality: Modality, + visibility: DescriptorVisibility, + kind: Kind, + copyOverrides: Boolean ): TypeAliasConstructorDescriptor = newCopyBuilder() .setOwner(newOwner) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt index 05f39458aae..2c7b1d9096c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt @@ -120,7 +120,7 @@ open class ValueParameterDescriptorImpl( ) } - override fun getVisibility() = Visibilities.LOCAL + override fun getVisibility() = DescriptorVisibilities.LOCAL override fun getOverriddenDescriptors(): Collection { return containingDeclaration.overriddenDescriptors.map { diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 3286f00cd60..9c5e61f688f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -480,14 +480,14 @@ internal class DescriptorRendererImpl( } } - private fun renderVisibility(visibility: Visibility, builder: StringBuilder): Boolean { + private fun renderVisibility(visibility: DescriptorVisibility, builder: StringBuilder): Boolean { @Suppress("NAME_SHADOWING") var visibility = visibility if (DescriptorRendererModifier.VISIBILITY !in modifiers) return false if (normalizedVisibilities) { visibility = visibility.normalize() } - if (!renderDefaultVisibility && visibility == Visibilities.DEFAULT_VISIBILITY) return false + if (!renderDefaultVisibility && visibility == DescriptorVisibilities.DEFAULT_VISIBILITY) return false builder.append(renderKeyword(visibility.internalDisplayName)).append(" ") return true } @@ -506,7 +506,7 @@ internal class DescriptorRendererImpl( if (this.overriddenDescriptors.isNotEmpty()) { if (containingClassDescriptor.modality != Modality.FINAL) return Modality.OPEN } - return if (containingClassDescriptor.kind == ClassKind.INTERFACE && this.visibility != Visibilities.PRIVATE) { + return if (containingClassDescriptor.kind == ClassKind.INTERFACE && this.visibility != DescriptorVisibilities.PRIVATE) { if (this.modality == Modality.ABSTRACT) Modality.ABSTRACT else Modality.OPEN } else Modality.FINAL diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java index 56c16f15ebc..d911ccb55f8 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -78,7 +78,7 @@ public class DescriptorFactory { boolean isDefault, boolean isExternal, boolean isInline, - @NotNull Visibility visibility, + @NotNull DescriptorVisibility visibility, @NotNull SourceElement sourceElement ) { PropertySetterDescriptorImpl setterDescriptor = new PropertySetterDescriptorImpl( @@ -141,7 +141,7 @@ public class DescriptorFactory { return values.initialize(null, null, Collections.emptyList(), Collections.emptyList(), getBuiltIns(enumClass).getArrayType(Variance.INVARIANT, enumClass.getDefaultType()), - Modality.FINAL, Visibilities.PUBLIC); + Modality.FINAL, DescriptorVisibilities.PUBLIC); } @NotNull @@ -159,7 +159,7 @@ public class DescriptorFactory { ); return valueOf.initialize(null, null, Collections.emptyList(), Collections.singletonList(parameterDescriptor), enumClass.getDefaultType(), - Modality.FINAL, Visibilities.PUBLIC); + Modality.FINAL, DescriptorVisibilities.PUBLIC); } public static boolean isEnumValuesMethod(@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 c403a6dad02..b019f7d702b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -65,7 +65,7 @@ public class DescriptorUtils { public static boolean isDescriptorWithLocalVisibility(DeclarationDescriptor current) { return current instanceof DeclarationDescriptorWithVisibility && - ((DeclarationDescriptorWithVisibility) current).getVisibility() == Visibilities.LOCAL; + ((DeclarationDescriptorWithVisibility) current).getVisibility() == DescriptorVisibilities.LOCAL; } @NotNull @@ -380,16 +380,16 @@ public class DescriptorUtils { } @NotNull - public static Visibility getDefaultConstructorVisibility(@NotNull ClassDescriptor classDescriptor) { + public static DescriptorVisibility getDefaultConstructorVisibility(@NotNull ClassDescriptor classDescriptor) { ClassKind classKind = classDescriptor.getKind(); if (classKind == ClassKind.ENUM_CLASS || classKind.isSingleton() || isSealedClass(classDescriptor)) { - return Visibilities.PRIVATE; + return DescriptorVisibilities.PRIVATE; } if (isAnonymousObject(classDescriptor)) { - return Visibilities.DEFAULT_VISIBILITY; + return DescriptorVisibilities.DEFAULT_VISIBILITY; } assert classKind == ClassKind.CLASS || classKind == ClassKind.INTERFACE || classKind == ClassKind.ANNOTATION_CLASS; - return Visibilities.PUBLIC; + return DescriptorVisibilities.PUBLIC; } // TODO: should be internal diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 0fe0bd76345..4d1a7277158 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -135,7 +135,7 @@ val DeclarationDescriptorWithVisibility.isEffectivelyPrivateApi: Boolean val DeclarationDescriptor.isInsidePrivateClass: Boolean get() { val parent = containingDeclaration as? ClassDescriptor - return parent != null && Visibilities.isPrivate(parent.visibility) + return parent != null && DescriptorVisibilities.isPrivate(parent.visibility) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java index df8ba6487e9..a5413935fc4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java @@ -489,8 +489,8 @@ public class OverridingUtil { } public static boolean isVisibleForOverride(@NotNull MemberDescriptor overriding, @NotNull MemberDescriptor fromSuper) { - return !Visibilities.isPrivate(fromSuper.getVisibility()) && - Visibilities.isVisibleIgnoringReceiver(fromSuper, overriding); + return !DescriptorVisibilities.isPrivate(fromSuper.getVisibility()) && + DescriptorVisibilities.isVisibleIgnoringReceiver(fromSuper, overriding); } private Collection extractAndBindOverridesForMember( @@ -601,7 +601,7 @@ public class OverridingUtil { @NotNull DeclarationDescriptorWithVisibility a, @NotNull DeclarationDescriptorWithVisibility b ) { - Integer result = Visibilities.compare(a.getVisibility(), b.getVisibility()); + Integer result = DescriptorVisibilities.compare(a.getVisibility(), b.getVisibility()); return result == null || result >= 0; } @@ -691,7 +691,7 @@ public class OverridingUtil { Collection effectiveOverridden = allInvisible ? overridables : visibleOverridables; Modality modality = determineModalityForFakeOverride(effectiveOverridden, current); - Visibility visibility = allInvisible ? Visibilities.INVISIBLE_FAKE : Visibilities.INHERITED; + DescriptorVisibility visibility = allInvisible ? DescriptorVisibilities.INVISIBLE_FAKE : DescriptorVisibilities.INHERITED; // FIXME doesn't work as expected for flexible types: should create a refined signature. // Current algorithm produces bad results in presence of annotated Java signatures such as: @@ -788,8 +788,8 @@ public class OverridingUtil { @Override public Boolean invoke(CallableMemberDescriptor descriptor) { //nested class could capture private member, so check for private visibility added - return !Visibilities.isPrivate(descriptor.getVisibility()) && - Visibilities.isVisibleIgnoringReceiver(descriptor, current); + return !DescriptorVisibilities.isPrivate(descriptor.getVisibility()) && + DescriptorVisibilities.isVisibleIgnoringReceiver(descriptor, current); } }); } @@ -872,22 +872,22 @@ public class OverridingUtil { @Nullable Function1 cannotInferVisibility ) { for (CallableMemberDescriptor descriptor : memberDescriptor.getOverriddenDescriptors()) { - if (descriptor.getVisibility() == Visibilities.INHERITED) { + if (descriptor.getVisibility() == DescriptorVisibilities.INHERITED) { resolveUnknownVisibilityForMember(descriptor, cannotInferVisibility); } } - if (memberDescriptor.getVisibility() != Visibilities.INHERITED) { + if (memberDescriptor.getVisibility() != DescriptorVisibilities.INHERITED) { return; } - Visibility maxVisibility = computeVisibilityToInherit(memberDescriptor); - Visibility visibilityToInherit; + DescriptorVisibility maxVisibility = computeVisibilityToInherit(memberDescriptor); + DescriptorVisibility visibilityToInherit; if (maxVisibility == null) { if (cannotInferVisibility != null) { cannotInferVisibility.invoke(memberDescriptor); } - visibilityToInherit = Visibilities.PUBLIC; + visibilityToInherit = DescriptorVisibilities.PUBLIC; } else { visibilityToInherit = maxVisibility; @@ -914,9 +914,9 @@ public class OverridingUtil { } @Nullable - private static Visibility computeVisibilityToInherit(@NotNull CallableMemberDescriptor memberDescriptor) { + private static DescriptorVisibility computeVisibilityToInherit(@NotNull CallableMemberDescriptor memberDescriptor) { Collection overriddenDescriptors = memberDescriptor.getOverriddenDescriptors(); - Visibility maxVisibility = findMaxVisibility(overriddenDescriptors); + DescriptorVisibility maxVisibility = findMaxVisibility(overriddenDescriptors); if (maxVisibility == null) { return null; } @@ -933,19 +933,19 @@ public class OverridingUtil { } @Nullable - public static Visibility findMaxVisibility(@NotNull Collection descriptors) { + public static DescriptorVisibility findMaxVisibility(@NotNull Collection descriptors) { if (descriptors.isEmpty()) { - return Visibilities.DEFAULT_VISIBILITY; + return DescriptorVisibilities.DEFAULT_VISIBILITY; } - Visibility maxVisibility = null; + DescriptorVisibility maxVisibility = null; for (CallableMemberDescriptor descriptor : descriptors) { - Visibility visibility = descriptor.getVisibility(); - assert visibility != Visibilities.INHERITED : "Visibility should have been computed for " + descriptor; + DescriptorVisibility visibility = descriptor.getVisibility(); + assert visibility != DescriptorVisibilities.INHERITED : "Visibility should have been computed for " + descriptor; if (maxVisibility == null) { maxVisibility = visibility; continue; } - Integer compareResult = Visibilities.compare(visibility, maxVisibility); + Integer compareResult = DescriptorVisibilities.compare(visibility, maxVisibility); if (compareResult == null) { maxVisibility = null; } @@ -957,7 +957,7 @@ public class OverridingUtil { return null; } for (CallableMemberDescriptor descriptor : descriptors) { - Integer compareResult = Visibilities.compare(maxVisibility, descriptor.getVisibility()); + Integer compareResult = DescriptorVisibilities.compare(maxVisibility, descriptor.getVisibility()); if (compareResult == null || compareResult < 0) { return null; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.kt index cdb12513b00..4d1ce2b3bd3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities fun findMemberWithMaxVisibility(descriptors: Collection): CallableMemberDescriptor { assert(descriptors.isNotEmpty()) @@ -29,7 +29,7 @@ fun findMemberWithMaxVisibility(descriptors: CollectionemptyList(), - Visibilities.INTERNAL); + DescriptorVisibilities.INTERNAL); MemberScope memberScope = createErrorScope(getName().asString()); errorConstructor.setReturnType( new ErrorType( @@ -417,7 +417,7 @@ public class ErrorUtils { ERROR_CLASS, Annotations.Companion.getEMPTY(), Modality.OPEN, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, true, Name.special(""), CallableMemberDescriptor.Kind.DECLARATION, @@ -439,7 +439,7 @@ public class ErrorUtils { Collections.emptyList(), // TODO createErrorType(""), Modality.OPEN, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ); return function; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java index 721ee26b273..bf81400b53e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java @@ -44,7 +44,7 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI @NotNull @Override - public SimpleFunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, Visibility visibility, Kind kind, boolean copyOverrides) { + public SimpleFunctionDescriptor copy(DeclarationDescriptor newOwner, Modality modality, DescriptorVisibility visibility, Kind kind, boolean copyOverrides) { return this; } @@ -66,7 +66,7 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI @NotNull @Override - public CopyBuilder setVisibility(@NotNull Visibility visibility) { + public CopyBuilder setVisibility(@NotNull DescriptorVisibility visibility) { return this; } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index 4944febae7c..bdb5a746c01 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -172,15 +172,15 @@ class MemberDeserializer(private val c: DeserializationContext) { } private fun DeserializedSimpleFunctionDescriptor.initializeWithCoroutinesExperimentalityStatus( - extensionReceiverParameter: ReceiverParameterDescriptor?, - dispatchReceiverParameter: ReceiverParameterDescriptor?, - typeParameters: List, - unsubstitutedValueParameters: List, - unsubstitutedReturnType: KotlinType?, - modality: Modality?, - visibility: Visibility, - userDataMap: Map, *>, - isSuspend: Boolean + extensionReceiverParameter: ReceiverParameterDescriptor?, + dispatchReceiverParameter: ReceiverParameterDescriptor?, + typeParameters: List, + unsubstitutedValueParameters: List, + unsubstitutedReturnType: KotlinType?, + modality: Modality?, + visibility: DescriptorVisibility, + userDataMap: Map, *>, + isSuspend: Boolean ) { initialize( extensionReceiverParameter, diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt index df3341c2ee2..e0b1af23f24 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt @@ -53,22 +53,22 @@ object ProtoEnumFlags { } fun visibility(visibility: ProtoBuf.Visibility?) = when (visibility) { - ProtoBuf.Visibility.INTERNAL -> Visibilities.INTERNAL - ProtoBuf.Visibility.PRIVATE -> Visibilities.PRIVATE - ProtoBuf.Visibility.PRIVATE_TO_THIS -> Visibilities.PRIVATE_TO_THIS - ProtoBuf.Visibility.PROTECTED -> Visibilities.PROTECTED - ProtoBuf.Visibility.PUBLIC -> Visibilities.PUBLIC - ProtoBuf.Visibility.LOCAL -> Visibilities.LOCAL - else -> Visibilities.PRIVATE + ProtoBuf.Visibility.INTERNAL -> DescriptorVisibilities.INTERNAL + ProtoBuf.Visibility.PRIVATE -> DescriptorVisibilities.PRIVATE + ProtoBuf.Visibility.PRIVATE_TO_THIS -> DescriptorVisibilities.PRIVATE_TO_THIS + ProtoBuf.Visibility.PROTECTED -> DescriptorVisibilities.PROTECTED + ProtoBuf.Visibility.PUBLIC -> DescriptorVisibilities.PUBLIC + ProtoBuf.Visibility.LOCAL -> DescriptorVisibilities.LOCAL + else -> DescriptorVisibilities.PRIVATE } - fun visibility(visibility: Visibility): ProtoBuf.Visibility = when (visibility) { - Visibilities.INTERNAL -> ProtoBuf.Visibility.INTERNAL - Visibilities.PUBLIC -> ProtoBuf.Visibility.PUBLIC - Visibilities.PRIVATE -> ProtoBuf.Visibility.PRIVATE - Visibilities.PRIVATE_TO_THIS -> ProtoBuf.Visibility.PRIVATE_TO_THIS - Visibilities.PROTECTED -> ProtoBuf.Visibility.PROTECTED - Visibilities.LOCAL -> ProtoBuf.Visibility.LOCAL + fun visibility(visibility: DescriptorVisibility): ProtoBuf.Visibility = when (visibility) { + DescriptorVisibilities.INTERNAL -> ProtoBuf.Visibility.INTERNAL + DescriptorVisibilities.PUBLIC -> ProtoBuf.Visibility.PUBLIC + DescriptorVisibilities.PRIVATE -> ProtoBuf.Visibility.PRIVATE + DescriptorVisibilities.PRIVATE_TO_THIS -> ProtoBuf.Visibility.PRIVATE_TO_THIS + DescriptorVisibilities.PROTECTED -> ProtoBuf.Visibility.PROTECTED + DescriptorVisibilities.LOCAL -> ProtoBuf.Visibility.LOCAL else -> throw IllegalArgumentException("Unknown visibility: $visibility") } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt index 8d9996edb1d..f514c65ae9a 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.protobuf.MessageLite -import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.types.* @@ -69,15 +68,15 @@ class DeserializedSimpleFunctionDescriptor( private set fun initialize( - extensionReceiverParameter: ReceiverParameterDescriptor?, - dispatchReceiverParameter: ReceiverParameterDescriptor?, - typeParameters: List, - unsubstitutedValueParameters: List, - unsubstitutedReturnType: KotlinType?, - modality: Modality?, - visibility: Visibility, - userDataMap: Map, *>, - isExperimentalCoroutineInReleaseEnvironment: DeserializedMemberDescriptor.CoroutinesCompatibilityMode + extensionReceiverParameter: ReceiverParameterDescriptor?, + dispatchReceiverParameter: ReceiverParameterDescriptor?, + typeParameters: List, + unsubstitutedValueParameters: List, + unsubstitutedReturnType: KotlinType?, + modality: Modality?, + visibility: DescriptorVisibility, + userDataMap: Map, *>, + isExperimentalCoroutineInReleaseEnvironment: DeserializedMemberDescriptor.CoroutinesCompatibilityMode ): SimpleFunctionDescriptorImpl { return super.initialize( extensionReceiverParameter, @@ -112,24 +111,24 @@ class DeserializedSimpleFunctionDescriptor( } class DeserializedPropertyDescriptor( - containingDeclaration: DeclarationDescriptor, - original: PropertyDescriptor?, - annotations: Annotations, - modality: Modality, - visibility: Visibility, - isVar: Boolean, - name: Name, - kind: CallableMemberDescriptor.Kind, - isLateInit: Boolean, - isConst: Boolean, - isExternal: Boolean, - isDelegated: Boolean, - isExpect: Boolean, - override val proto: ProtoBuf.Property, - override val nameResolver: NameResolver, - override val typeTable: TypeTable, - override val versionRequirementTable: VersionRequirementTable, - override val containerSource: DeserializedContainerSource? + containingDeclaration: DeclarationDescriptor, + original: PropertyDescriptor?, + annotations: Annotations, + modality: Modality, + visibility: DescriptorVisibility, + isVar: Boolean, + name: Name, + kind: CallableMemberDescriptor.Kind, + isLateInit: Boolean, + isConst: Boolean, + isExternal: Boolean, + isDelegated: Boolean, + isExpect: Boolean, + override val proto: ProtoBuf.Property, + override val nameResolver: NameResolver, + override val typeTable: TypeTable, + override val versionRequirementTable: VersionRequirementTable, + override val containerSource: DeserializedContainerSource? ) : DeserializedCallableMemberDescriptor, PropertyDescriptorImpl( containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE, isLateInit, isConst, isExpect, false, isExternal, isDelegated @@ -149,13 +148,13 @@ class DeserializedPropertyDescriptor( } override fun createSubstitutedCopy( - newOwner: DeclarationDescriptor, - newModality: Modality, - newVisibility: Visibility, - original: PropertyDescriptor?, - kind: CallableMemberDescriptor.Kind, - newName: Name, - source: SourceElement + newOwner: DeclarationDescriptor, + newModality: Modality, + newVisibility: DescriptorVisibility, + original: PropertyDescriptor?, + kind: CallableMemberDescriptor.Kind, + newName: Name, + source: SourceElement ): PropertyDescriptorImpl { return DeserializedPropertyDescriptor( newOwner, original, annotations, newModality, newVisibility, isVar, newName, kind, isLateInit, isConst, isExternal, @@ -211,16 +210,16 @@ class DeserializedClassConstructorDescriptor( } class DeserializedTypeAliasDescriptor( - override val storageManager: StorageManager, - containingDeclaration: DeclarationDescriptor, - annotations: Annotations, - name: Name, - visibility: Visibility, - override val proto: ProtoBuf.TypeAlias, - override val nameResolver: NameResolver, - override val typeTable: TypeTable, - override val versionRequirementTable: VersionRequirementTable, - override val containerSource: DeserializedContainerSource? + override val storageManager: StorageManager, + containingDeclaration: DeclarationDescriptor, + annotations: Annotations, + name: Name, + visibility: DescriptorVisibility, + override val proto: ProtoBuf.TypeAlias, + override val nameResolver: NameResolver, + override val typeTable: TypeTable, + override val versionRequirementTable: VersionRequirementTable, + override val containerSource: DeserializedContainerSource? ) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, SourceElement.NO_SOURCE, visibility), DeserializedMemberDescriptor { override lateinit var constructors: Collection private set diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt index 21144cd3a7a..d83e7387884 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt @@ -56,7 +56,7 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain } return scope.getContributedDescriptors().mapNotNull { descriptor -> if (descriptor is CallableMemberDescriptor && - descriptor.visibility != Visibilities.INVISIBLE_FAKE && + descriptor.visibility != DescriptorVisibilities.INVISIBLE_FAKE && belonginess.accept(descriptor) ) descriptor.accept(visitor, Unit) else null }.toList() @@ -101,7 +101,7 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain val mostVisibleProperties = properties .groupBy { it.visibility } .toSortedMap(Comparator { first, second -> - Visibilities.compare(first, second) ?: 0 + DescriptorVisibilities.compare(first, second) ?: 0 }).values.last() if (mostVisibleProperties.size == 1) { return mostVisibleProperties.first() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt index f0a69fdc9ad..8d1525411ac 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt @@ -229,7 +229,7 @@ private fun KPropertyImpl.Accessor<*, *>.computeCallerForAccessor(isGetter: Bool when { accessor == null -> { if (property.descriptor.isUnderlyingPropertyOfInlineClass() && - property.descriptor.visibility == Visibilities.INTERNAL + property.descriptor.visibility == DescriptorVisibilities.INTERNAL ) { val unboxMethod = property.descriptor.containingDeclaration.toInlineClass()?.getUnboxMethod(property.descriptor) ?: throw KotlinReflectionInternalError("Underlying property of inline class $property should have a field") 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 857483a8b6d..54193eaa29b 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -115,13 +115,13 @@ internal sealed class JvmPropertySignature { private fun getManglingSuffix(): String { val containingDeclaration = descriptor.containingDeclaration - if (descriptor.visibility == Visibilities.INTERNAL && containingDeclaration is DeserializedClassDescriptor) { + if (descriptor.visibility == DescriptorVisibilities.INTERNAL && containingDeclaration is DeserializedClassDescriptor) { val classProto = containingDeclaration.classProto val moduleName = classProto.getExtensionOrNull(JvmProtoBuf.classModuleName)?.let(nameResolver::getString) ?: JvmProtoBufUtil.DEFAULT_MODULE_NAME return "$" + NameUtils.sanitizeAsJavaIdentifier(moduleName) } - if (descriptor.visibility == Visibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor) { + if (descriptor.visibility == DescriptorVisibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor) { val packagePartSource = (descriptor as DeserializedPropertyDescriptor).containerSource if (packagePartSource is JvmPackagePartSource && packagePartSource.facadeClassName != null) { return "$" + packagePartSource.simpleName.asString() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt index d8514da324e..cda72d58eb5 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt @@ -101,12 +101,12 @@ private fun loadClass(classLoader: ClassLoader, packageName: String, className: return classLoader.tryLoadClass(fqName) } -internal fun Visibility.toKVisibility(): KVisibility? = +internal fun DescriptorVisibility.toKVisibility(): KVisibility? = when (this) { - Visibilities.PUBLIC -> KVisibility.PUBLIC - Visibilities.PROTECTED -> KVisibility.PROTECTED - Visibilities.INTERNAL -> KVisibility.INTERNAL - Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS -> KVisibility.PRIVATE + DescriptorVisibilities.PUBLIC -> KVisibility.PUBLIC + DescriptorVisibilities.PROTECTED -> KVisibility.PROTECTED + DescriptorVisibilities.INTERNAL -> KVisibility.INTERNAL + DescriptorVisibilities.PRIVATE, DescriptorVisibilities.PRIVATE_TO_THIS -> KVisibility.PRIVATE else -> null } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java index d5c6898e852..17cc6a3f436 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java @@ -56,20 +56,20 @@ public final class KotlinDescriptorIconProvider { private static Icon getVisibilityIcon(@NotNull DeclarationDescriptor descriptor) { if (descriptor instanceof DeclarationDescriptorWithVisibility) { DeclarationDescriptorWithVisibility descriptorWithVisibility = (DeclarationDescriptorWithVisibility) descriptor; - Visibility visibility = descriptorWithVisibility.getVisibility().normalize(); - if (visibility == Visibilities.PUBLIC) { + DescriptorVisibility visibility = descriptorWithVisibility.getVisibility().normalize(); + if (visibility == DescriptorVisibilities.PUBLIC) { return PlatformIcons.PUBLIC_ICON; } - if (visibility == Visibilities.PROTECTED) { + if (visibility == DescriptorVisibilities.PROTECTED) { return PlatformIcons.PROTECTED_ICON; } - if (Visibilities.isPrivate(visibility)) { + if (DescriptorVisibilities.isPrivate(visibility)) { return PlatformIcons.PRIVATE_ICON; } - if (visibility == Visibilities.INTERNAL) { + if (visibility == DescriptorVisibilities.INTERNAL) { return PlatformIcons.PACKAGE_LOCAL_ICON; } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt index 7c3eb189aa9..1a07c315fd5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt @@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.* @@ -111,7 +111,7 @@ class KotlinStructureViewElement( } private fun isPublic(descriptor: DeclarationDescriptor?) = - (descriptor as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.PUBLIC + (descriptor as? DeclarationDescriptorWithVisibility)?.visibility == DescriptorVisibilities.PUBLIC private fun countDescriptor(): DeclarationDescriptor? { val element = element @@ -132,14 +132,14 @@ class KotlinStructureViewElement( private val visibility = (descriptor as? DeclarationDescriptorWithVisibility)?.visibility val isPublic: Boolean - get() = visibility == Visibilities.PUBLIC + get() = visibility == DescriptorVisibilities.PUBLIC val accessLevel: Int? get() = when { - visibility == Visibilities.PUBLIC -> 1 - visibility == Visibilities.INTERNAL -> 2 - visibility == Visibilities.PROTECTED -> 3 - visibility?.let { Visibilities.isPrivate(it) } == true -> 4 + visibility == DescriptorVisibilities.PUBLIC -> 1 + visibility == DescriptorVisibilities.INTERNAL -> 2 + visibility == DescriptorVisibilities.PROTECTED -> 3 + visibility?.let { DescriptorVisibilities.isPrivate(it) } == true -> 4 else -> null } } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 37f6d12d667..224a344a136 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -152,7 +152,7 @@ class TypeInstantiationItems( val allConstructors = classifier.constructors val visibleConstructors = allConstructors.filter { if (isAbstract) - visibilityFilter(it) || it.visibility == Visibilities.PROTECTED + visibilityFilter(it) || it.visibility == DescriptorVisibilities.PROTECTED else visibilityFilter(it) } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt index b01f70fae0c..63063ea8433 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt @@ -142,7 +142,7 @@ fun Call.resolveCandidates( if (filterOutByVisibility) { candidates = candidates.filter { - Visibilities.isVisible(it.getDispatchReceiverWithSmartCast(), it.resultingDescriptor, inDescriptor) + DescriptorVisibilities.isVisible(it.getDispatchReceiverWithSmartCast(), it.resultingDescriptor, inDescriptor) } } @@ -193,4 +193,4 @@ fun isEnumCompanionPropertyWithEntryConflict(element: PsiElement, expectedName: if (!outerClass.isEnum()) return false return outerClass.declarations.any { it is KtEnumEntry && it.name == expectedName } -} \ No newline at end of file +} diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt index 695deabe6a0..86a088ab783 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt @@ -48,7 +48,7 @@ private fun DeclarationDescriptorWithVisibility.isVisible( bindingContext: BindingContext? = null, resolutionScope: LexicalScope? = null ): Boolean { - if (Visibilities.isVisibleWithAnyReceiver(this, from)) return true + if (DescriptorVisibilities.isVisibleWithAnyReceiver(this, from)) return true if (bindingContext == null || resolutionScope == null) return false @@ -56,10 +56,10 @@ private fun DeclarationDescriptorWithVisibility.isVisible( if (receiverExpression != null && !isExtension) { val receiverType = bindingContext.getType(receiverExpression) ?: return false val explicitReceiver = ExpressionReceiver.create(receiverExpression, receiverType, bindingContext) - return Visibilities.isVisible(explicitReceiver, this, from) + return DescriptorVisibilities.isVisible(explicitReceiver, this, from) } else { return resolutionScope.getImplicitReceiversHierarchy().any { - Visibilities.isVisible(it.value, this, from) + DescriptorVisibilities.isVisible(it.value, this, from) } } } @@ -104,12 +104,12 @@ fun compareDescriptors(project: Project, currentDescriptor: DeclarationDescripto return false } -fun Visibility.toKeywordToken(): KtModifierKeywordToken = when (val normalized = normalize()) { - Visibilities.PUBLIC -> KtTokens.PUBLIC_KEYWORD - Visibilities.PROTECTED -> KtTokens.PROTECTED_KEYWORD - Visibilities.INTERNAL -> KtTokens.INTERNAL_KEYWORD +fun DescriptorVisibility.toKeywordToken(): KtModifierKeywordToken = when (val normalized = normalize()) { + DescriptorVisibilities.PUBLIC -> KtTokens.PUBLIC_KEYWORD + DescriptorVisibilities.PROTECTED -> KtTokens.PROTECTED_KEYWORD + DescriptorVisibilities.INTERNAL -> KtTokens.INTERNAL_KEYWORD else -> { - if (Visibilities.isPrivate(normalized)) { + if (DescriptorVisibilities.isPrivate(normalized)) { KtTokens.PRIVATE_KEYWORD } else { error("Unexpected visibility '$normalized'") @@ -144,4 +144,4 @@ fun D.getDeepestSuperDeclarations(withThis: Boole fun T.unwrapIfFakeOverride(): T { return if (this is CallableMemberDescriptor) DescriptorUtils.unwrapFakeOverride(this) else this -} \ No newline at end of file +} diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt index 9b871f118b9..d5aea0122db 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt @@ -19,7 +19,7 @@ class OverrideMembersHandler(private val preferConstructorParameters: Boolean = for (member in descriptor.unsubstitutedMemberScope.getContributedDescriptors()) { if (member is CallableMemberDescriptor && (member.kind != CallableMemberDescriptor.Kind.DECLARATION)) { val overridden = member.overriddenDescriptors - if (overridden.any { it.modality == Modality.FINAL || Visibilities.isPrivate(it.visibility.normalize()) }) continue + if (overridden.any { it.modality == Modality.FINAL || DescriptorVisibilities.isPrivate(it.visibility.normalize()) }) continue if (DescriptorUtils.isInterface(descriptor) && overridden.any { descriptor.builtIns.isMemberOfAny(it) }) continue diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/DebuggerFieldSyntheticScopeProvider.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/DebuggerFieldSyntheticScopeProvider.kt index 58d3e191ca5..156df970ebe 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/DebuggerFieldSyntheticScopeProvider.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/DebuggerFieldSyntheticScopeProvider.kt @@ -190,14 +190,14 @@ class DebuggerFieldSyntheticScope(val javaSyntheticPropertiesScope: JavaSyntheti val getter = PropertyGetterDescriptorImpl( propertyDescriptor, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, false, false, false, + DescriptorVisibilities.PUBLIC, false, false, false, CallableMemberDescriptor.Kind.SYNTHESIZED, null, sourceElement ).apply { initialize(type) } val setter = if (isVar) PropertySetterDescriptorImpl( propertyDescriptor, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, false, false, false, + DescriptorVisibilities.PUBLIC, false, false, false, CallableMemberDescriptor.Kind.SYNTHESIZED, null, sourceElement ).apply { @@ -226,7 +226,7 @@ internal class DebuggerFieldPropertyDescriptor( null, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, /*isVar = */isVar, Name.identifier(fieldName + "_field"), CallableMemberDescriptor.Kind.SYNTHESIZED, @@ -237,4 +237,4 @@ internal class DebuggerFieldPropertyDescriptor( /*isActual = */false, /*isExternal = */false, /*isDelegated = */false -) \ No newline at end of file +) diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt index eb25bff6020..024e3ea4340 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt @@ -209,7 +209,7 @@ class CodeFragmentCompiler(private val executionContext: ExecutionContext, priva methodDescriptor.initialize( null, classDescriptor.thisAsReceiverParameter, emptyList(), - parameters, returnType, Modality.FINAL, Visibilities.PUBLIC + parameters, returnType, Modality.FINAL, DescriptorVisibilities.PUBLIC ) val memberScope = EvaluatorMemberScopeForMethod(methodDescriptor) @@ -301,4 +301,4 @@ private class EvaluatorModuleDescriptor( } private val OutputFile.internalClassName: String - get() = relativePath.removeSuffix(".class").replace('/', '.') \ No newline at end of file + get() = relativePath.removeSuffix(".class").replace('/', '.') diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt index 2f52b9294f7..f0a20dc0f49 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt @@ -290,7 +290,7 @@ class CodeFragmentParameterAnalyzer( ) } - val isLocalTarget = (target as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.LOCAL + val isLocalTarget = (target as? DeclarationDescriptorWithVisibility)?.visibility == DescriptorVisibilities.LOCAL val isPrimaryConstructorParameter = !isLocalTarget && target is PropertyDescriptor @@ -422,4 +422,4 @@ private class OnceUsedChecker(private val clazz: Class<*>) { used = true } -} \ No newline at end of file +} 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 ffdc20b2937..fc30b211325 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 @@ -88,7 +88,7 @@ class DebugLabelPropertyDescriptorProvider(val codeFragment: KtCodeFragment, val propertyDescriptor, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, /* isDefault = */ false, /* isExternal = */ false, /* isInline = */ false, @@ -205,7 +205,7 @@ internal class DebugLabelPropertyDescriptor( null, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, /*isVar = */false, Name.identifier(labelName + "_DebugLabel"), CallableMemberDescriptor.Kind.SYNTHESIZED, diff --git a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt index e40ee6302fc..46ad86a15f7 100644 --- a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt +++ b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt @@ -177,9 +177,9 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru private fun rankingForVisibility(descriptor: DeclarationDescriptorWithVisibility, accessible: Accessible): Ranking { return collect( - accessible.isPublic && descriptor.visibility == Visibilities.PUBLIC, - accessible.isProtected && descriptor.visibility == Visibilities.PROTECTED, - accessible.isPrivate && descriptor.visibility == Visibilities.PRIVATE + accessible.isPublic && descriptor.visibility == DescriptorVisibilities.PUBLIC, + accessible.isProtected && descriptor.visibility == DescriptorVisibilities.PROTECTED, + accessible.isPrivate && descriptor.visibility == DescriptorVisibilities.PRIVATE ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt index d538f6fdb06..9c30396716a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall @@ -160,7 +160,7 @@ class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedIns override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) { val target = expression.resolveToCall()?.resultingDescriptor as? DeclarationDescriptorWithVisibility ?: return - if (Visibilities.isPrivate((target.visibility))) { + if (DescriptorVisibilities.isPrivate((target.visibility))) { isGood = false } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt index c71e653f24e..920afbe509b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.lexer.KtTokens -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* @@ -62,7 +62,7 @@ class KotlinRedundantOverrideInspection : AbstractKotlinInspection(), CleanupLoc val functionDescriptor = context[BindingContext.FUNCTION, function] if (function.hasDerivedProperty(functionDescriptor, context)) return val overriddenDescriptors = functionDescriptor?.original?.overriddenDescriptors - if (overriddenDescriptors?.any { it is JavaMethodDescriptor && it.visibility == JavaVisibilities.PACKAGE_VISIBILITY } == true) return + if (overriddenDescriptors?.any { it is JavaMethodDescriptor && it.visibility == JavaDescriptorVisibilities.PACKAGE_VISIBILITY } == true) return if (function.isAmbiguouslyDerived(overriddenDescriptors, context)) return val descriptor = holder.manager.createProblemDescriptor( diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt index 3ccc2731954..b8eb5c17ed4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt @@ -136,7 +136,7 @@ private fun ClassDescriptor.findMemberFunction(name: Name): FunctionDescriptor? } private fun CallableDescriptor.isLocalOrExtension(extensionClassDescriptor: ClassDescriptor): Boolean { - return visibility == Visibilities.LOCAL || + return visibility == DescriptorVisibilities.LOCAL || extensionReceiverParameter?.type?.constructor?.declarationDescriptor == extensionClassDescriptor } @@ -158,4 +158,4 @@ class RemoveRedundantCompanionReferenceFix : LocalQuickFix { if (expression == receiver) parent.replace(selector) else parent.replace(receiver) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantVisibilityModifierInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantVisibilityModifierInspection.kt index 3e7206fb012..63d0d33d610 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantVisibilityModifierInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantVisibilityModifierInspection.kt @@ -10,8 +10,8 @@ import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.config.ExplicitApiMode import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.idea.KotlinBundle @@ -56,7 +56,7 @@ class RedundantVisibilityModifierInspection : AbstractKotlinInspection(), Cleanu && declaration is KtProperty && declaration.hasModifier(KtTokens.OVERRIDE_KEYWORD) && declaration.isVar - && declaration.setterVisibility().let { it != null && it != Visibilities.PUBLIC } + && declaration.setterVisibility().let { it != null && it != DescriptorVisibilities.PUBLIC } ) return holder.registerProblem( @@ -71,7 +71,7 @@ class RedundantVisibilityModifierInspection : AbstractKotlinInspection(), Cleanu }) } - private fun KtProperty.setterVisibility(): Visibility? { + private fun KtProperty.setterVisibility(): DescriptorVisibility? { val descriptor = descriptor as? PropertyDescriptor ?: return null if (setter?.visibilityModifier() != null) { val visibility = descriptor.setter?.visibility diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 8257672f6b1..5e86b173e4b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -518,7 +518,7 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { return when { descriptor is ConstructorDescriptor -> { val classDescriptor = descriptor.constructedClass - !classDescriptor.isInline && classDescriptor.visibility != Visibilities.LOCAL + !classDescriptor.isInline && classDescriptor.visibility != DescriptorVisibilities.LOCAL } hasModifier(KtTokens.INTERNAL_KEYWORD) -> false descriptor !is FunctionDescriptor -> true @@ -638,4 +638,4 @@ class SafeDeleteFix(declaration: KtDeclaration) : LocalQuickFix { private fun safeDelete(project: Project, declaration: PsiElement) { SafeDeleteHandler.invoke(project, arrayOf(declaration), false) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddThrowsAnnotationIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddThrowsAnnotationIntention.kt index b210b71f4a3..39cf19c5feb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddThrowsAnnotationIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddThrowsAnnotationIntention.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.module.Module import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall @@ -44,7 +44,7 @@ class AddThrowsAnnotationIntention : SelfTargetingIntention( val containingDeclaration = element.getContainingDeclaration() ?: return false val type = element.thrownExpression?.resolveToCall()?.resultingDescriptor?.returnType ?: return false - if ((type.constructor.declarationDescriptor as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.LOCAL) return false + if ((type.constructor.declarationDescriptor as? DeclarationDescriptorWithVisibility)?.visibility == DescriptorVisibilities.LOCAL) return false val module = element.module ?: return false if (!KOTLIN_THROWS_ANNOTATION_FQ_NAME.fqNameIsExists(module) && @@ -154,4 +154,4 @@ private fun FqName.fqNameIsExists(module: Module): Boolean = KotlinFullClassName asString(), module.project, GlobalSearchScope.moduleWithLibrariesScope(module) -].isNotEmpty() \ No newline at end of file +].isNotEmpty() diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt index ef5502e9d7d..9e81c4bd135 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.core.* import org.jetbrains.kotlin.idea.util.runCommandOnAllExpectAndActualDeclaration @@ -40,7 +40,7 @@ open class ChangeVisibilityModifierIntention protected constructor(val modifier: val callableDescriptor = descriptor as? CallableDescriptor ?: return null // cannot make visibility less than (or non-comparable with) any of the supers if (callableDescriptor.overriddenDescriptors - .map { Visibilities.compare(it.visibility, targetVisibility) } + .map { DescriptorVisibilities.compare(it.visibility, targetVisibility) } .any { it == null || it > 0 } ) return null } @@ -49,13 +49,13 @@ open class ChangeVisibilityModifierIntention protected constructor(val modifier: if (element is KtPropertyAccessor) { if (element.isGetter) return null - if (targetVisibility == Visibilities.PUBLIC) { + if (targetVisibility == DescriptorVisibilities.PUBLIC) { val explicitVisibility = element.modifierList?.visibilityModifierType()?.value ?: return null setTextGetter(KotlinBundle.lazyMessage("remove.0.modifier", explicitVisibility)) } else { val propVisibility = (element.property.toDescriptor() as? DeclarationDescriptorWithVisibility)?.visibility ?: return null if (propVisibility == targetVisibility) return null - val compare = Visibilities.compare(targetVisibility, propVisibility) + val compare = DescriptorVisibilities.compare(targetVisibility, propVisibility) if (compare == null || compare > 0) return null } } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/CreateKotlinSubClassIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/CreateKotlinSubClassIntention.kt index 1d87ba653db..4758edd24b8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/CreateKotlinSubClassIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/CreateKotlinSubClassIntention.kt @@ -14,8 +14,8 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange import com.intellij.psi.JavaDirectoryService import com.intellij.refactoring.rename.PsiElementRenameHandler -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.ShortenReferences @@ -103,7 +103,7 @@ class CreateKotlinSubClassIntention : SelfTargetingRangeIntention( private fun createExternalSubclass(baseClass: KtClass, baseName: String, editor: Editor) { var container: KtClassOrObject = baseClass var name = baseName - var visibility = ModifiersChecker.resolveVisibilityFromModifiers(baseClass, Visibilities.PUBLIC) + var visibility = ModifiersChecker.resolveVisibilityFromModifiers(baseClass, org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC) while (!container.isPrivate() && !container.isProtected() && !(container is KtClass && container.isInner())) { val parent = container.containingClassOrObject if (parent != null) { @@ -112,7 +112,7 @@ class CreateKotlinSubClassIntention : SelfTargetingRangeIntention( container = parent name = "$parentName.$name" val parentVisibility = ModifiersChecker.resolveVisibilityFromModifiers(parent, visibility) - if (Visibilities.compare(parentVisibility, visibility) ?: 0 < 0) { + if (org.jetbrains.kotlin.descriptors.DescriptorVisibilities.compare(parentVisibility, visibility) ?: 0 < 0) { visibility = parentVisibility } } @@ -176,11 +176,11 @@ class CreateKotlinSubClassIntention : SelfTargetingRangeIntention( targetName: String, baseClass: KtClass, baseName: String, - defaultVisibility: Visibility = ModifiersChecker.resolveVisibilityFromModifiers(baseClass, Visibilities.PUBLIC) + defaultVisibility: DescriptorVisibility = ModifiersChecker.resolveVisibilityFromModifiers(baseClass, org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC) ): ClassHeaderBuilder { return ClassHeaderBuilder().apply { if (!baseClass.isInterface()) { - if (defaultVisibility != Visibilities.PUBLIC) { + if (defaultVisibility != org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC) { modifier(defaultVisibility.name) } if (baseClass.isInner()) { @@ -199,4 +199,4 @@ class CreateKotlinSubClassIntention : SelfTargetingRangeIntention( editor.caretModel.moveToOffset(targetClass.textRange.startOffset) ImplementMembersHandler().invoke(project, editor, targetClass.containingFile) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt index 2aeef3af104..ece76abde31 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt @@ -11,8 +11,8 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0 import org.jetbrains.kotlin.idea.KotlinBundle @@ -104,17 +104,17 @@ open class ChangeVisibilityFix( fun create( declaration: KtModifierListOwner, descriptor: DeclarationDescriptorWithVisibility, - targetVisibility: Visibility + targetVisibility: DescriptorVisibility ): IntentionAction? { if (!ExposedVisibilityChecker().checkDeclarationWithVisibility(declaration, descriptor, targetVisibility)) return null val name = descriptor.name.asString() return when (targetVisibility) { - Visibilities.PRIVATE -> ChangeToPrivateFix(declaration, name) - Visibilities.INTERNAL -> ChangeToInternalFix(declaration, name) - Visibilities.PROTECTED -> ChangeToProtectedFix(declaration, name) - Visibilities.PUBLIC -> ChangeToPublicFix(declaration, name) + DescriptorVisibilities.PRIVATE -> ChangeToPrivateFix(declaration, name) + DescriptorVisibilities.INTERNAL -> ChangeToInternalFix(declaration, name) + DescriptorVisibilities.PROTECTED -> ChangeToProtectedFix(declaration, name) + DescriptorVisibilities.PUBLIC -> ChangeToPublicFix(declaration, name) else -> null } } @@ -134,4 +134,4 @@ open class ChangeVisibilityFix( ) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt index 3fa44b2eab9..74706211a87 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.descriptors.DescriptorWithRelation import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.EffectiveVisibility.Permissiveness.LESS -import org.jetbrains.kotlin.descriptors.Visibilities.* -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.* +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory3 import org.jetbrains.kotlin.idea.core.toDescriptor @@ -35,12 +35,12 @@ import java.util.* object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() { private fun addFixToTargetVisibility( - modifierListOwner: KtModifierListOwner, - descriptor: DeclarationDescriptorWithVisibility, - targetVisibility: Visibility, - boundVisibility: Visibility, - protectedAllowed: Boolean, - fixes: MutableList + modifierListOwner: KtModifierListOwner, + descriptor: DeclarationDescriptorWithVisibility, + targetVisibility: DescriptorVisibility, + boundVisibility: DescriptorVisibility, + protectedAllowed: Boolean, + fixes: MutableList ) { val possibleVisibilities = when (targetVisibility) { PROTECTED -> if (protectedAllowed) listOf(boundVisibility, PROTECTED) else listOf(boundVisibility) @@ -85,4 +85,4 @@ object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() { ) return result } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt index ae32ec88b27..acf04f129f8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities.* +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.* import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory3 import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 80cc29978e0..b6b43fc9eee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -419,7 +419,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { return fakeFunction.initialize( null, null, typeParameters, Collections.emptyList(), null, - null, Visibilities.INTERNAL + null, DescriptorVisibilities.INTERNAL ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index 689871ed9e3..60814e758ef 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder import com.intellij.psi.PsiElement import com.intellij.util.ArrayUtil import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassInfo @@ -217,7 +217,7 @@ class ClassWithPrimaryConstructorInfo( val classInfo: ClassInfo, expectedTypeInfo: TypeInfo, modifierList: KtModifierList? = null, - val primaryConstructorVisibility: Visibility? = null + val primaryConstructorVisibility: DescriptorVisibility? = null ) : CallableInfo( classInfo.name, TypeInfo.Empty, diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index 21baeddd84f..2ad4739e0b9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult import org.jetbrains.kotlin.idea.intentions.getCallableDescriptor @@ -95,8 +95,8 @@ object CreateClassFromConstructorCallActionFactory : CreateClassFromUsageFactory (it.getArgumentExpression()?.getCallableDescriptor() as? ClassConstructorDescriptor)?.containingDeclaration?.visibility } val primaryConstructorVisibility = when { - Visibilities.PRIVATE in argumentClassVisibilities -> Visibilities.PRIVATE - Visibilities.INTERNAL in argumentClassVisibilities -> Visibilities.INTERNAL + DescriptorVisibilities.PRIVATE in argumentClassVisibilities -> DescriptorVisibilities.PRIVATE + DescriptorVisibilities.INTERNAL in argumentClassVisibilities -> DescriptorVisibilities.INTERNAL else -> null } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index af61ff4c50c..74c0fe95a0a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt @@ -16,7 +16,7 @@ import com.intellij.openapi.ui.DialogWrapper import com.intellij.psi.* import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.core.getFqNameWithImplicitPrefix @@ -69,7 +69,7 @@ data class ClassInfo( val open: Boolean = false, val typeArguments: List = Collections.emptyList(), val parameterInfos: List = Collections.emptyList(), - val primaryConstructorVisibility: Visibility? = null + val primaryConstructorVisibility: DescriptorVisibility? = null ) { val applicableParents by lazy { targetParents.filter { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt index 74cc5980edb..ff86fab98be 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.builtins.isNonExtensionFunctionType import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaOrKotlinMemberDescriptor import org.jetbrains.kotlin.idea.j2k.j2k @@ -56,14 +56,14 @@ import org.jetbrains.kotlin.utils.keysToMap import java.util.* open class KotlinChangeInfo( - val methodDescriptor: KotlinMethodDescriptor, - private var name: String = methodDescriptor.name, - var newReturnTypeInfo: KotlinTypeInfo = KotlinTypeInfo(true, methodDescriptor.baseDescriptor.returnType), - var newVisibility: Visibility = methodDescriptor.visibility, - parameterInfos: List = methodDescriptor.parameters, - receiver: KotlinParameterInfo? = methodDescriptor.receiver, - val context: PsiElement, - primaryPropagationTargets: Collection = emptyList() + val methodDescriptor: KotlinMethodDescriptor, + private var name: String = methodDescriptor.name, + var newReturnTypeInfo: KotlinTypeInfo = KotlinTypeInfo(true, methodDescriptor.baseDescriptor.returnType), + var newVisibility: DescriptorVisibility = methodDescriptor.visibility, + parameterInfos: List = methodDescriptor.parameters, + receiver: KotlinParameterInfo? = methodDescriptor.receiver, + val context: PsiElement, + primaryPropagationTargets: Collection = emptyList() ) : ChangeInfo, UserDataHolder by UserDataHolderBase() { private class JvmOverloadSignature( val method: PsiMethod, @@ -239,7 +239,7 @@ open class KotlinChangeInfo( fun getNewSignature(inheritedCallable: KotlinCallableDefinitionUsage): String { val buffer = StringBuilder() - val isCustomizedVisibility = newVisibility != Visibilities.DEFAULT_VISIBILITY + val isCustomizedVisibility = newVisibility != DescriptorVisibilities.DEFAULT_VISIBILITY if (kind == Kind.PRIMARY_CONSTRUCTOR) { buffer.append(name) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt index 729b533e7ca..7672e404ce6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt @@ -172,7 +172,7 @@ class KotlinChangeSignatureData( override fun getParametersCount(): Int = baseDescriptor.valueParameters.size - override fun getVisibility(): Visibility = baseDescriptor.visibility + override fun getVisibility(): DescriptorVisibility = baseDescriptor.visibility override fun getMethod(): PsiElement = baseDeclaration diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 59c91ecba5b..f6b9d612d09 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -84,7 +84,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { methodDescriptor = methodDescriptor, name = "", newReturnTypeInfo = KotlinTypeInfo(true), - newVisibility = Visibilities.DEFAULT_VISIBILITY, + newVisibility = DescriptorVisibilities.DEFAULT_VISIBILITY, parameterInfos = emptyList(), receiver = null, context = method diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt index 33c39eac192..c4808e4bb49 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt @@ -10,12 +10,12 @@ import com.intellij.refactoring.changeSignature.MethodDescriptor import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.KtCallableDeclaration -interface KotlinMethodDescriptor : MethodDescriptor { +interface KotlinMethodDescriptor : MethodDescriptor { enum class Kind(val isConstructor: Boolean) { FUNCTION(false), PRIMARY_CONSTRUCTOR(true), diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt index 1d3bb5d8eb0..c0e71361c72 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescriptor) : KotlinMethodDescriptor by original { private val parameters: MutableList = original.parameters @@ -42,7 +42,7 @@ class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescripto receiver?.let { parameters.add(it) } } - override fun getVisibility(): Visibility? { + override fun getVisibility(): DescriptorVisibility? { return original.visibility } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt index e8cdb62c851..547b546f16b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt @@ -11,8 +11,8 @@ import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.refactoring.ui.RefactoringDialog import com.intellij.ui.EditorTextField import com.intellij.util.ui.FormBuilder -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.refactoring.changeSignature.* @@ -31,7 +31,7 @@ class KotlinChangePropertySignatureDialog( private val commandName: String? ) : RefactoringDialog(project, true) { private val visibilityCombo = ComboBox( - arrayOf(Visibilities.INTERNAL, Visibilities.PRIVATE, Visibilities.PROTECTED, Visibilities.PUBLIC) + arrayOf(DescriptorVisibilities.INTERNAL, DescriptorVisibilities.PRIVATE, DescriptorVisibilities.PROTECTED, DescriptorVisibilities.PUBLIC) ) private val nameField = EditorTextField(methodDescriptor.name) private var returnTypeField: EditorTextField by Delegates.notNull() @@ -146,7 +146,7 @@ class KotlinChangePropertySignatureDialog( originalDescriptor, nameField.text, KotlinTypeInfo(true, null, returnTypeField.text), - visibilityCombo.selectedItem as Visibility, + visibilityCombo.selectedItem as DescriptorVisibility, emptyList(), receiver, originalDescriptor.method @@ -168,4 +168,4 @@ class KotlinChangePropertySignatureDialog( return KotlinChangeSignatureProcessor(project, changeInfo, commandName) } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt index 84a4342f79a..1d4b6a39b3d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages.OkCancelResult -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import javax.swing.Icon // FIX ME WHEN BUNCH 193 REMOVED @@ -30,4 +30,4 @@ fun showOkCancelDialog( ) } -typealias ComboBox = com.intellij.openapi.ui.ComboBox +typealias ComboBox = com.intellij.openapi.ui.ComboBox diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index a370b9a4ced..7bc0b51223e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -42,8 +42,8 @@ import com.intellij.util.Consumer import com.intellij.util.ui.UIUtil import com.intellij.util.ui.table.JBTableRow import com.intellij.util.ui.table.JBTableRowEditor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.caches.resolve.analyze @@ -71,7 +71,7 @@ class KotlinChangeSignatureDialog( ) : ChangeSignatureDialogBase< KotlinParameterInfo, PsiElement, - Visibility, + DescriptorVisibility, KotlinMethodDescriptor, ParameterTableModelItemBase, KotlinCallableParameterTableModel>(project, methodDescriptor, false, context) { @@ -320,7 +320,7 @@ class KotlinChangeSignatureDialog( } override fun createVisibilityControl() = ComboBoxVisibilityPanel( - arrayOf(Visibilities.INTERNAL, Visibilities.PRIVATE, Visibilities.PROTECTED, Visibilities.PUBLIC) + arrayOf(DescriptorVisibilities.INTERNAL, DescriptorVisibilities.PRIVATE, DescriptorVisibilities.PROTECTED, DescriptorVisibilities.PUBLIC) ) override fun updateSignatureAlarmFired() { @@ -481,13 +481,13 @@ class KotlinChangeSignatureDialog( } private fun evaluateChangeInfo( - parametersModel: KotlinCallableParameterTableModel, - returnTypeCodeFragment: PsiCodeFragment?, - methodDescriptor: KotlinMethodDescriptor, - visibility: Visibility?, - methodName: String, - defaultValueContext: PsiElement, - forPreview: Boolean + parametersModel: KotlinCallableParameterTableModel, + returnTypeCodeFragment: PsiCodeFragment?, + methodDescriptor: KotlinMethodDescriptor, + visibility: DescriptorVisibility?, + methodName: String, + defaultValueContext: PsiElement, + forPreview: Boolean ): KotlinChangeInfo { val parameters = parametersModel.items.map { parameter -> val parameterInfo = parameter.parameter @@ -507,7 +507,7 @@ class KotlinChangeSignatureDialog( methodDescriptor.original, methodName, returnTypeCodeFragment.getTypeInfo(true, forPreview), - visibility ?: Visibilities.DEFAULT_VISIBILITY, + visibility ?: DescriptorVisibilities.DEFAULT_VISIBILITY, parameters, parametersModel.receiver, defaultValueContext diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index c25e671e4a7..560b4e175ab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.core.* import org.jetbrains.kotlin.idea.core.util.isMultiLine import org.jetbrains.kotlin.idea.inspections.PublicApiImplicitTypeInspection @@ -499,8 +499,8 @@ fun ExtractionGeneratorConfiguration.generateDeclaration( val visibility = (descriptor.visibility ?: KtTokens.DEFAULT_VISIBILITY_KEYWORD).toVisibility() return when { visibility.isPublicAPI -> true - inspection.reportInternal && visibility == Visibilities.INTERNAL -> true - inspection.reportPrivate && visibility == Visibilities.PRIVATE -> true + inspection.reportInternal && visibility == DescriptorVisibilities.INTERNAL -> true + inspection.reportPrivate && visibility == DescriptorVisibilities.PRIVATE -> true else -> false } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt index 3f321df6842..f1d2678a8fe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations -import com.intellij.lang.java.JavaLanguage import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.module.impl.scopes.JdkScope @@ -51,7 +50,7 @@ import org.jetbrains.kotlin.idea.search.not import org.jetbrains.kotlin.idea.util.projectStructure.getModule import org.jetbrains.kotlin.idea.util.projectStructure.module import org.jetbrains.kotlin.lexer.KtTokens -import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.jvm.isJvm @@ -136,15 +135,15 @@ class MoveConflictChecker( private fun DeclarationDescriptor.isVisibleIn(where: DeclarationDescriptor): Boolean { return when { this !is DeclarationDescriptorWithVisibility -> true - !Visibilities.isVisibleIgnoringReceiver(this, where) -> false - this is ConstructorDescriptor -> Visibilities.isVisibleIgnoringReceiver(containingDeclaration, where) + !DescriptorVisibilities.isVisibleIgnoringReceiver(this, where) -> false + this is ConstructorDescriptor -> DescriptorVisibilities.isVisibleIgnoringReceiver(containingDeclaration, where) else -> true } } private fun DeclarationDescriptor.wrap( newContainer: DeclarationDescriptor? = null, - newVisibility: Visibility? = null + newVisibility: DescriptorVisibility? = null ): DeclarationDescriptor? { if (newContainer == null && newVisibility == null) return this @@ -153,14 +152,14 @@ class MoveConflictChecker( is CallableMemberDescriptor -> object : CallableMemberDescriptor by wrappedDescriptor { override fun getOriginal() = this override fun getContainingDeclaration() = newContainer ?: wrappedDescriptor.containingDeclaration - override fun getVisibility(): Visibility = newVisibility ?: wrappedDescriptor.visibility + override fun getVisibility(): DescriptorVisibility = newVisibility ?: wrappedDescriptor.visibility override fun getSource() = newContainer?.let { SourceElement { DescriptorUtils.getContainingSourceFile(it) } } ?: wrappedDescriptor.source } is ClassDescriptor -> object : ClassDescriptor by wrappedDescriptor { override fun getOriginal() = this override fun getContainingDeclaration() = newContainer ?: wrappedDescriptor.containingDeclaration - override fun getVisibility(): Visibility = newVisibility ?: wrappedDescriptor.visibility + override fun getVisibility(): DescriptorVisibility = newVisibility ?: wrappedDescriptor.visibility override fun getSource() = newContainer?.let { SourceElement { DescriptorUtils.getContainingSourceFile(it) } } ?: wrappedDescriptor.source } @@ -170,24 +169,24 @@ class MoveConflictChecker( private fun DeclarationDescriptor.asPredicted( newContainer: DeclarationDescriptor, - actualVisibility: Visibility? + actualVisibility: DescriptorVisibility? ): DeclarationDescriptor? { val visibility = actualVisibility ?: (this as? DeclarationDescriptorWithVisibility)?.visibility ?: return null - val adjustedVisibility = if (visibility == Visibilities.PROTECTED && newContainer is PackageFragmentDescriptor) { - Visibilities.PUBLIC + val adjustedVisibility = if (visibility == DescriptorVisibilities.PROTECTED && newContainer is PackageFragmentDescriptor) { + DescriptorVisibilities.PUBLIC } else { visibility } return wrap(newContainer, adjustedVisibility) } - private fun DeclarationDescriptor.visibilityAsViewedFromJava(): Visibility? { + private fun DeclarationDescriptor.visibilityAsViewedFromJava(): DescriptorVisibility? { if (this !is DeclarationDescriptorWithVisibility) return null return when (visibility) { - Visibilities.PRIVATE -> { - if (this is ClassDescriptor && DescriptorUtils.isTopLevelDeclaration(this)) JavaVisibilities.PACKAGE_VISIBILITY else null + DescriptorVisibilities.PRIVATE -> { + if (this is ClassDescriptor && DescriptorUtils.isTopLevelDeclaration(this)) JavaDescriptorVisibilities.PACKAGE_VISIBILITY else null } - Visibilities.PROTECTED -> JavaVisibilities.PROTECTED_AND_PACKAGE + DescriptorVisibilities.PROTECTED -> JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE else -> null } } @@ -380,7 +379,7 @@ class MoveConflictChecker( val referencedDescriptor = resolutionFacade.resolveToDescriptor(referencedElement) if (referencedDescriptor is DeclarationDescriptorWithVisibility - && referencedDescriptor.visibility == Visibilities.PUBLIC + && referencedDescriptor.visibility == DescriptorVisibilities.PUBLIC && moveTarget is KotlinMoveTargetForExistingElement && moveTarget.targetElement.parentsWithSelf.filterIsInstance().all { it.isPublic } ) continue @@ -442,7 +441,7 @@ class MoveConflictChecker( fun DeclarationDescriptorWithVisibility.isVisibleFrom(ref: PsiReference): Boolean { val targetVisibility = visibility.normalize() - if (targetVisibility == Visibilities.PUBLIC) return true + if (targetVisibility == DescriptorVisibilities.PUBLIC) return true val refElement = ref.element val referrer = refElement.getStrictParentOfType() @@ -454,7 +453,7 @@ class MoveConflictChecker( if (!isVisibleIn(referrerDescriptor)) return true return when (targetVisibility) { - Visibilities.PROTECTED -> isProtectedVisible(referrerDescriptor) + DescriptorVisibilities.PROTECTED -> isProtectedVisible(referrerDescriptor) else -> isVisibleIn(targetContainer) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt index 8cb55f35c5a..68da4a46552 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt @@ -18,7 +18,7 @@ import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.core.setVisibility @@ -132,7 +132,7 @@ class MoveKotlinMethodProcessor( if (where == null || targetVariableIsMethodParameter()) return val targetDescriptor = targetVariable.resolveToDescriptorIfAny() as? DeclarationDescriptorWithVisibility ?: return - if (!Visibilities.isVisibleIgnoringReceiver(targetDescriptor, where) && method.manager.isInProject(targetVariable)) { + if (!DescriptorVisibilities.isVisibleIgnoringReceiver(targetDescriptor, where) && method.manager.isInProject(targetVariable)) { targetVariable.setVisibility(KtTokens.PUBLIC_KEYWORD) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/pullUpConflictsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/pullUpConflictsUtils.kt index ba7ac8520ce..366c51b088e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/pullUpConflictsUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/pullUpConflictsUtils.kt @@ -224,7 +224,7 @@ private fun KotlinPullUpData.checkVisibility( if (targetDescriptor in memberDescriptors.values) return val target = (targetDescriptor as? DeclarationDescriptorWithSource)?.source?.getPsi() ?: return if (targetDescriptor is DeclarationDescriptorWithVisibility - && !Visibilities.isVisibleIgnoringReceiver(targetDescriptor, targetClassDescriptor) + && !DescriptorVisibilities.isVisibleIgnoringReceiver(targetDescriptor, targetClassDescriptor) ) { val message = RefactoringBundle.message( "0.uses.1.which.is.not.accessible.from.the.superclass", @@ -264,4 +264,4 @@ private fun KotlinPullUpData.checkVisibility( } ) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt index 4d80130d8c5..caf66023366 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/pushDownConflictsUtils.kt @@ -209,7 +209,7 @@ private fun checkVisibility( fun reportConflictIfAny(targetDescriptor: DeclarationDescriptor) { val target = (targetDescriptor as? DeclarationDescriptorWithSource)?.source?.getPsi() ?: return if (targetDescriptor is DeclarationDescriptorWithVisibility - && !Visibilities.isVisibleIgnoringReceiver(targetDescriptor, targetClassDescriptor) + && !DescriptorVisibilities.isVisibleIgnoringReceiver(targetDescriptor, targetClassDescriptor) ) { val message = KotlinBundle.message( "text.0.uses.1.which.is.not.accessible.from.2", diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt index 05c7bc03c85..64168e1802f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt @@ -86,7 +86,7 @@ internal fun checkRedeclarations( descriptor: DeclarationDescriptor = declaration.unsafeResolveToDescriptor(resolutionFacade) ) { fun DeclarationDescriptor.isTopLevelPrivate(): Boolean = - this is DeclarationDescriptorWithVisibility && visibility == Visibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor + this is DeclarationDescriptorWithVisibility && visibility == DescriptorVisibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor fun isInSameFile(d1: DeclarationDescriptor, d2: DeclarationDescriptor): Boolean = (d1 as? DeclarationDescriptorWithSource)?.source?.getPsi()?.containingFile == (d2 as? DeclarationDescriptorWithSource)?.source @@ -370,4 +370,4 @@ internal fun checkNewNameUsagesRetargeting( checkUsagesRetargeting(candidate, declaration, currentName, false, listOf(descriptor), usages, newUsages) usages.filterIsInstanceTo>(newUsages) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index dcb3f072b01..5ee7b59dbab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -231,7 +231,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper( fun isVisible(descriptor: DeclarationDescriptor): Boolean { if (descriptor !is DeclarationDescriptorWithVisibility) return true val visibility = descriptor.visibility - return !visibility.mustCheckInImports() || Visibilities.isVisibleIgnoringReceiver(descriptor, filePackage) + return !visibility.mustCheckInImports() || DescriptorVisibilities.isVisibleIgnoringReceiver(descriptor, filePackage) } val kindFilter = DescriptorKindFilter.ALL.withoutKinds(DescriptorKindFilter.PACKAGES_MASK) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt index 708e2e4a3db..3e8d195b096 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt @@ -25,7 +25,7 @@ import junit.framework.TestCase import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.builtins.DefaultBuiltIns -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinChangeSignatureDialog.Companion.getTypeCodeFragmentContext import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinChangeSignatureDialog.Companion.getTypeInfo @@ -277,12 +277,12 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { } fun testChangeConstructorVisibility() { - doTest { newVisibility = Visibilities.PROTECTED } + doTest { newVisibility = DescriptorVisibilities.PROTECTED } } fun testAddConstructorVisibility() { doTest { - newVisibility = Visibilities.PROTECTED + newVisibility = DescriptorVisibilities.PROTECTED val newParameter = KotlinParameterInfo( callableDescriptor = originalBaseFunctionDescriptor, @@ -297,7 +297,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { fun testConstructor() { doTest { - newVisibility = Visibilities.PUBLIC + newVisibility = DescriptorVisibilities.PUBLIC newParameters[0].valOrVar = KotlinValVar.Var newParameters[1].valOrVar = KotlinValVar.None @@ -313,7 +313,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { fun testGenericConstructor() { doTest { - newVisibility = Visibilities.PUBLIC + newVisibility = DescriptorVisibilities.PUBLIC newParameters[0].valOrVar = KotlinValVar.Var newParameters[1].valOrVar = KotlinValVar.None @@ -338,7 +338,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { fun testFunctions() { doTest { - newVisibility = Visibilities.PUBLIC + newVisibility = DescriptorVisibilities.PUBLIC newParameters[0].name = "_x1" newParameters[1].name = "_x2" @@ -350,7 +350,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { fun testGenericFunctions() { doTest { - newVisibility = Visibilities.PUBLIC + newVisibility = DescriptorVisibilities.PUBLIC newParameters[0].name = "_x1" newParameters[1].name = "_x2" @@ -370,7 +370,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { fun testFunctionsAddRemoveArguments() { doTest { - newVisibility = Visibilities.INTERNAL + newVisibility = DescriptorVisibilities.INTERNAL val defaultValueForCall = KtPsiFactory(project).createExpression("null") val newParameters = newParameters @@ -1270,11 +1270,11 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { } fun testMakePrimaryConstructorPrivateNoParams() { - doTest { newVisibility = Visibilities.PRIVATE } + doTest { newVisibility = DescriptorVisibilities.PRIVATE } } fun testMakePrimaryConstructorPublic() { - doTest { newVisibility = Visibilities.PUBLIC } + doTest { newVisibility = DescriptorVisibilities.PUBLIC } } fun testRenameExtensionParameterWithNamedArgs() { diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt index 0805753abc7..82d62385b41 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt @@ -53,5 +53,5 @@ fun DeclarationDescriptor.shouldBeExported(config: JsConfig): Boolean = private fun EffectiveVisibility.shouldBeExported(config: JsConfig): Boolean { if (publicApi) return true if (config.configuration.getBoolean(JSConfigurationKeys.FRIEND_PATHS_DISABLED)) return false - return toVisibility() == Visibilities.INTERNAL -} \ No newline at end of file + return toVisibility() == DescriptorVisibilities.INTERNAL +} diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt index fa93509029a..a7f434f91ac 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt @@ -288,7 +288,7 @@ class NameSuggestion { is PackageFragmentDescriptor -> when { effectiveVisibility.isPublicAPI -> mangledAndStable() - effectiveVisibility == Visibilities.INTERNAL -> mangledInternal() + effectiveVisibility == DescriptorVisibilities.INTERNAL -> mangledInternal() else -> regularAndUnstable() } @@ -297,16 +297,16 @@ class NameSuggestion { descriptor is FunctionDescriptor && descriptor.isEnumValueOfMethod() -> mangledAndStable() // Make all public declarations stable - effectiveVisibility == Visibilities.PUBLIC -> mangledAndStable() + effectiveVisibility == DescriptorVisibilities.PUBLIC -> mangledAndStable() descriptor.isOverridableOrOverrides -> mangledAndStable() // Make all protected declarations of non-final public classes stable - effectiveVisibility == Visibilities.PROTECTED && + effectiveVisibility == DescriptorVisibilities.PROTECTED && !containingDeclaration.isFinalClass && containingDeclaration.visibility.isPublicAPI -> mangledAndStable() - effectiveVisibility == Visibilities.INTERNAL -> mangledInternal() + effectiveVisibility == DescriptorVisibilities.INTERNAL -> mangledInternal() // Mangle (but make unstable) all non-public API of public classes containingDeclaration.visibility.isPublicAPI && !containingDeclaration.isFinalClass -> mangledPrivate() @@ -383,4 +383,4 @@ fun Char.isES5IdentifierPart() = fun String.isValidES5Identifier() = isNotEmpty() && first().isES5IdentifierStart() && - drop(1).all { it.isES5IdentifierPart() } \ No newline at end of file + drop(1).all { it.isES5IdentifierPart() } 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 fe333e7cbc8..fa85d32bb04 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 @@ -216,7 +216,7 @@ object JsExternalChecker : DeclarationChecker { private fun isPrivateMemberOfExternalClass(descriptor: DeclarationDescriptor): Boolean { if (descriptor is PropertyAccessorDescriptor && descriptor.visibility == descriptor.correspondingProperty.visibility) return false - if (descriptor !is MemberDescriptor || descriptor.visibility != Visibilities.PRIVATE) return false + if (descriptor !is MemberDescriptor || descriptor.visibility != DescriptorVisibilities.PRIVATE) return false val containingDeclaration = descriptor.containingDeclaration as? ClassDescriptor ?: return false return AnnotationsUtils.isNativeObject(containingDeclaration) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt index ab6704ca204..79d5aba3418 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.resolve import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.js.PredefinedAnnotation import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs @@ -44,7 +44,7 @@ internal abstract class AbstractNativeAnnotationsChecker(private val requiredAnn return } - val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.visibility != Visibilities.LOCAL + val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.visibility != DescriptorVisibilities.LOCAL val isExtension = DescriptorUtils.isExtension(descriptor) if (isMember && (isExtension || !AnnotationsUtils.isNativeObject(descriptor)) || diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java index dc9fb5df71e..06799818754 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java @@ -119,7 +119,7 @@ public final class AnnotationsUtils { public static boolean isExportedObject(@NotNull DeclarationDescriptor descriptor, @NotNull BindingContext bindingContext) { if (descriptor instanceof MemberDescriptor) { MemberDescriptor memberDescriptor = (MemberDescriptor) descriptor; - if (memberDescriptor.getVisibility() != Visibilities.PUBLIC) return false; + if (memberDescriptor.getVisibility() != DescriptorVisibilities.PUBLIC) return false; } if (hasAnnotationOrInsideAnnotatedClass(descriptor, JS_EXPORT)) return true; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt index 0e7ab25d584..821e01e02cf 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt @@ -54,7 +54,7 @@ class UsageTracker( if (descriptor is FakeCallableDescriptorForObject) return // local named function - if (descriptor is FunctionDescriptor && descriptor.visibility == Visibilities.LOCAL) { + if (descriptor is FunctionDescriptor && descriptor.visibility == DescriptorVisibilities.LOCAL) { captureIfNeed(descriptor) } // local variable diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassModelGenerator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassModelGenerator.kt index a32edddf2f5..aeaeea20ebe 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassModelGenerator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassModelGenerator.kt @@ -108,7 +108,7 @@ class ClassModelGenerator(val context: TranslationContext) { private fun copySimpleMember(descriptor: ClassDescriptor, member: CallableMemberDescriptor, model: JsClassModel) { // Special case: fake descriptor denotes (possible multiple) private members from different super interfaces - if (member.visibility == Visibilities.INVISIBLE_FAKE) return copyInvisibleFakeMember(descriptor, member, model) + if (member.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return copyInvisibleFakeMember(descriptor, member, model) val memberToCopy = findMemberToCopy(member) ?: return val classToCopyFrom = memberToCopy.containingDeclaration as ClassDescriptor @@ -260,7 +260,7 @@ class ClassModelGenerator(val context: TranslationContext) { val fromDescriptor = bridge.from val toDescriptor = bridge.to - if (toDescriptor.visibility == Visibilities.INVISIBLE_FAKE) return + if (toDescriptor.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return val sourceName = context.getNameForDescriptor(fromDescriptor).ident val targetName = context.getNameForDescriptor(toDescriptor).ident diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt index e730bdf95d4..934e0fd4f6b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt @@ -258,6 +258,6 @@ private fun HasName.getStaticRef(): JsNode? { private fun isLocalInlineDeclaration(descriptor: CallableDescriptor): Boolean { return descriptor is FunctionDescriptor - && descriptor.getVisibility() == Visibilities.LOCAL + && descriptor.getVisibility() == DescriptorVisibilities.LOCAL && InlineUtil.isInline(descriptor) } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index 9477ae26c82..a04f37f8308 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt @@ -223,7 +223,7 @@ object CallableReferenceTranslator { private fun isSetterVisible(descriptor: PropertyDescriptor, context: TranslationContext): Boolean { val setter = descriptor.setter ?: return false - if (setter.visibility != Visibilities.PRIVATE) return true + if (setter.visibility != DescriptorVisibilities.PRIVATE) return true val classDescriptor = context.classDescriptor ?: return false val outerClasses = generateSequence(classDescriptor) { it.containingDeclaration } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/signatureUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/signatureUtils.kt index 323f7570737..37466627698 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/signatureUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/signatureUtils.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module // it's hard to do it unintentionally. fun generateSignature(descriptor: DeclarationDescriptor): String? { if (DescriptorUtils.isDescriptorWithLocalVisibility(descriptor)) return null - if (descriptor is DeclarationDescriptorWithVisibility && descriptor.visibility == Visibilities.PRIVATE && + if (descriptor is DeclarationDescriptorWithVisibility && descriptor.visibility == DescriptorVisibilities.PRIVATE && !AnnotationsUtils.isNativeObject(descriptor) && !AnnotationsUtils.isLibraryObject(descriptor) ) { return null diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt index 2a38f3e82f0..9d7da19ed4c 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt @@ -23,23 +23,23 @@ import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner class CommonizedClassDescriptor( - targetComponents: TargetDeclarationsBuilderComponents, - containingDeclaration: DeclarationDescriptor, - override val annotations: Annotations, - name: Name, - private val kind: ClassKind, - private val modality: Modality, - private val visibility: Visibility, - private val isCompanion: Boolean, - private val isData: Boolean, - private val isInline: Boolean, - private val isInner: Boolean, - isExternal: Boolean, - private val isExpect: Boolean, - private val isActual: Boolean, - cirDeclaredTypeParameters: List, - companionObjectName: Name?, - cirSupertypes: Collection + targetComponents: TargetDeclarationsBuilderComponents, + containingDeclaration: DeclarationDescriptor, + override val annotations: Annotations, + name: Name, + private val kind: ClassKind, + private val modality: Modality, + private val visibility: DescriptorVisibility, + private val isCompanion: Boolean, + private val isData: Boolean, + private val isInline: Boolean, + private val isInner: Boolean, + isExternal: Boolean, + private val isExpect: Boolean, + private val isActual: Boolean, + cirDeclaredTypeParameters: List, + companionObjectName: Name?, + cirSupertypes: Collection ) : ClassDescriptorBase(targetComponents.storageManager, containingDeclaration, name, SourceElement.NO_SOURCE, isExternal) { private lateinit var _unsubstitutedMemberScope: CommonizedMemberScope private lateinit var constructors: Collection diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt index 31d0dd51080..f667a93faab 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt @@ -17,12 +17,12 @@ import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.asSimpleType class CommonizedTypeAliasDescriptor( - override val storageManager: StorageManager, - containingDeclaration: DeclarationDescriptor, - annotations: Annotations, - name: Name, - visibility: Visibility, - private val isActual: Boolean + override val storageManager: StorageManager, + containingDeclaration: DeclarationDescriptor, + annotations: Annotations, + name: Name, + visibility: DescriptorVisibility, + private val isActual: Boolean ) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, SourceElement.NO_SOURCE, visibility) { private lateinit var underlyingTypeImpl: NotNullLazyValue diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt index 3e0190b3f6b..b8eef7eb2b6 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt @@ -36,7 +36,7 @@ interface CirHasFqName { } interface CirHasVisibility { - val visibility: Visibility + val visibility: DescriptorVisibility } interface CirHasModality { diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt index 629052e3551..24eee73dbe8 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities interface CirFunctionOrProperty : CirDeclaration, @@ -27,7 +27,7 @@ interface CirFunctionOrProperty : modality != Modality.ABSTRACT && containingClassDetails?.kind == ClassKind.INTERFACE fun isVirtual(): Boolean = - visibility != Visibilities.PRIVATE + visibility != DescriptorVisibilities.PRIVATE && modality != Modality.FINAL && !(containingClassDetails?.modality == Modality.FINAL && containingClassDetails?.kind != ClassKind.ENUM_CLASS) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt index 648a7d772af..307c450059b 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassConstructorImpl @@ -28,14 +28,14 @@ object CirClassConstructorFactory { @Suppress("NOTHING_TO_INLINE") inline fun create( - annotations: List, - typeParameters: List, - visibility: Visibility, - containingClassDetails: CirContainingClassDetails, - valueParameters: List, - hasStableParameterNames: Boolean, - isPrimary: Boolean, - kind: CallableMemberDescriptor.Kind + annotations: List, + typeParameters: List, + visibility: DescriptorVisibility, + containingClassDetails: CirContainingClassDetails, + valueParameters: List, + hasStableParameterNames: Boolean, + isPrimary: Boolean, + kind: CallableMemberDescriptor.Kind ): CirClassConstructor { return CirClassConstructorImpl( annotations = annotations, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt index ac37c79ed86..92459040e7c 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassFactory.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType @@ -36,19 +36,19 @@ object CirClassFactory { @Suppress("NOTHING_TO_INLINE") inline fun create( - annotations: List, - name: Name, - typeParameters: List, - visibility: Visibility, - modality: Modality, - kind: ClassKind, - companion: Name?, - isCompanion: Boolean, - isData: Boolean, - isInline: Boolean, - isInner: Boolean, - isExternal: Boolean, - supertypes: MutableCollection + annotations: List, + name: Name, + typeParameters: List, + visibility: DescriptorVisibility, + modality: Modality, + kind: ClassKind, + companion: Name?, + isCompanion: Boolean, + isData: Boolean, + isInline: Boolean, + isInner: Boolean, + isExternal: Boolean, + supertypes: MutableCollection ): CirClass { return CirClassImpl( annotations = annotations, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt index 38306cc35ac..5f349d4124c 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt @@ -29,18 +29,18 @@ object CirFunctionFactory { @Suppress("NOTHING_TO_INLINE") inline fun create( - annotations: List, - name: Name, - typeParameters: List, - visibility: Visibility, - modality: Modality, - containingClassDetails: CirContainingClassDetails?, - valueParameters: List, - hasStableParameterNames: Boolean, - extensionReceiver: CirExtensionReceiver?, - returnType: CirType, - kind: CallableMemberDescriptor.Kind, - modifiers: CirFunctionModifiers + annotations: List, + name: Name, + typeParameters: List, + visibility: DescriptorVisibility, + modality: Modality, + containingClassDetails: CirContainingClassDetails?, + valueParameters: List, + hasStableParameterNames: Boolean, + extensionReceiver: CirExtensionReceiver?, + returnType: CirType, + kind: CallableMemberDescriptor.Kind, + modifiers: CirFunctionModifiers ): CirFunction { return CirFunctionImpl( annotations = annotations, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt index dcbc434bf39..a871ea56abb 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPropertyImpl import org.jetbrains.kotlin.descriptors.commonizer.utils.checkConstantSupportedInCommonization @@ -52,25 +52,25 @@ object CirPropertyFactory { @Suppress("NOTHING_TO_INLINE") inline fun create( - annotations: List, - name: Name, - typeParameters: List, - visibility: Visibility, - modality: Modality, - containingClassDetails: CirContainingClassDetails?, - isExternal: Boolean, - extensionReceiver: CirExtensionReceiver?, - returnType: CirType, - kind: CallableMemberDescriptor.Kind, - isVar: Boolean, - isLateInit: Boolean, - isConst: Boolean, - isDelegate: Boolean, - getter: CirPropertyGetter?, - setter: CirPropertySetter?, - backingFieldAnnotations: List?, - delegateFieldAnnotations: List?, - compileTimeInitializer: ConstantValue<*>? + annotations: List, + name: Name, + typeParameters: List, + visibility: DescriptorVisibility, + modality: Modality, + containingClassDetails: CirContainingClassDetails?, + isExternal: Boolean, + extensionReceiver: CirExtensionReceiver?, + returnType: CirType, + kind: CallableMemberDescriptor.Kind, + isVar: Boolean, + isLateInit: Boolean, + isConst: Boolean, + isDelegate: Boolean, + getter: CirPropertyGetter?, + setter: CirPropertySetter?, + backingFieldAnnotations: List?, + delegateFieldAnnotations: List?, + compileTimeInitializer: ConstantValue<*>? ): CirProperty { return CirPropertyImpl( annotations = annotations, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt index 574d905a42f..fad47cc88ac 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertySetterFactory.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertySetter import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPropertySetterImpl @@ -26,12 +26,12 @@ object CirPropertySetterFactory { ) fun create( - annotations: List, - parameterAnnotations: List, - visibility: Visibility, - isDefault: Boolean, - isExternal: Boolean, - isInline: Boolean + annotations: List, + parameterAnnotations: List, + visibility: DescriptorVisibility, + isDefault: Boolean, + isExternal: Boolean, + isInline: Boolean ): CirPropertySetter { return interner.intern( CirPropertySetterImpl( @@ -46,11 +46,11 @@ object CirPropertySetterFactory { } @Suppress("NOTHING_TO_INLINE") - inline fun createDefaultNoAnnotations(visibility: Visibility): CirPropertySetter = create( + inline fun createDefaultNoAnnotations(visibility: DescriptorVisibility): CirPropertySetter = create( annotations = emptyList(), parameterAnnotations = emptyList(), visibility = visibility, - isDefault = visibility == Visibilities.PUBLIC, + isDefault = visibility == DescriptorVisibilities.PUBLIC, isExternal = false, isInline = false ) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt index cadbbe43ac9..8926083b578 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeAliasFactory.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeAlias @@ -27,12 +27,12 @@ object CirTypeAliasFactory { @Suppress("NOTHING_TO_INLINE") inline fun create( - annotations: List, - name: Name, - typeParameters: List, - visibility: Visibility, - underlyingType: CirSimpleType, - expandedType: CirSimpleType + annotations: List, + name: Name, + typeParameters: List, + visibility: DescriptorVisibility, + underlyingType: CirSimpleType, + expandedType: CirSimpleType ): CirTypeAlias { return CirTypeAliasImpl( annotations = annotations, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt index 337254b6a41..685e31d1f7e 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.factory import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirSimpleTypeImpl import org.jetbrains.kotlin.descriptors.commonizer.utils.Interner @@ -32,7 +32,7 @@ object CirTypeFactory { return create( classifierId = CirClassifierIdFactory.create(classifierDescriptor), - visibility = (classifierDescriptor as? ClassifierDescriptorWithTypeParameters)?.visibility ?: Visibilities.UNKNOWN, + visibility = (classifierDescriptor as? ClassifierDescriptorWithTypeParameters)?.visibility ?: DescriptorVisibilities.UNKNOWN, arguments = source.arguments.map { projection -> CirTypeProjection( projectionKind = projection.projectionKind, @@ -45,10 +45,10 @@ object CirTypeFactory { } fun create( - classifierId: CirClassifierId, - visibility: Visibility, - arguments: List, - isMarkedNullable: Boolean + classifierId: CirClassifierId, + visibility: DescriptorVisibility, + arguments: List, + isMarkedNullable: Boolean ): CirSimpleType { return interner.intern( CirSimpleTypeImpl( diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt index 73f1a5051f6..26df3f4c428 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt @@ -6,16 +6,16 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* data class CirClassConstructorImpl( - override val annotations: List, - override val typeParameters: List, - override val visibility: Visibility, - override val containingClassDetails: CirContainingClassDetails, - override var valueParameters: List, - override var hasStableParameterNames: Boolean, - override val isPrimary: Boolean, - override val kind: CallableMemberDescriptor.Kind + override val annotations: List, + override val typeParameters: List, + override val visibility: DescriptorVisibility, + override val containingClassDetails: CirContainingClassDetails, + override var valueParameters: List, + override var hasStableParameterNames: Boolean, + override val isPrimary: Boolean, + override val kind: CallableMemberDescriptor.Kind ) : CirClassConstructor diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt index e49be905535..1b9fd9437cf 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClass import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType @@ -15,17 +15,17 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter import org.jetbrains.kotlin.name.Name data class CirClassImpl( - override val annotations: List, - override val name: Name, - override val typeParameters: List, - override val visibility: Visibility, - override val modality: Modality, - override val kind: ClassKind, - override var companion: Name?, - override val isCompanion: Boolean, - override val isData: Boolean, - override val isInline: Boolean, - override val isInner: Boolean, - override val isExternal: Boolean, - override val supertypes: MutableCollection + override val annotations: List, + override val name: Name, + override val typeParameters: List, + override val visibility: DescriptorVisibility, + override val modality: Modality, + override val kind: ClassKind, + override var companion: Name?, + override val isCompanion: Boolean, + override val isData: Boolean, + override val isInline: Boolean, + override val isInner: Boolean, + override val isExternal: Boolean, + override val supertypes: MutableCollection ) : CirClass diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt index c299920f6c9..ba6cb37a489 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt @@ -7,21 +7,21 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.name.Name data class CirFunctionImpl( - override val annotations: List, - override val name: Name, - override val typeParameters: List, - override val visibility: Visibility, - override val modality: Modality, - override val containingClassDetails: CirContainingClassDetails?, - override var valueParameters: List, - override var hasStableParameterNames: Boolean, - override val extensionReceiver: CirExtensionReceiver?, - override val returnType: CirType, - override val kind: CallableMemberDescriptor.Kind, - override val modifiers: CirFunctionModifiers + override val annotations: List, + override val name: Name, + override val typeParameters: List, + override val visibility: DescriptorVisibility, + override val modality: Modality, + override val containingClassDetails: CirContainingClassDetails?, + override var valueParameters: List, + override var hasStableParameterNames: Boolean, + override val extensionReceiver: CirExtensionReceiver?, + override val returnType: CirType, + override val kind: CallableMemberDescriptor.Kind, + override val modifiers: CirFunctionModifiers ) : CirFunction diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt index c67f5108cdd..d4ba5f9b61d 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt @@ -7,31 +7,31 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.constants.ConstantValue data class CirPropertyImpl( - override val annotations: List, - override val name: Name, - override val typeParameters: List, - override val visibility: Visibility, - override val modality: Modality, - override val containingClassDetails: CirContainingClassDetails?, - override val isExternal: Boolean, - override val extensionReceiver: CirExtensionReceiver?, - override val returnType: CirType, - override val kind: CallableMemberDescriptor.Kind, - override val isVar: Boolean, - override val isLateInit: Boolean, - override var isConst: Boolean, - override val isDelegate: Boolean, - override val getter: CirPropertyGetter?, - override val setter: CirPropertySetter?, - override val backingFieldAnnotations: List?, - override val delegateFieldAnnotations: List?, - override val compileTimeInitializer: ConstantValue<*>? + override val annotations: List, + override val name: Name, + override val typeParameters: List, + override val visibility: DescriptorVisibility, + override val modality: Modality, + override val containingClassDetails: CirContainingClassDetails?, + override val isExternal: Boolean, + override val extensionReceiver: CirExtensionReceiver?, + override val returnType: CirType, + override val kind: CallableMemberDescriptor.Kind, + override val isVar: Boolean, + override val isLateInit: Boolean, + override var isConst: Boolean, + override val isDelegate: Boolean, + override val getter: CirPropertyGetter?, + override val setter: CirPropertySetter?, + override val backingFieldAnnotations: List?, + override val delegateFieldAnnotations: List?, + override val compileTimeInitializer: ConstantValue<*>? ) : CirProperty { // const property in "common" fragment is already lifted up override val isLiftedUp get() = isConst diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt index 6feb94c2b27..df7d7320ef9 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertySetterImpl.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertySetter data class CirPropertySetterImpl( - override val annotations: List, - override val parameterAnnotations: List, - override val visibility: Visibility, - override val isDefault: Boolean, - override val isExternal: Boolean, - override val isInline: Boolean + override val annotations: List, + override val parameterAnnotations: List, + override val visibility: DescriptorVisibility, + override val isDefault: Boolean, + override val isExternal: Boolean, + override val isInline: Boolean ) : CirPropertySetter diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt index 57d251c4eca..2392c002d39 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirSimpleTypeImpl.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.* import org.jetbrains.kotlin.descriptors.commonizer.utils.appendHashCode import org.jetbrains.kotlin.descriptors.commonizer.utils.hashCode data class CirSimpleTypeImpl( - override val classifierId: CirClassifierId, - override val visibility: Visibility, // visibility of the classifier descriptor - override val arguments: List, - override val isMarkedNullable: Boolean + override val classifierId: CirClassifierId, + override val visibility: DescriptorVisibility, // visibility of the classifier descriptor + override val arguments: List, + override val isMarkedNullable: Boolean ) : CirSimpleType() { // See also org.jetbrains.kotlin.types.KotlinType.cachedHashCode private var cachedHashCode = 0 diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt index dbe26a2dcb1..bc3ba945615 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirTypeAliasImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir.impl -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleType import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeAlias @@ -13,12 +13,12 @@ import org.jetbrains.kotlin.descriptors.commonizer.cir.CirTypeParameter import org.jetbrains.kotlin.name.Name data class CirTypeAliasImpl( - override val annotations: List, - override val name: Name, - override val typeParameters: List, - override val visibility: Visibility, - override val underlyingType: CirSimpleType, - override val expandedType: CirSimpleType // only for commonization algorithm; does not participate in building resulting declarations + override val annotations: List, + override val name: Name, + override val typeParameters: List, + override val visibility: DescriptorVisibility, + override val underlyingType: CirSimpleType, + override val expandedType: CirSimpleType // only for commonization algorithm; does not participate in building resulting declarations ) : CirTypeAlias { // any TA in "common" fragment is already lifted up override val isLiftedUp get() = true diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt index 73796f84813..6811e38b8cf 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.core -import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.commonizer.cir.CirAnnotation import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifierId import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirAnnotationFactory @@ -162,7 +162,7 @@ private class DeprecatedAnnotationCommonizer : Commonizer( +class PropertySetterCommonizer : AbstractNullableCommonizer( wrappedCommonizerFactory = { VisibilityCommonizer.equalizing() }, extractor = { it }, builder = CirPropertySetterFactory::createDefaultNoAnnotations diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt index 4a68c1b1f29..2e60fbe8977 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt @@ -5,40 +5,40 @@ package org.jetbrains.kotlin.descriptors.commonizer.core -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirFunctionOrProperty import org.jetbrains.kotlin.descriptors.commonizer.cir.CirHasVisibility -abstract class VisibilityCommonizer : Commonizer { +abstract class VisibilityCommonizer : Commonizer { companion object { fun lowering(): VisibilityCommonizer = LoweringVisibilityCommonizer() fun equalizing(): VisibilityCommonizer = EqualizingVisibilityCommonizer() } - private var temp: Visibility? = null + private var temp: DescriptorVisibility? = null - override val result: Visibility - get() = checkState(temp, temp == Visibilities.UNKNOWN) + override val result: DescriptorVisibility + get() = checkState(temp, temp == DescriptorVisibilities.UNKNOWN) override fun commonizeWith(next: CirHasVisibility): Boolean { - if (temp == Visibilities.UNKNOWN) + if (temp == DescriptorVisibilities.UNKNOWN) return false val nextVisibility = next.visibility - if (Visibilities.isPrivate(nextVisibility) || !canBeCommonized(next)) { - temp = Visibilities.UNKNOWN + if (DescriptorVisibilities.isPrivate(nextVisibility) || !canBeCommonized(next)) { + temp = DescriptorVisibilities.UNKNOWN return false } temp = temp?.let { temp -> getNext(temp, nextVisibility) } ?: nextVisibility - return temp != Visibilities.UNKNOWN + return temp != DescriptorVisibilities.UNKNOWN } protected abstract fun canBeCommonized(next: CirHasVisibility): Boolean - protected abstract fun getNext(current: Visibility, next: Visibility): Visibility + protected abstract fun getNext(current: DescriptorVisibility, next: DescriptorVisibility): DescriptorVisibility } /** @@ -56,26 +56,26 @@ private class LoweringVisibilityCommonizer : VisibilityCommonizer() { return !atLeastOneVirtualCallableMet || !atLeastTwoVisibilitiesMet } - override fun getNext(current: Visibility, next: Visibility): Visibility { - val comparisonResult: Int = Visibilities.compare(current, next) - ?: return Visibilities.UNKNOWN // two visibilities that can't be compared against each one, ex: protected vs internal + override fun getNext(current: DescriptorVisibility, next: DescriptorVisibility): DescriptorVisibility { + val comparisonResult: Int = DescriptorVisibilities.compare(current, next) + ?: return DescriptorVisibilities.UNKNOWN // two visibilities that can't be compared against each one, ex: protected vs internal if (!atLeastTwoVisibilitiesMet) atLeastTwoVisibilitiesMet = comparisonResult != 0 if (atLeastOneVirtualCallableMet && atLeastTwoVisibilitiesMet) - return Visibilities.UNKNOWN + return DescriptorVisibilities.UNKNOWN return if (comparisonResult <= 0) current else next } } /** - * Make sure that visibilities of all member descriptors are equal and are not private according to [Visibilities.isPrivate]. + * Make sure that visibilities of all member descriptors are equal and are not private according to [DescriptorVisibilities.isPrivate]. */ private class EqualizingVisibilityCommonizer : VisibilityCommonizer() { override fun canBeCommonized(next: CirHasVisibility) = true - override fun getNext(current: Visibility, next: Visibility) = - if (Visibilities.compare(current, next) == 0) current else Visibilities.UNKNOWN + override fun getNext(current: DescriptorVisibility, next: DescriptorVisibility) = + if (DescriptorVisibilities.compare(current, next) == 0) current else DescriptorVisibilities.UNKNOWN } diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt index 366d221d3d1..f77c1ff83a4 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.descriptors.commonizer.core -import org.jetbrains.kotlin.descriptors.Visibilities.* -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.* +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirHasVisibility import org.junit.Test -class EqualizingVisibilityCommonizerTest : AbstractCommonizerTest() { +class EqualizingVisibilityCommonizerTest : AbstractCommonizerTest() { @Test fun publicOnly() = doTestSuccess( @@ -63,6 +63,6 @@ class EqualizingVisibilityCommonizerTest : AbstractCommonizerTest() { +) : AbstractCommonizerTest() { @Test fun publicOnly() = doTestSuccess( @@ -44,7 +44,7 @@ abstract class LoweringVisibilityCommonizerTest( final override fun createCommonizer() = VisibilityCommonizer.lowering() - protected fun Visibility.toMock() = object : CirFunctionOrProperty { + protected fun DescriptorVisibility.toMock() = object : CirFunctionOrProperty { override val annotations get() = unsupported() override val name get() = unsupported() override val typeParameters get() = unsupported() diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt index df0a27184a9..80acd087886 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.descriptors.commonizer.core -import org.jetbrains.kotlin.descriptors.Visibilities.* -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.* +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPropertySetter import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirPropertySetterFactory import org.junit.Test @@ -87,13 +87,13 @@ class PropertySetterCommonizerTest : AbstractCommonizerTest load(0, thisAsmType) getfield(thisAsmType.internalName, propFieldName, propType.descriptor) @@ -70,7 +70,7 @@ class SerialInfoCodegenImpl(val codegen: ImplementationBodyCodegen, val thisClas } constr.initialize( args, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) constr.returnType = thisClass.defaultType diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt index 8000940d7c9..b22cd0ef5f6 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt @@ -87,7 +87,7 @@ object KSerializerDescriptorResolver { val props = interfaceDecl.primaryConstructorParameters // if there is some properties, there will be a public synthetic constructor at the codegen phase - val primaryCtorVisibility = if (props.isEmpty()) Visibilities.PUBLIC else Visibilities.PRIVATE + val primaryCtorVisibility = if (props.isEmpty()) DescriptorVisibilities.PUBLIC else DescriptorVisibilities.PRIVATE val descriptor = SyntheticClassOrObjectDescriptor( ctx, @@ -97,7 +97,7 @@ object KSerializerDescriptorResolver { interfaceDesc.source, scope, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, Annotations.create(listOf(createDeprecatedHiddenAnnotation(interfaceDesc.module))), primaryCtorVisibility, ClassKind.CLASS, @@ -121,9 +121,9 @@ object KSerializerDescriptorResolver { thisDeclaration, thisDescriptor, SERIALIZER_CLASS_NAME, thisDescriptor.source, scope, - Modality.FINAL, Visibilities.PUBLIC, + Modality.FINAL, DescriptorVisibilities.PUBLIC, Annotations.create(listOf(createDeprecatedHiddenAnnotation(thisDescriptor.module))), - Visibilities.PRIVATE, + DescriptorVisibilities.PRIVATE, serializerKind, false ) val typeParameters: List = @@ -234,7 +234,7 @@ object KSerializerDescriptorResolver { .getContributedVariables(name, NoLookupLocation.FROM_BUILTINS).single() val propertyDescriptor = PropertyDescriptorImpl.create( - companionDescriptor, Annotations.EMPTY, Modality.OPEN, Visibilities.PUBLIC, false, name, + companionDescriptor, Annotations.EMPTY, Modality.OPEN, DescriptorVisibilities.PUBLIC, false, name, CallableMemberDescriptor.Kind.SYNTHESIZED, companionDescriptor.source, false, false, false, false, false, false ) @@ -247,7 +247,7 @@ object KSerializerDescriptorResolver { ) val propertyGetter = PropertyGetterDescriptorImpl( - propertyDescriptor, Annotations.EMPTY, Modality.OPEN, Visibilities.PUBLIC, false, false, false, + propertyDescriptor, Annotations.EMPTY, Modality.OPEN, DescriptorVisibilities.PUBLIC, false, false, false, CallableMemberDescriptor.Kind.SYNTHESIZED, null, companionDescriptor.source ) @@ -280,7 +280,7 @@ object KSerializerDescriptorResolver { functionFromSerializer.valueParameters.map { it.copy(functionDescriptor, it.name, it.index) }, functionFromSerializer.returnType, Modality.OPEN, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return functionDescriptor @@ -332,7 +332,7 @@ object KSerializerDescriptorResolver { functionDescriptor.initialize( consParams, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) functionDescriptor.returnType = classDescriptor.defaultType @@ -365,7 +365,7 @@ object KSerializerDescriptorResolver { ) } - constrDesc.initialize(args, Visibilities.PUBLIC, typeParameters) + constrDesc.initialize(args, DescriptorVisibilities.PUBLIC, typeParameters) constrDesc.returnType = classDescriptor.defaultType return constrDesc } @@ -456,7 +456,7 @@ object KSerializerDescriptorResolver { listOf(vararg), kSerializerStarType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return f } @@ -481,7 +481,7 @@ object KSerializerDescriptorResolver { val serialReturnType = KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, serializerClass, listOf(TypeProjectionImpl(newSerializableType))) - f.initialize(null, thisClass.thisAsReceiverParameter, typeArgs, args, serialReturnType, Modality.FINAL, Visibilities.PUBLIC) + f.initialize(null, thisClass.thisAsReceiverParameter, typeArgs, args, serialReturnType, Modality.FINAL, DescriptorVisibilities.PUBLIC) return f } @@ -575,7 +575,7 @@ object KSerializerDescriptorResolver { args, returnType, Modality.FINAL, - Visibilities.PUBLIC + DescriptorVisibilities.PUBLIC ) return f @@ -591,7 +591,7 @@ object KSerializerDescriptorResolver { fromSupertypes[0].copy( thisDescriptor, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, CallableMemberDescriptor.Kind.SYNTHESIZED, true ) as PropertyDescriptor diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperties.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperties.kt index 494097a32b8..650ee90f156 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperties.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperties.kt @@ -39,7 +39,7 @@ class SerializableProperties(private val serializableClass: ClassDescriptor, val fun isPropSerializable(it: PropertyDescriptor) = if (serializableClass.isInternalSerializable) !it.annotations.serialTransient - else !Visibilities.isPrivate(it.visibility) && ((it.isVar && !it.annotations.serialTransient) || primaryConstructorProperties.contains( + else !DescriptorVisibilities.isPrivate(it.visibility) && ((it.isVar && !it.annotations.serialTransient) || primaryConstructorProperties.contains( it )) @@ -100,4 +100,4 @@ private fun unsort(descriptor: ClassDescriptor, props: List