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] Port AddInlineToFunctionWithReifiedFix to K2

Browse Source 
^KTIJ-29430

GitOrigin-RevId: fed7415faef41314cb7673445dfeac07791d0091
This commit is contained in:
Andrey Cherkasov
2024-04-12 11:49:15 +00:00
committed by intellij-monorepo-bot
parent 8eed07db2d
commit e903bd9105
6 changed files with 18 additions and 3 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/KotlinK2QuickFixRegistrar.kt
+1
View File
@@ -111,6 +111,7 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() {
registerFactory(AddInlineModifierFixFactories.inlineSuspendFunctionTypeUnsupported)
registerFactory(MakeTypeParameterReifiedAndFunctionInlineFixFactory.cannotCheckForErasedFactory)
registerFactory(AddInlineToFunctionFixFactories.illegalInlineParameterModifierFactory)
registerPsiQuickFixes(KtFirDiagnostic.ReifiedTypeParameterNoInline::class, AddModifierFix.addInlineToFunctionWithReified)
}
private val propertyInitialization = KtQuickFixesListBuilder.registerPsiQuickFix {
plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java
+11
View File
@@ -4869,7 +4869,18 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
}
}
@RunWith(JUnit3RunnerWithInners.class)
@TestMetadata("../../../idea/tests/testData/quickfix/addInlineToReifiedFunctionFix")
public static class AddInlineToReifiedFunctionFix extends AbstractHighLevelQuickFixTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@TestMetadata("basic.kt")
public void testBasic() throws Exception {
runTest("../../../idea/tests/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt");
}
}
plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+1
View File
@@ -127,6 +127,7 @@ open class AddModifierFix(
val addInnerModifier = createFactory(KtTokens.INNER_KEYWORD)
val addOverrideModifier = createFactory(KtTokens.OVERRIDE_KEYWORD)
val addDataModifier = createFactory(KtTokens.DATA_KEYWORD, KtClass::class.java)
val addInlineToFunctionWithReified = createFactory(KtTokens.INLINE_KEYWORD, KtNamedFunction::class.java)
val modifiersWithWarning: Set<KtModifierKeywordToken> = setOf(KtTokens.ABSTRACT_KEYWORD, KtTokens.FINAL_KEYWORD)
private val modalityModifiers = modifiersWithWarning + KtTokens.OPEN_KEYWORD
plugins/kotlin/idea/tests/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt
+2 -1
View File
@@ -3,4 +3,5 @@
fun <<caret>reified T> fn() {
}
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineToFunctionWithReifiedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineToFunctionWithReifiedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFix
plugins/kotlin/idea/tests/testData/quickfix/addInlineToReifiedFunctionFix/basic.kt.after
+2 -1
View File
@@ -3,4 +3,5 @@
inline fun <reified T> fn() {
}
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineToFunctionWithReifiedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineToFunctionWithReifiedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFix
plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt
+1 -1
View File
@@ -69,7 +69,7 @@ internal fun MutableTWorkspace.generateK2FixTests() {
model("$idea/quickfix/addFunModifier", pattern = pattern)
model("$idea/quickfix/addGenericUpperBound", pattern = pattern, isIgnored = true)
model("$idea/quickfix/addInline", pattern = pattern)
model("$idea/quickfix/addInlineToReifiedFunctionFix", pattern = pattern, isIgnored = true)
model("$idea/quickfix/addInlineToReifiedFunctionFix", pattern = pattern)
model("$idea/quickfix/addIsToWhenCondition", pattern = pattern, isIgnored = true)
model("$idea/quickfix/addJvmInline", pattern = pattern, isIgnored = true)
model("$idea/quickfix/addJvmStaticAnnotation", pattern = pattern, isIgnored = true)