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

Rename Visibility to DescriptorVisibility

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-01 16:06:06 +03:00
parent 2bcd8ee07f
commit d1fd1da56f
379 changed files with 2240 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt
+2 -2
View File
@@ -71,7 +71,7 @@ open class ParcelableResolveExtension : SyntheticResolveExtension {
functionDescriptor.initialize(
null, classDescriptor.thisAsReceiverParameter, emptyList(), valueParameters,
returnType, modality, Visibilities.PUBLIC)
returnType, modality, DescriptorVisibilities.PUBLIC)
return functionDescriptor
}
@@ -162,4 +162,4 @@ val ClassDescriptor.isParcelize: Boolean
get() = this.annotations.hasAnnotation(PARCELIZE_CLASS_FQNAME)
val KotlinType.isParceler
get() = constructor.declarationDescriptor?.fqNameSafe == PARCELER_FQNAME
get() = constructor.declarationDescriptor?.fqNameSafe == PARCELER_FQNAME
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ir/ParcelableIrTransformer.kt
+2 -2
View File
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
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.IrElement
import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
@@ -203,7 +203,7 @@ class ParcelableIrTransformer(private val context: IrPluginContext, private val
val irField = this
val creatorClass = irFactory.buildClass {
name = Name.identifier("Creator")
visibility = Visibilities.LOCAL
visibility = DescriptorVisibilities.LOCAL
}.apply {
parent = irField
superTypes = listOf(creatorType)
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AbstractAndroidExtensionsExpressionCodegenExtension.kt
+2 -2
View File
@@ -166,7 +166,7 @@ abstract class AbstractAndroidExtensionsExpressionCodegenExtension : ExpressionC
private fun FunctionDescriptor.isOnDestroyFunction(): Boolean {
return kind == CallableMemberDescriptor.Kind.DECLARATION
&& name.asString() == ON_DESTROY_METHOD_NAME
&& (visibility == Visibilities.INHERITED || visibility == Visibilities.PUBLIC)
&& (visibility == DescriptorVisibilities.INHERITED || visibility == DescriptorVisibilities.PUBLIC)
&& (valueParameters.isEmpty())
&& (typeParameters.isEmpty())
}
@@ -292,4 +292,4 @@ abstract class AbstractAndroidExtensionsExpressionCodegenExtension : ExpressionC
FunctionCodegen.endVisit(methodVisitor, CACHED_FIND_VIEW_BY_ID_METHOD_NAME, classOrObject)
}
}
}
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidIrExtension.kt
+1 -1
View File
@@ -93,7 +93,7 @@ private class AndroidIrTransformer(val extension: AndroidIrExtension, val plugin
private fun createField(fqName: FqName, type: IrType) =
cachedFields.getOrPut(fqName) {
createClass(fqName.parent()).addField(fqName.shortName(), type, Visibilities.PUBLIC)
createClass(fqName.parent()).addField(fqName.shortName(), type, DescriptorVisibilities.PUBLIC)
}
override fun visitClassNew(declaration: IrClass): IrStatement {
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt
+4 -4
View File
@@ -49,7 +49,7 @@ internal fun genClearCacheFunction(packageFragmentDescriptor: PackageFragmentDes
val unitType = packageFragmentDescriptor.builtIns.unitType
return function.initialize(
DescriptorFactory.createExtensionReceiverParameterForCallable(function, receiverType, Annotations.EMPTY),
null, emptyList(), emptyList(), unitType, Modality.FINAL, Visibilities.PUBLIC
null, emptyList(), emptyList(), unitType, Modality.FINAL, DescriptorVisibilities.PUBLIC
)
}
@@ -100,7 +100,7 @@ private fun genProperty(
null,
Annotations.EMPTY,
Modality.FINAL,
Visibilities.PUBLIC,
DescriptorVisibilities.PUBLIC,
false,
Name.identifier(resource.id.name),
CallableMemberDescriptor.Kind.SYNTHESIZED,
@@ -130,7 +130,7 @@ private fun genProperty(
property,
Annotations.EMPTY,
Modality.FINAL,
Visibilities.PUBLIC,
DescriptorVisibilities.PUBLIC,
/* isDefault = */ false,
/* isExternal = */ false,
/* isInline = */ false,
@@ -165,4 +165,4 @@ interface AndroidSyntheticProperty {
}
val AndroidSyntheticProperty.isErrorType: Boolean
get() = errorType != null
get() = errorType != null
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AbiClassBuilder.kt
+3 -3
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.jvm.abi.asm
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.codegen.AbstractClassBuilder
import org.jetbrains.kotlin.descriptors.MemberDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.resolve.inline.InlineUtil.isInlineOrContainingInline
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
import org.jetbrains.org.objectweb.asm.ClassVisitor
@@ -78,11 +78,11 @@ internal class AbiClassBuilder(private val cv: ClassVisitor) : AbstractClassBuil
}
private fun isPrivate(descriptor: MemberDescriptor): Boolean =
descriptor.visibility == Visibilities.PRIVATE
descriptor.visibility == DescriptorVisibilities.PRIVATE
private fun isPrivate(access: Int): Boolean =
(access and Opcodes.ACC_PRIVATE) == Opcodes.ACC_PRIVATE
private fun isClinit(name: String, access: Int): Boolean =
name == "<clinit>" && (access and Opcodes.ACC_STATIC) == Opcodes.ACC_STATIC
}
}
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/Synthetics.kt
+2 -2
View File
@@ -16,7 +16,7 @@ class SimpleSyntheticPropertyDescriptor(
name: String,
type: KotlinType,
isVar: Boolean = false,
visibility: Visibility = Visibilities.PRIVATE
visibility: DescriptorVisibility = DescriptorVisibilities.PRIVATE
) : PropertyDescriptorImpl(
owner,
null,
@@ -36,4 +36,4 @@ class SimpleSyntheticPropertyDescriptor(
super.setType(type, emptyList(), owner.thisAsReceiverParameter, null)
super.initialize(null, null, _backingField, null)
}
}
}
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerialInfoCodegenImpl.kt
+2 -2
View File
@@ -47,7 +47,7 @@ class SerialInfoCodegenImpl(val codegen: ImplementationBodyCodegen, val thisClas
codegen.v.newField(OtherOrigin(codegen.myClass.psiOrParent), Opcodes.ACC_PRIVATE or Opcodes.ACC_FINAL or Opcodes.ACC_SYNTHETIC,
propFieldName, propType.descriptor, null, null)
val f = SimpleFunctionDescriptorImpl.create(thisClass, Annotations.EMPTY, prop.name, CallableMemberDescriptor.Kind.SYNTHESIZED, thisClass.source)
f.initialize(null, thisClass.thisAsReceiverParameter, emptyList(), emptyList(), prop.type, Modality.FINAL, Visibilities.PUBLIC)
f.initialize(null, thisClass.thisAsReceiverParameter, emptyList(), emptyList(), prop.type, Modality.FINAL, DescriptorVisibilities.PUBLIC)
codegen.generateMethod(f, { _, _ ->
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
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt
+13 -13
View File
@@ -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<TypeParameterDescriptor> =
@@ -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
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/SerializableProperties.kt
+2 -2
View File
@@ -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<SerializableProperty
.map { descriptor.c.nameResolver.getName(it) }
val propsMap = props.associateBy { it.descriptor.name }
return correctOrder.map { propsMap.getValue(it) }
}
}
plugins/noarg/noarg-cli/src/AbstractNoArgExpressionCodegenExtension.kt
+1 -1
View File
@@ -102,7 +102,7 @@ abstract class AbstractNoArgExpressionCodegenExtension(val invokeInitializers: B
emptyList(),
containingClass.builtIns.unitType,
Modality.OPEN,
Visibilities.PUBLIC
DescriptorVisibilities.PUBLIC
)
}
}
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt
+1 -1
View File
@@ -85,7 +85,7 @@ class LazyScriptClassMemberScope(
SourceElement.NO_SOURCE
).initialize(
emptyList(),
Visibilities.PUBLIC
DescriptorVisibilities.PUBLIC
)
setDeferredReturnType(constructor)
return constructor
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ReplResultPropertyDescriptor.kt
+2 -2
View File
@@ -22,7 +22,7 @@ class ReplResultPropertyDescriptor(
null,
Annotations.EMPTY,
Modality.FINAL,
Visibilities.PUBLIC,
DescriptorVisibilities.PUBLIC,
false,
name,
CallableMemberDescriptor.Kind.SYNTHESIZED,
@@ -36,4 +36,4 @@ class ReplResultPropertyDescriptor(
null, null
)
}
}
}
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class ScriptProvidedPropertiesDescriptor(script: LazyScriptDescriptor) :
init {
modality = Modality.FINAL
visibility = Visibilities.PUBLIC
visibility = DescriptorVisibilities.PUBLIC
setTypeParameterDescriptors(emptyList())
createTypeConstructor()
}
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertyDescriptor.kt
+2 -2
View File
@@ -24,7 +24,7 @@ class ScriptProvidedPropertyDescriptor(
null,
Annotations.EMPTY,
Modality.FINAL,
Visibilities.PRIVATE,
DescriptorVisibilities.PRIVATE,
isVar,
name,
CallableMemberDescriptor.Kind.SYNTHESIZED,
@@ -88,4 +88,4 @@ private fun PropertyDescriptorImpl.makePropertySetterDescriptor() =
SourceElement.NO_SOURCE
)
)
}
}