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

LightClassApplicabilityCheckExtensions refactoring and IdeSerializationPluginApplicabilityExtension fix

Browse Source
This commit is contained in:
Igor Yakovlev
2019-09-11 17:05:13 +03:00
parent 2b7dee6f8d
commit cfcecaaeab
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/parcel/IDEParcelableApplicabilityExtension.kt
+7 -4
View File
@@ -10,18 +10,21 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType import org.jetbrains.kotlin.extensions.LightClassApplicabilityType
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.LightClass
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.UltraLightClass
class IDEParcelableApplicabilityExtension : LightClassApplicabilityCheckExtension { class IDEParcelableApplicabilityExtension : LightClassApplicabilityCheckExtension {
override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType { override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType {
if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return LightClassApplicabilityType.UltraLightClass if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return UltraLightClass
val descriptorValue = descriptor.value ?: return LightClassApplicabilityType.UltraLightClass val descriptorValue = descriptor.value ?: return UltraLightClass
val classDescriptor = (descriptorValue as? ClassDescriptor) val classDescriptor = (descriptorValue as? ClassDescriptor)
?: descriptorValue.containingDeclaration as? ClassDescriptor ?: descriptorValue.containingDeclaration as? ClassDescriptor
?: return LightClassApplicabilityType.UltraLightClass ?: return UltraLightClass
return if (classDescriptor.isParcelize) LightClassApplicabilityType.LightClass else LightClassApplicabilityType.UltraLightClass return if (classDescriptor.isParcelize) LightClass else UltraLightClass
} }
} }
plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedLightClassApplicabilityExtension.kt
+7 -5
View File
@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType import org.jetbrains.kotlin.extensions.LightClassApplicabilityType
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.kotlin.psi.KtModifierListOwner
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.LightClass
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.UltraLightClass
abstract class AnnotationBasedLightClassApplicabilityExtension(project: Project, annotationOptionPrefix: String) : abstract class AnnotationBasedLightClassApplicabilityExtension(project: Project, annotationOptionPrefix: String) :
LightClassApplicabilityCheckExtension, LightClassApplicabilityCheckExtension,
@@ -24,18 +26,18 @@ abstract class AnnotationBasedLightClassApplicabilityExtension(project: Project,
cachedAnnotationsNames.getAnnotationNames(modifierListOwner) cachedAnnotationsNames.getAnnotationNames(modifierListOwner)
override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType { override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType {
if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return LightClassApplicabilityType.UltraLightClass if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return UltraLightClass
if (cachedAnnotationsNames.getAnnotationNames(declaration).isEmpty()) return LightClassApplicabilityType.UltraLightClass if (cachedAnnotationsNames.getAnnotationNames(declaration).isEmpty()) return UltraLightClass
val descriptorValue = descriptor.value ?: return LightClassApplicabilityType.UltraLightClass val descriptorValue = descriptor.value ?: return UltraLightClass
val classDescriptor = (descriptorValue as? ClassDescriptor) val classDescriptor = (descriptorValue as? ClassDescriptor)
?: descriptorValue.containingDeclaration as? ClassDescriptor ?: descriptorValue.containingDeclaration as? ClassDescriptor
?: return LightClassApplicabilityType.UltraLightClass ?: return UltraLightClass
val hasSpecialAnnotation = run { classDescriptor.hasSpecialAnnotation(declaration) } val hasSpecialAnnotation = run { classDescriptor.hasSpecialAnnotation(declaration) }
return if (hasSpecialAnnotation) LightClassApplicabilityType.LightClass else LightClassApplicabilityType.UltraLightClass return if (hasSpecialAnnotation) LightClass else UltraLightClass
} }
} }
plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/IdeSerializationPluginApplicabilityExtension.kt
+9 -3
View File
@@ -12,14 +12,20 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType import org.jetbrains.kotlin.extensions.LightClassApplicabilityType
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlinx.serialization.compiler.resolve.SerializationAnnotations.serializableAnnotationFqName
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.LightClass
import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.UltraLightClass
class IdeSerializationPluginApplicabilityExtension : LightClassApplicabilityCheckExtension { class IdeSerializationPluginApplicabilityExtension : LightClassApplicabilityCheckExtension {
override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType { override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType {
if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return LightClassApplicabilityType.UltraLightClass if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return UltraLightClass
return (descriptor.value as? ClassDescriptor)?.let { return (descriptor.value as? ClassDescriptor)?.let {
getIfEnabledOn(it) { LightClassApplicabilityType.LightClass } getIfEnabledOn(it) {
} ?: LightClassApplicabilityType.UltraLightClass if (it.annotations.hasAnnotation(serializableAnnotationFqName)) LightClass
else UltraLightClass
}
} ?: UltraLightClass
} }
} }