Skip to content

Fix check for lint 30.4.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stkent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix check for lint 30.4.0 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions .../java/com/stylingandroid/readresolve/lint/SerializableObjectMissingReadResolveDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ import com.android.tools.lint.detector.api.Severity
import com.intellij.psi.PsiElement
import java.io.Serializable
import java.util.EnumSet
import org.jetbrains.kotlin.psi.KtClassBody
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.psi.KtObjectDeclaration
import org.jetbrains.kotlin.psi.psiUtil.allChildren
import org.jetbrains.uast.UClass
import org.jetbrains.uast.UElement
import org.jetbrains.uast.kotlin.KotlinUClass
import org.jetbrains.uast.kotlin.declarations.KotlinUMethod
import org.jetbrains.uast.kotlin.KotlinUMethod


@Suppress("UnstableApiUsage")
internal class SerializableObjectMissingReadResolveDetector : Detector(), Detector.UastScanner {
Expand Down Expand Up @@ -63,18 +67,19 @@ internal class SerializableObjectMissingReadResolveDetector : Detector(), Detect
object : UElementHandler() {

override fun visitClass(node: UClass) {
val sourcePsi = node.sourcePsi

if (
node is KotlinUClass &&
node.ktClass is KtObjectDeclaration &&
sourcePsi is KtObjectDeclaration &&
isSerializable(node)
) {
if (node.doesNotHaveReadResolveMethod()) {
if (sourcePsi.doesNotHaveReadResolveMethod()) {
context.report(
MISSING_READ_RESOLVE_ISSUE,
node,
context.getLocation(node as PsiElement),
MISSING_READ_RESOLVE_ISSUE_EXPLANATION,
node.createMissingReadResolveLintFix()
sourcePsi.createMissingReadResolveLintFix()
)
} else {
node.methods
Expand Down Expand Up @@ -105,14 +110,20 @@ internal class SerializableObjectMissingReadResolveDetector : Detector(), Detect
false
)

fun KotlinUClass.doesNotHaveReadResolveMethod(): Boolean =
allMethods.none { it.name == "readResolve" }
fun KtObjectDeclaration.doesNotHaveReadResolveMethod(): Boolean {
return allChildren
.find { it is KtClassBody }
?.children
?.filterIsInstance<KtNamedFunction>()
?.none { it.name == "readResolve" }
?: true
}

fun KotlinUMethod.hasCorrectReadResolveSignature(): Boolean =
returnType?.canonicalText == JAVA_OBJECT && parameters.isEmpty()

fun KotlinUClass.createMissingReadResolveLintFix(): LintFix {
val objectSource = sourceElement.text
fun KtObjectDeclaration.createMissingReadResolveLintFix(): LintFix {
val objectSource = text
val hasClassBody = objectSource.trimEnd().endsWith("}")
return if (hasClassBody) {
LintFix.create()
Expand Down