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 k2] Fix ChangeToFunctionInvocationFix producing invalid code for generic function

Browse Source 
^KTIJ-30062

GitOrigin-RevId: 21c2817779ee0b8d662d902d8a68d33b28c672cd
This commit is contained in:
Andrey Cherkasov
2024-05-25 02:03:01 +00:00
committed by intellij-monorepo-bot
parent 0ab6a8e24f
commit f572557a66
5 changed files with 39 additions and 4 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/ChangeToFunctionInvocationFixFactory.kt
+9 -4
View File
@@ -4,15 +4,20 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.fixes
import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory
import org.jetbrains.kotlin.idea.quickfix.ChangeToFunctionInvocationFix
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtTypeArgumentList
import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespaceAndComments
internal object ChangeToFunctionInvocationFixFactory {
val changeToFunctionInvocationFixFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.FunctionCallExpected ->
val expression = diagnostic.psi as? KtExpression ?: return@ModCommandBased emptyList()
listOf(
ChangeToFunctionInvocationFix(expression)
)
val next = expression.getNextSiblingIgnoringWhitespaceAndComments()
val parent = expression.parent
if (next is KtTypeArgumentList && parent is KtCallExpression) {
return@ModCommandBased listOf(ChangeToFunctionInvocationFix(parent))
}
listOf(ChangeToFunctionInvocationFix(expression))
}
}
plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java
+5
View File
@@ -6119,6 +6119,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
runTest("../../../idea/tests/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt");
}
@TestMetadata("genericFunction.kt")
public void testGenericFunction() throws Exception {
runTest("../../../idea/tests/testData/quickfix/variables/changeToFunctionInvocation/genericFunction.kt");
}
@TestMetadata("inStringTemplate.kt")
public void testInStringTemplate() throws Exception {
runTest("../../../idea/tests/testData/quickfix/variables/changeToFunctionInvocation/inStringTemplate.kt");
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java
+5
View File
@@ -17718,6 +17718,11 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest {
runTest("testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt");
}
@TestMetadata("genericFunction.kt")
public void testGenericFunction() throws Exception {
runTest("testData/quickfix/variables/changeToFunctionInvocation/genericFunction.kt");
}
@TestMetadata("inStringTemplate.kt")
public void testInStringTemplate() throws Exception {
runTest("testData/quickfix/variables/changeToFunctionInvocation/inStringTemplate.kt");
plugins/kotlin/idea/tests/testData/quickfix/variables/changeToFunctionInvocation/genericFunction.kt
+10
View File
@@ -0,0 +1,10 @@
// "Change to function invocation" "true"
// ERROR: No value passed for parameter 'i'
fun <T> foo(i: Int) = 42
fun main() {
val listFoo = foo<caret><String>
}
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToFunctionInvocationFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToFunctionInvocationFix
plugins/kotlin/idea/tests/testData/quickfix/variables/changeToFunctionInvocation/genericFunction.kt.after
+10
View File
@@ -0,0 +1,10 @@
// "Change to function invocation" "true"
// ERROR: No value passed for parameter 'i'
fun <T> foo(i: Int) = 42
fun main() {
val listFoo = foo<String>()
}
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToFunctionInvocationFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToFunctionInvocationFix