Merge "Use CallableItem in place of MethodItem" into main

This commit is contained in:
Treehugger Robot
2024-07-16 14:05:50 +00:00
committed by Gerrit Code Review

View File

@@ -19,10 +19,10 @@ package com.android.checkflaggedapis
import android.aconfig.Aconfig import android.aconfig.Aconfig
import com.android.tools.metalava.model.BaseItemVisitor import com.android.tools.metalava.model.BaseItemVisitor
import com.android.tools.metalava.model.CallableItem
import com.android.tools.metalava.model.ClassItem import com.android.tools.metalava.model.ClassItem
import com.android.tools.metalava.model.FieldItem import com.android.tools.metalava.model.FieldItem
import com.android.tools.metalava.model.Item import com.android.tools.metalava.model.Item
import com.android.tools.metalava.model.MethodItem
import com.android.tools.metalava.model.text.ApiFile import com.android.tools.metalava.model.text.ApiFile
import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.core.ProgramResult import com.github.ajalt.clikt.core.ProgramResult
@@ -274,15 +274,15 @@ internal fun parseApiSignature(path: String, input: InputStream): Set<Pair<Symbo
} }
} }
override fun visitMethod(method: MethodItem) { override fun visitCallable(callable: CallableItem) {
getFlagOrNull(method)?.let { flag -> getFlagOrNull(callable)?.let { flag ->
val methodName = buildString { val callableSignature = buildString {
append(method.name()) append(callable.name())
append("(") append("(")
method.parameters().joinTo(this, separator = "") { it.type().internalName() } callable.parameters().joinTo(this, separator = "") { it.type().internalName() }
append(")") append(")")
} }
val symbol = Symbol.createMethod(method.containingClass().qualifiedName(), methodName) val symbol = Symbol.createMethod(callable.containingClass().qualifiedName(), callableSignature)
output.add(Pair(symbol, flag)) output.add(Pair(symbol, flag))
} }
} }