github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-13 20:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check into lambda expressions for inspections

Browse Source
This commit is contained in:
Him188 2020-09-18 10:37:36 +08:00
parent 6a2ef97b41
commit 9da8ce882e
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tools/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/diagnostics/PluginDescriptionChecker.kt
View File

@ -13,18 +13,17 @@ import com.intellij.psi.PsiElement
import net.mamoe.mirai.console.compiler.common.diagnostics.MiraiConsoleErrors
import net.mamoe.mirai.console.compiler.common.resolve.ResolveContextKind
import net.mamoe.mirai.console.compiler.common.resolve.resolveContextKind
import net.mamoe.mirai.console.intellij.resolve.allChildrenWithSelf
import net.mamoe.mirai.console.intellij.resolve.findChild
import net.mamoe.mirai.console.intellij.resolve.resolveStringConstantValue
import net.mamoe.mirai.console.intellij.resolve.valueParameters
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker
import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
import java.util.*
import kotlin.contracts.contract
/**
* Checks:
@ -69,17 +68,6 @@ class PluginDescriptionChecker : DeclarationChecker {
}
}
fun PsiElement.shouldPerformCheck(): Boolean {
contract {
returns(true) implies (this@shouldPerformCheck is KtCallExpression)
}
return when (this) {
is KtCallExpression,
-> true
else -> true
}
}
private val checkersMap: EnumMap<ResolveContextKind, (declaration: PsiElement, value: String) -> Diagnostic?> =
EnumMap<ResolveContextKind, (declaration: PsiElement, value: String) -> Diagnostic?>(ResolveContextKind::class.java).apply {
put(ResolveContextKind.PLUGIN_NAME, ::checkPluginName)
@ -111,30 +99,32 @@ class PluginDescriptionChecker : DeclarationChecker {
) {
println("${declaration::class.qualifiedName} $declaration")
when (declaration) {
is KtObjectDeclaration -> {
is KtClassOrObject -> {
// check super type constructor
val superTypeCallEntry = declaration.findChild<KtSuperTypeList>()?.findChild<KtSuperTypeCallEntry>() ?: return
// val constructorCall = superTypeCallEntry.findChildren<KtConstructorCalleeExpression>()?.resolveToCall() ?: return
val valueArgumentList = superTypeCallEntry.findChild<KtValueArgumentList>() ?: return
valueArgumentList.arguments.asSequence().mapNotNull(KtValueArgument::getArgumentExpression).forEach {
if (it.shouldPerformCheck()) {
check(it as KtCallExpression, context)
for (child in it.allChildrenWithSelf) {
if (child is LambdaArgument) {
child.getLambdaExpression()?.bodyExpression?.statements?.forEach { statement ->
if (statement is KtCallExpression) check(statement, context)
}
}
if (child is KtCallExpression) {
check(child, context)
}
}
}
}
is KtClassOrObject -> {
// check constructor
val superTypeCallEntry = declaration.findChild<KtSuperTypeList>()?.findChild<KtSuperTypeCallEntry>() ?: return
val constructorCall = superTypeCallEntry.findChild<KtConstructorCalleeExpression>()?.resolveToCall() ?: return
val valueArgumentList = superTypeCallEntry.findChild<KtValueArgumentList>() ?: return
}
else -> {
declaration.children.filter { it.shouldPerformCheck() }.forEach { element ->
declaration.children.flatMap {
when (it) {
is KtCallExpression -> listOf(it)
is KtLambdaExpression -> it.bodyExpression?.statements.orEmpty()
else -> emptyList()
}
}.forEach { element ->
if (element is KtDeclaration) {
val desc = element.descriptor ?: return@forEach
check(element, desc, context)

11
tools/intellij-plugin/src/main/kotlin/net/mamoe/mirai/console/intellij/resolve/resolveIdea.kt
View File

@ -25,6 +25,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.nj2k.postProcessing.resolve
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.allChildren
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
@ -92,6 +93,14 @@ val KtAnnotationEntry.annotationClass: KtClass?
fun KtAnnotated.hasAnnotation(fqName: FqName): Boolean =
this.annotationEntries.any { it.annotationClass?.getKotlinFqName() == fqName }
val PsiElement.allChildrenWithSelf: Sequence<PsiElement>
get() {
return sequence {
yield(this@allChildrenWithSelf)
yieldAll(allChildren)
}
}
val PsiElement.allChildrenFlat: Sequence<PsiElement>
get() {
return sequence {
@ -123,7 +132,7 @@ fun KtExpression.resolveStringConstantValue(bindingContext: BindingContext): Str
return compileTimeConstant.castOrNull<StringValue>()?.value
}
is PsiDeclarationStatement -> {
// TODO: 2020/9/18 compile-time constants from Java
}
}
}