Parcelize: Activate checkers only when the plugin is enabled for module (KT-43291)
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<irGenerationExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeIrGeneratorExtension"/>
|
<irGenerationExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeIrGeneratorExtension"/>
|
||||||
<syntheticResolveExtension implementation="org.jetbrains.kotlin.parcelize.ide.IdeParcelizeResolveExtension"/>
|
<syntheticResolveExtension implementation="org.jetbrains.kotlin.parcelize.ide.IdeParcelizeResolveExtension"/>
|
||||||
<classBuilderFactoryInterceptorExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeClinitClassBuilderInterceptorExtension"/>
|
<classBuilderFactoryInterceptorExtension implementation="org.jetbrains.kotlin.parcelize.ParcelizeClinitClassBuilderInterceptorExtension"/>
|
||||||
<storageComponentContainerContributor implementation="org.jetbrains.kotlin.parcelize.ParcelizeDeclarationCheckerComponentContainerContributor"/>
|
<storageComponentContainerContributor implementation="org.jetbrains.kotlin.parcelize.ide.IdeParcelizeDeclarationCheckerComponentContainerContributor"/>
|
||||||
|
|
||||||
<ultraLightClassModifierExtension implementation="org.jetbrains.kotlin.parcelize.ide.ParcelizeUltraLightClassModifierExtension"/>
|
<ultraLightClassModifierExtension implementation="org.jetbrains.kotlin.parcelize.ide.ParcelizeUltraLightClassModifierExtension"/>
|
||||||
<quickFixContributor implementation="org.jetbrains.kotlin.parcelize.ide.quickfixes.ParcelizeQuickFixContributor"/>
|
<quickFixContributor implementation="org.jetbrains.kotlin.parcelize.ide.quickfixes.ParcelizeQuickFixContributor"/>
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
|
|||||||
import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
|
import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
|
||||||
import org.jetbrains.kotlin.types.typeUtil.supertypes
|
import org.jetbrains.kotlin.types.typeUtil.supertypes
|
||||||
|
|
||||||
class ParcelizeAnnotationChecker : CallChecker {
|
open class ParcelizeAnnotationChecker : CallChecker {
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
companion object {
|
companion object {
|
||||||
val DEPRECATED_RUNTIME_PACKAGE = FqName("kotlinx.android.parcel")
|
val DEPRECATED_RUNTIME_PACKAGE = FqName("kotlinx.android.parcel")
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ val ANDROID_PARCELABLE_CLASS_FQNAME = FqName("android.os.Parcelable")
|
|||||||
val ANDROID_PARCELABLE_CREATOR_CLASS_FQNAME = FqName("android.os.Parcelable.Creator")
|
val ANDROID_PARCELABLE_CREATOR_CLASS_FQNAME = FqName("android.os.Parcelable.Creator")
|
||||||
val ANDROID_PARCEL_CLASS_FQNAME = FqName("android.os.Parcel")
|
val ANDROID_PARCEL_CLASS_FQNAME = FqName("android.os.Parcel")
|
||||||
|
|
||||||
class ParcelizeDeclarationChecker : DeclarationChecker {
|
open class ParcelizeDeclarationChecker : DeclarationChecker {
|
||||||
private companion object {
|
private companion object {
|
||||||
private val IGNORED_ON_PARCEL_FQ_NAMES = listOf(
|
private val IGNORED_ON_PARCEL_FQ_NAMES = listOf(
|
||||||
FqName(kotlinx.parcelize.IgnoredOnParcel::class.java.canonicalName),
|
FqName(kotlinx.parcelize.IgnoredOnParcel::class.java.canonicalName),
|
||||||
|
|||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.parcelize.ide
|
||||||
|
|
||||||
|
import com.intellij.psi.PsiElement
|
||||||
|
import org.jetbrains.kotlin.parcelize.ParcelizeAnnotationChecker
|
||||||
|
import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
|
||||||
|
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
||||||
|
|
||||||
|
class IdeParcelizeAnnotationChecker : ParcelizeAnnotationChecker() {
|
||||||
|
override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
|
||||||
|
if (!ParcelizeAvailability.isAvailable(resolvedCall.call.callElement)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
super.check(resolvedCall, reportOn, context)
|
||||||
|
}
|
||||||
|
}
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.parcelize.ide
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
|
import org.jetbrains.kotlin.parcelize.ParcelizeDeclarationChecker
|
||||||
|
import org.jetbrains.kotlin.psi.KtDeclaration
|
||||||
|
import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
|
||||||
|
|
||||||
|
class IdeParcelizeDeclarationChecker : ParcelizeDeclarationChecker() {
|
||||||
|
override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) {
|
||||||
|
if (!ParcelizeAvailability.isAvailable(declaration)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
super.check(declaration, descriptor, context)
|
||||||
|
}
|
||||||
|
}
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.parcelize.ide
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.container.StorageComponentContainer
|
||||||
|
import org.jetbrains.kotlin.container.useInstance
|
||||||
|
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||||
|
import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
|
||||||
|
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||||
|
import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||||
|
|
||||||
|
class IdeParcelizeDeclarationCheckerComponentContainerContributor : StorageComponentContainerContributor {
|
||||||
|
override fun registerModuleComponents(
|
||||||
|
container: StorageComponentContainer,
|
||||||
|
platform: TargetPlatform,
|
||||||
|
moduleDescriptor: ModuleDescriptor,
|
||||||
|
) {
|
||||||
|
if (platform.isJvm()) {
|
||||||
|
container.useInstance(IdeParcelizeDeclarationChecker())
|
||||||
|
container.useInstance(IdeParcelizeAnnotationChecker())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user