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] Fix rendering of missing branches in AddRemainingWhenBranches

Browse Source 
KTIJ-30496

GitOrigin-RevId: 4e33efd8dc48ca0f51fddd95d3b70d7df4a82a60
This commit is contained in:
aleksandrina-streltsova
2024-07-10 13:44:44 +03:00
committed by intellij-monorepo-bot
parent 28eaf8206e
commit 63191ad02b
7 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java
+10
View File
@@ -3514,6 +3514,16 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
runTest("../../../idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt");
}
@TestMetadata("addRemainingBranchesGeneric.kt")
public void testAddRemainingBranchesGeneric() throws Exception {
runTest("../../../idea/tests/testData/quickfix/when/addRemainingBranchesGeneric.kt");
}
@TestMetadata("addRemainingBranchesGeneric2.kt")
public void testAddRemainingBranchesGeneric2() throws Exception {
runTest("../../../idea/tests/testData/quickfix/when/addRemainingBranchesGeneric2.kt");
}
@TestMetadata("addRemainingBranchesInNonDefaultPackage.kt")
public void testAddRemainingBranchesInNonDefaultPackage() throws Exception {
runTest("../../../idea/tests/testData/quickfix/when/addRemainingBranchesInNonDefaultPackage.kt");
plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeinsights/impl/base/intentions/AddRemainingWhenBranchesUtils.kt
+1 -13
View File
@@ -58,19 +58,7 @@ object AddRemainingWhenBranchesUtils {
val elseBranch = element.entries.find { it.isElse }
(whenCloseBrace.prevSibling as? PsiWhiteSpace)?.replace(psiFactory.createNewLine())
for (case in missingCases) {
val branchConditionText = when (case) {
WhenMissingCase.Unknown,
WhenMissingCase.NullIsMissing,
is WhenMissingCase.BooleanIsMissing,
is WhenMissingCase.ConditionTypeIsExpect -> case.branchConditionText
is WhenMissingCase.IsTypeCheckIsMissing ->
if (case.isSingleton) {
""
} else {
"is "
} + case.classId.asSingleFqName().render()
is WhenMissingCase.EnumCheckIsMissing -> case.callableId.asSingleFqName().render()
}
val branchConditionText = case.branchConditionText
val entry = psiFactory.createWhenEntry("$branchConditionText -> TODO()")
if (elseBranch != null) {
element.addBefore(entry, elseBranch)
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java
+10
View File
@@ -19780,6 +19780,16 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest {
runTest("testData/quickfix/when/addRemainingBranchesEnumStatement.kt");
}
@TestMetadata("addRemainingBranchesGeneric.kt")
public void testAddRemainingBranchesGeneric() throws Exception {
runTest("testData/quickfix/when/addRemainingBranchesGeneric.kt");
}
@TestMetadata("addRemainingBranchesGeneric2.kt")
public void testAddRemainingBranchesGeneric2() throws Exception {
runTest("testData/quickfix/when/addRemainingBranchesGeneric2.kt");
}
@TestMetadata("addRemainingBranchesInNonDefaultPackage.kt")
public void testAddRemainingBranchesInNonDefaultPackage() throws Exception {
runTest("testData/quickfix/when/addRemainingBranchesInNonDefaultPackage.kt");
plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesGeneric.kt
+17
View File
@@ -0,0 +1,17 @@
// "Add remaining branches" "true"
// ERROR: Unresolved reference: TODO
// ERROR: Unresolved reference: TODO
sealed class Base<U, V, W> {
fun foo(it: Base<U, V, W>) {
<caret>when (it) {
is Derived -> TODO()
}
}
}
class Derived<U, V>: Base<U, V, Int>()
class Generic<V, T>: Base<Int, V, String>()
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddWhenRemainingBranchFixFactories$AddRemainingWhenBranchesQuickFix
plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesGeneric.kt.after
+18
View File
@@ -0,0 +1,18 @@
// "Add remaining branches" "true"
// ERROR: Unresolved reference: TODO
// ERROR: Unresolved reference: TODO
sealed class Base<U, V, W> {
fun foo(it: Base<U, V, W>) {
when (it) {
is Derived -> TODO()
is Generic<*, *> -> TODO()
}
}
}
class Derived<U, V>: Base<U, V, Int>()
class Generic<V, T>: Base<Int, V, String>()
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddWhenRemainingBranchFixFactories$AddRemainingWhenBranchesQuickFix
plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesGeneric2.kt
+18
View File
@@ -0,0 +1,18 @@
// "Add remaining branches" "true"
// ERROR: Unresolved reference: TODO
// ERROR: Unresolved reference: TODO
sealed class Base<U, V, W> {
fun bar(it: TA) {
<caret>when (it) {
is Derived -> TODO()
}
}
}
class Derived<U, V>: Base<U, V, Int>()
class Generic<V, T>: Base<Int, V, String>()
typealias TA = Base<Double, Int, String>
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddWhenRemainingBranchFixFactories$AddRemainingWhenBranchesQuickFix
plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesGeneric2.kt.after
+19
View File
@@ -0,0 +1,19 @@
// "Add remaining branches" "true"
// ERROR: Unresolved reference: TODO
// ERROR: Unresolved reference: TODO
sealed class Base<U, V, W> {
fun bar(it: TA) {
when (it) {
is Derived -> TODO()
is Generic<*, *> -> TODO()
}
}
}
class Derived<U, V>: Base<U, V, Int>()
class Generic<V, T>: Base<Int, V, String>()
typealias TA = Base<Double, Int, String>
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddWhenRemainingBranchFixFactories$AddRemainingWhenBranchesQuickFix