[kotlin] New Inspection API: Minor simplifications

GitOrigin-RevId: 310a823f55202c545fcf5bf8a0d6f91183147b70
This commit is contained in:
Marco Pennekamp
2022-11-14 20:43:47 +00:00
committed by intellij-monorepo-bot
parent ea7c3cfdad
commit 15d17b0ae1
2 changed files with 6 additions and 8 deletions
@@ -5,7 +5,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtSimpleFunctionCall
import org.jetbrains.kotlin.analysis.api.calls.KtSuccessCallInfo
import org.jetbrains.kotlin.analysis.api.calls.successfulCallOrNull
import org.jetbrains.kotlin.analysis.api.calls.symbol
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol
@@ -42,8 +42,8 @@ internal class ReplaceGetOrSetInspection :
context(KtAnalysisSession)
override fun prepareContext(element: KtDotQualifiedExpression): Context? {
// `resolveCall()` is needed to filter out `set` functions with varargs or default values. See the `setWithVararg.kt` test.
val call = (element.resolveCall() as? KtSuccessCallInfo)?.call as? KtSimpleFunctionCall ?: return null
val functionSymbol = call.partiallyAppliedSymbol.symbol
val call = element.resolveCall()?.successfulCallOrNull<KtSimpleFunctionCall>() ?: return null
val functionSymbol = call.symbol
if (functionSymbol !is KtFunctionSymbol || !functionSymbol.isOperator) {
return null
}
@@ -24,10 +24,8 @@ class RedundantModalityModifierInspection :
override fun prepareContextByDiagnostic(
element: KtModifierListOwner,
diagnostic: KtFirDiagnostic.RedundantModalityModifier
): ModifierContext? {
return when(element) {
is KtDeclaration -> element.modalityModifierType()?.let { ModifierContext(it) }
else -> null
}
): ModifierContext? = when(element) {
is KtDeclaration -> element.modalityModifierType()?.let { ModifierContext(it) }
else -> null
}
}