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-36447 Fix handling nested binary expression

Browse Source 
GitOrigin-RevId: bdf722a2bd6f916ba7e6b80004aac0890dc9397c
This commit is contained in:
Vladimir Dolzhenko
2025-11-17 13:17:42 +00:00
committed by intellij-monorepo-bot
parent 302b47d737
commit bc27a192f2
5 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/NoReturnValueFactory.kt
+7 -8
View File
@@ -4,12 +4,12 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.fixes
import com.intellij.modcommand.ActionContext
import com.intellij.modcommand.ModPsiUpdater
import com.intellij.modcommand.PsiUpdateModCommandAction
import com.intellij.openapi.diagnostic.Logger
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
internal object NoReturnValueFactory {
val noReturnValue =
@@ -65,8 +65,9 @@ internal object NoReturnValueFactory {
factory.createExpression("{$baseExpressionText}")
}
else -> {
LOG.error("Unknown parent class: ${parent?.javaClass?.name}. The result expression could be incorrect.")
factory.createExpression("{$baseExpressionText}")
throw KotlinExceptionWithAttachments("Unknown parent class: ${parent?.javaClass?.name}.")
.withPsiAttachment("element.kt", element)
.withPsiAttachment("file.kt", element.containingFile)
}
}
return newExpression
@@ -74,14 +75,12 @@ internal object NoReturnValueFactory {
private fun findParentOrOuterMostParentheses(element: KtElement): PsiElement? {
var parent: PsiElement? = element.parent
while (parent is KtParenthesizedExpression) {
while (parent is KtParenthesizedExpression || parent is KtBinaryExpression) {
val parentOfParent = parent.parent
if (parentOfParent !is KtParenthesizedExpression) break
if (parentOfParent !is KtParenthesizedExpression && parentOfParent !is KtBinaryExpression) break
parent = parentOfParent
}
return parent
}
}
}
private val LOG = Logger.getInstance(NoReturnValueFactory::class.java)
}
plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java
+5
View File
@@ -8034,6 +8034,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
runTest("../../../idea/tests/testData/quickfix/explicitlyIgnoreReturnValue/ignoredWithAnnotation.kt");
}
@TestMetadata("nestedBinaryExpressions.kt")
public void testNestedBinaryExpressions() throws Exception {
runTest("../../../idea/tests/testData/quickfix/explicitlyIgnoreReturnValue/nestedBinaryExpressions.kt");
}
@TestMetadata("parentheses.kt")
public void testParentheses() throws Exception {
runTest("../../../idea/tests/testData/quickfix/explicitlyIgnoreReturnValue/parentheses.kt");
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java
+5
View File
@@ -9787,6 +9787,11 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest {
runTest("testData/quickfix/explicitlyIgnoreReturnValue/ignoredWithAnnotation.kt");
}
@TestMetadata("nestedBinaryExpressions.kt")
public void testNestedBinaryExpressions() throws Exception {
runTest("testData/quickfix/explicitlyIgnoreReturnValue/nestedBinaryExpressions.kt");
}
@TestMetadata("parentheses.kt")
public void testParentheses() throws Exception {
runTest("testData/quickfix/explicitlyIgnoreReturnValue/parentheses.kt");
plugins/kotlin/idea/tests/testData/quickfix/explicitlyIgnoreReturnValue/nestedBinaryExpressions.kt
+10
View File
@@ -0,0 +1,10 @@
// "Explicitly ignore return value" "true"
// LANGUAGE_VERSION: 2.2
// COMPILER_ARGUMENTS: -Xreturn-value-checker=full
fun someFunction() {
someFunctionValue() ?: (someFunctionValue() ?: <caret>someFunctionValue() ?: error("failure"))
}
fun someFunctionValue(): Int? = 1
// IGNORE_K1
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.NoReturnValueFactory$UnderscoreValueFix
plugins/kotlin/idea/tests/testData/quickfix/explicitlyIgnoreReturnValue/nestedBinaryExpressions.kt.after
+10
View File
@@ -0,0 +1,10 @@
// "Explicitly ignore return value" "true"
// LANGUAGE_VERSION: 2.2
// COMPILER_ARGUMENTS: -Xreturn-value-checker=full
fun someFunction() {
val _ = someFunctionValue() ?: (someFunctionValue() ?: <caret>someFunctionValue() ?: error("failure"))
}
fun someFunctionValue(): Int? = 1
// IGNORE_K1
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.NoReturnValueFactory$UnderscoreValueFix