From 0f4e01f660133a1df1d1e15f7be405f048ecfe77 Mon Sep 17 00:00:00 2001 From: "Victoria.Petrakovich" Date: Thu, 10 Oct 2024 15:42:59 +0200 Subject: [PATCH] [kotlin] Remove useless check for `android` DSL KTIJ-28468 kotlinOptions to compilerOptions inspection (kts only) Deleted check didn't stop the visitor from visiting enclosed references. `kotlinOptions` inside `android` has the type `org.gradle.kotlin.dsl.kotlinOptions` and won't pass the inspection check for allowed for replacement `kotlinOptions` types GitOrigin-RevId: 492eb0708da548a7e14d3057ca9e40058acb4f09 --- ...nsToCompilerOptionsInGradleScriptInspection.kt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/KotlinOptionsToCompilerOptionsInGradleScriptInspection.kt b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/KotlinOptionsToCompilerOptionsInGradleScriptInspection.kt index 21fd8402999f..6e81d2a09e1e 100644 --- a/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/KotlinOptionsToCompilerOptionsInGradleScriptInspection.kt +++ b/plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/KotlinOptionsToCompilerOptionsInGradleScriptInspection.kt @@ -61,10 +61,6 @@ internal class KotlinOptionsToCompilerOptionsInGradleScriptInspection : Abstract return object : KtVisitorVoid() { override fun visitReferenceExpression(expression: KtReferenceExpression) { val referencedName = (expression as? KtNameReferenceExpression)?.getReferencedName() ?: return - // ATM, we don't have proper dependencies for tests to perform `analyze` in Gradle build scripts - if (referencedName == "android" && !isUnitTestMode()) { - if (elementIsAndroidDsl(expression)) return - } if (referencedName != "kotlinOptions") return val expressionParent = expression.parent @@ -139,17 +135,6 @@ internal class KotlinOptionsToCompilerOptionsInGradleScriptInspection : Abstract } } - private fun elementIsAndroidDsl(expression: KtExpression): Boolean { - val importableFqName = analyze(expression) { - val symbol = expression.resolveToCall() - ?.successfulFunctionCallOrNull()?.partiallyAppliedSymbol?.signature?.symbol - val kaSymbol = - (symbol?.containingDeclaration as? KaClassLikeSymbol) ?: expression.resolveExpression() - kaSymbol?.importableFqName?.toString() - } - return importableFqName == "org.gradle.kotlin.dsl.android" - } - private fun expressionsContainForbiddenOperations(element: PsiElement): Boolean { if (element is KtBinaryExpression) { // for sth like `kotlinOptions.sourceMapEmbedSources = "inlining"` if (expressionContainsOperationForbiddenToReplace(element)) return true