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 InlineClassDeprecatedFix to K2

Browse Source 
This quick fix is for the INLINE_CLASS_DEPRECATED compiler warning.

^KTIJ-29500

GitOrigin-RevId: 025715bb1dcd3b68d11f0d62390b8a6c315b3aa1
This commit is contained in:
Andrey Cherkasov
2024-07-27 23:45:55 +00:00
committed by intellij-monorepo-bot
parent 46f05e6014
commit 5b987df757
21 changed files with 69 additions and 18 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/InlineClassDeprecatedFixFactory.kt
+18
View File
@@ -0,0 +1,18 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
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.InlineClassDeprecatedFix
import org.jetbrains.kotlin.psi.KtModifierListOwner
internal object InlineClassDeprecatedFixFactory {
val replaceWithValue = KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.InlineClassDeprecated ->
val modifierListOwner = diagnostic.psi as? KtModifierListOwner ?: return@ModCommandBased emptyList()
listOf(
InlineClassDeprecatedFix(modifierListOwner)
)
}
}
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt
+1
View File
@@ -134,6 +134,7 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() {
registerFactory(IllegalEscapeFixFactory.convertToUnicodeEscape)
registerFactory(IsEnumEntryFixFactory.factory)
registerFactory(NoReturnInFunctionWithBlockBodyFixFactory.addReturnToLastExpression)
registerFactory(InlineClassDeprecatedFixFactory.replaceWithValue)
}
private val addAbstract = KtQuickFixesListBuilder.registerPsiQuickFix {
plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java
+32
View File
@@ -9004,7 +9004,39 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
@RunWith(JUnit3RunnerWithInners.class)
@TestMetadata("../../../idea/tests/testData/quickfix/inlineClass")
public static class InlineClass extends AbstractHighLevelQuickFixTest {
@java.lang.Override
@org.jetbrains.annotations.NotNull
public final KotlinPluginMode getPluginMode() {
return KotlinPluginMode.K2;
}
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@TestMetadata("inlineClassDeprecated.kt")
public void testInlineClassDeprecated() throws Exception {
runTest("../../../idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated.kt");
}
@TestMetadata("inlineClassDeprecated_js.kt")
public void testInlineClassDeprecated_js() throws Exception {
runTest("../../../idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated_js.kt");
}
@TestMetadata("inlineClassWithGeneric.kt")
public void testInlineClassWithGeneric() throws Exception {
runTest("../../../idea/tests/testData/quickfix/inlineClass/inlineClassWithGeneric.kt");
}
@TestMetadata("publicInlineClass.kt")
public void testPublicInlineClass() throws Exception {
runTest("../../../idea/tests/testData/quickfix/inlineClass/publicInlineClass.kt");
}
}
plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/InlineClassDeprecatedFix.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatform
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtModifierListOwner
class InlineClassDeprecatedFix(
open class InlineClassDeprecatedFix(
element: KtModifierListOwner,
) : KotlinPsiUpdateModCommandAction.ElementBased<KtModifierListOwner, Unit>(element, Unit) {
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/JS/js/icjs.kt
-1
View File
@@ -1,4 +1,3 @@
// "Replace with 'value'" "true"
// IGNORE_K2
<caret>inline class IC1(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/JS/js/icjs.kt.after
-1
View File
@@ -1,4 +1,3 @@
// "Replace with 'value'" "true"
// IGNORE_K2
value class IC1(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/JVM/jvm/ic.kt
-1
View File
@@ -1,5 +1,4 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
<caret>inline class IC(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/JVM/jvm/ic.kt.after
-1
View File
@@ -1,6 +1,5 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
@kotlin.jvm.JvmInline
value class IC(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/commonWithJvm/common/ic.kt
-1
View File
@@ -1,5 +1,4 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
<caret>inline class IC(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/commonWithJvm/common/ic.kt.after
-1
View File
@@ -1,6 +1,5 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
@kotlin.jvm.JvmInline
value class IC(val i: Int)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/genericParameter/jvm/ic.kt
-1
View File
@@ -1,5 +1,4 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
<caret>inline class IC<T>(val i: T)
plugins/kotlin/idea/tests/testData/multiModuleQuickFix/inlineToValue/genericParameter/jvm/ic.kt.after
-1
View File
@@ -1,6 +1,5 @@
// "Replace with '@JvmInline value'" "true"
// DISABLE-ERRORS
// IGNORE_K2
@kotlin.jvm.JvmInline
value class IC<T>(val i: T)
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated.kt
+2 -1
View File
@@ -2,4 +2,5 @@
// WITH_STDLIB
<caret>inline class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated.kt.after
+2 -1
View File
@@ -3,4 +3,5 @@
@JvmInline
value class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated_js.kt
+2 -1
View File
@@ -2,4 +2,5 @@
// JS
<caret>inline class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassDeprecated_js.kt.after
+2 -1
View File
@@ -2,4 +2,5 @@
// JS
value class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassWithGeneric.kt
+2 -1
View File
@@ -4,4 +4,5 @@
<caret>inline class IC<T>(val i: T)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/inlineClassWithGeneric.kt.after
+2 -1
View File
@@ -5,4 +5,5 @@
@JvmInline
value class IC<T>(val i: T)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/publicInlineClass.kt
+2 -1
View File
@@ -2,4 +2,5 @@
// WITH_STDLIB
public <caret>inline class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/idea/tests/testData/quickfix/inlineClass/publicInlineClass.kt.after
+2 -1
View File
@@ -3,4 +3,5 @@
@JvmInline
public value class IC(val i: Int)
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.InlineClassDeprecatedFix
plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt
+1 -1
View File
@@ -124,7 +124,7 @@ internal fun MutableTWorkspace.generateK2FixTests() {
model("$idea/quickfix/importAlias", pattern = pattern, isIgnored = true)
model("$idea/quickfix/increaseVisibility", pattern = pattern)
model("$idea/quickfix/initializeWithConstructorParameter", pattern = pattern, isIgnored = true)
model("$idea/quickfix/inlineClass", pattern = pattern, isIgnored = true)
model("$idea/quickfix/inlineClass", pattern = pattern)
model("$idea/quickfix/inlineTypeParameterFix", pattern = pattern, isIgnored = true)
model("$idea/quickfix/insertDelegationCall", pattern = pattern)
model("$idea/quickfix/isEnumEntry", pattern = pattern)