MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] KTIJ-30904 Fix false positive in KotlinConstantConditionsInspection for qualified constants

Browse Source 
GitOrigin-RevId: 116902b3da8b68d3a36c74ecadea341dfa286933
This commit is contained in:
Andrey Cherkasov
2025-10-10 15:19:50 +00:00
committed by intellij-monorepo-bot
parent f7fa4abd8c
commit 14d9bd4852
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/dfa/KotlinConstantConditionsInspection.kt
+4 -11
View File
@@ -31,15 +31,7 @@ import com.intellij.util.ThreeState
import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.analyze
import org.jetbrains.kotlin.analysis.api.components.KaDiagnosticCheckerFilter
import org.jetbrains.kotlin.analysis.api.components.evaluate
import org.jetbrains.kotlin.analysis.api.components.expectedType
import org.jetbrains.kotlin.analysis.api.components.expressionType
import org.jetbrains.kotlin.analysis.api.components.isMarkedNullable
import org.jetbrains.kotlin.analysis.api.components.isNothingType
import org.jetbrains.kotlin.analysis.api.components.isUsedAsExpression
import org.jetbrains.kotlin.analysis.api.components.resolveToCall
import org.jetbrains.kotlin.analysis.api.components.resolveToSymbol
import org.jetbrains.kotlin.analysis.api.components.*
import org.jetbrains.kotlin.analysis.api.resolution.KaFunctionCall
import org.jetbrains.kotlin.analysis.api.resolution.singleFunctionCallOrNull
import org.jetbrains.kotlin.analysis.api.resolution.symbol
@@ -706,8 +698,9 @@ class KotlinConstantConditionsInspection : AbstractKotlinInspection() {
else -> {}
}
if (expression is KtSimpleNameExpression) {
val target = expression.mainReference.resolve()
val targetExpression = (expression as? KtDotQualifiedExpression)?.selectorExpression ?: expression
if (targetExpression is KtSimpleNameExpression) {
val target = targetExpression.mainReference.resolve()
if (target is KtProperty && !target.isVar && target.initializer is KtConstantExpression) {
// suppress warnings uses of boolean constant like 'val b = true'
return true
plugins/kotlin/idea/tests/testData/inspections/dfa/Suppressions.kt
+9
View File
@@ -6,6 +6,15 @@ fun doNotWarnAtZero(x: Int) {
if (x > ZERO) return
assert(x == ZERO)
}
object Constants {
const val FALSE = false
}
fun doNotWarnAtFalse(flag: Boolean?): Boolean {
return flag ?: Constants.FALSE
}
fun returnInReturn(a: Boolean, b: Boolean): Boolean {
// KTIJ-23768
return a || return b
plugins/kotlin/idea/tests/testData/inspections/dfa/SuppressionsK2.kt
+9
View File
@@ -6,6 +6,15 @@ fun doNotWarnAtZero(x: Int) {
if (x > ZERO) return
assert(x == ZERO)
}
object Constants {
const val FALSE = false
}
fun doNotWarnAtFalse(flag: Boolean?): Boolean {
return flag ?: Constants.FALSE
}
fun returnInReturn(a: Boolean, b: Boolean): Boolean {
// KTIJ-23768
return a || return b