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