diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeTypeQuickFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeTypeQuickFixFactories.kt index 8349aa3829f4..817631610b7f 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeTypeQuickFixFactories.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeTypeQuickFixFactories.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.codeinsight.api.classic.quickfixes.KotlinQuickF import org.jetbrains.kotlin.idea.codeinsights.impl.base.CallableReturnTypeUpdaterUtils import org.jetbrains.kotlin.idea.codeinsights.impl.base.CallableReturnTypeUpdaterUtils.updateType import org.jetbrains.kotlin.idea.quickfix.ChangeTypeFixUtils +import org.jetbrains.kotlin.idea.quickfix.NumberConversionFix import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* @@ -205,8 +206,16 @@ object ChangeTypeQuickFixFactories { val actualType = getActualType(diagnostic.actualType) val expectedType = diagnostic.expectedType buildList { + var primitiveLiteralData: PrimitiveLiteralData? = null if (expression is KtConstantExpression && expectedType.isNumberOrUNumberType() && actualType.isNumberOrUNumberType()) { - add(WrongPrimitiveLiteralFix(expression, preparePrimitiveLiteral(expression, expectedType))) + primitiveLiteralData = preparePrimitiveLiteral(expression, expectedType) + add(WrongPrimitiveLiteralFix(expression, primitiveLiteralData)) + } + if (expectedType.isNumberOrCharType() && actualType.isNumberOrCharType()) { + if (primitiveLiteralData == null || !WrongPrimitiveLiteralFix.isAvailable(primitiveLiteralData)) { + val elementContext = prepareNumberConversionElementContext(actualType, expectedType) + add(NumberConversionFix(expression as KtExpression, elementContext).asIntention()) + } } } } diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt index 113fe3e0aa23..a239226ba446 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt @@ -112,6 +112,7 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { registerFactory(MoveTypeAliasToTopLevelFixFactory.moveTypeAliasToTopLevelFixFactory) registerPsiQuickFixes(KaFirDiagnostic.InvalidIfAsExpression::class, AddIfElseBranchFix) registerFactory(RemoveSupertypeFixFactory.removeSupertypeFixFactory) + registerFactory(NumberConversionFixFactory.numberConversionFixFactory) } private val addAbstract = KtQuickFixesListBuilder.registerPsiQuickFix { diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/NumberConversionFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/NumberConversionFixFactory.kt new file mode 100644 index 000000000000..c1e911f56c52 --- /dev/null +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/NumberConversionFixFactory.kt @@ -0,0 +1,68 @@ +// 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.KaSession +import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic +import org.jetbrains.kotlin.analysis.api.renderer.types.impl.KaTypeRendererForSource +import org.jetbrains.kotlin.analysis.api.types.KaType +import org.jetbrains.kotlin.analysis.api.types.KaTypeNullability +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory +import org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +import org.jetbrains.kotlin.types.Variance + +internal object NumberConversionFixFactory { + + val numberConversionFixFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.EqualityNotApplicable -> + val binaryExpr = diagnostic.psi + val left = binaryExpr.left ?: return@ModCommandBased emptyList() + val right = binaryExpr.right ?: return@ModCommandBased emptyList() + val leftType = diagnostic.leftType + val rightType = diagnostic.rightType + + if (!leftType.isNumberOrCharType() || !rightType.isNumberOrCharType()) return@ModCommandBased emptyList() + + buildList { + if (isNumberConversionAvailable(leftType, rightType)) { + val elementContext = prepareNumberConversionElementContext(leftType, rightType) + add(NumberConversionFix(left, elementContext, NumberConversionFix.ConversionType.LEFT_HAND_SIDE)) + } + if (isNumberConversionAvailable(leftType, rightType)) { + val elementContext = prepareNumberConversionElementContext(rightType, leftType) + add(NumberConversionFix(right, elementContext, NumberConversionFix.ConversionType.RIGHT_HAND_SIDE)) + } + } + } +} + +context(KaSession) +internal fun prepareNumberConversionElementContext( + fromType: KaType, + toType: KaType, +): NumberConversionFix.ElementContext { + return NumberConversionFix.ElementContext( + typePresentation = toType.withNullability(KaTypeNullability.NON_NULLABLE).render( + renderer = KaTypeRendererForSource.WITH_SHORT_NAMES, + position = Variance.INVARIANT, + ), + fromInt = fromType.isInt, + fromChar = fromType.isChar, + fromFloatOrDouble = fromType.isFloat || fromType.isDouble, + fromNullable = fromType.nullability.isNullable, + toChar = toType.isChar, + toInt = toType.isInt, + toByteOrShort = toType.isByte || toType.isShort, + ) +} + +context(KaSession) +internal fun isNumberConversionAvailable( + fromType: KaType, + toType: KaType, +): Boolean = fromType != toType && fromType.isNumberOrCharType() && toType.isNumberOrCharType() + +context(KaSession) +internal fun KaType.isNumberOrCharType(): Boolean { + return with(withNullability(KaTypeNullability.NON_NULLABLE)) { + isNumberOrUNumberType() || isChar + } +} diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrongPrimitiveLiteralFix.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrongPrimitiveLiteralFix.kt index 245dc8416f50..b07778f03ede 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrongPrimitiveLiteralFix.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/WrongPrimitiveLiteralFix.kt @@ -81,22 +81,26 @@ private fun toLong(constValue: Any?): Long? = when (constValue) { class WrongPrimitiveLiteralFix(element: KtExpression, private val primitiveLiteral: PrimitiveLiteralData) : KotlinQuickFixAction(element) { - override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean { - with(primitiveLiteral) { - if (constValue == null) return false - val longValue = toLong(constValue) ?: return false - if (expectedTypeIsFloat || expectedTypeIsDouble || expectedTypeIsUnsigned) return true + companion object { + internal fun isAvailable(primitiveLiteral: PrimitiveLiteralData): Boolean { + with(primitiveLiteral) { + if (constValue == null) return false + val longValue = toLong(constValue) ?: return false + if (expectedTypeIsFloat || expectedTypeIsDouble || expectedTypeIsUnsigned) return true - if (constValue is Float || constValue is Double) { - val value = (constValue as? Float)?.toDouble() ?: constValue as Double - if (value != floor(value)) return false - if (value !in Long.MIN_VALUE.toDouble()..Long.MAX_VALUE.toDouble()) return false + if (constValue is Float || constValue is Double) { + val value = (constValue as? Float)?.toDouble() ?: constValue as Double + if (value != floor(value)) return false + if (value !in Long.MIN_VALUE.toDouble()..Long.MAX_VALUE.toDouble()) return false + } + + return longValue in (valueRanges[typeName] ?: return false) } - - return longValue in (valueRanges[typeName] ?: return false) } } + override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean = isAvailable(primitiveLiteral) + override fun getFamilyName() = KotlinBundle.message("change.to.correct.primitive.type") override fun getText() = KotlinBundle.message("change.to.0", primitiveLiteral.fixedExpression) diff --git a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java index f0b4e276c359..94f653d1f809 100644 --- a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java +++ b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java @@ -3797,6 +3797,235 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu } } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion") + public abstract static class NumberConversion extends AbstractHighLevelQuickFixTest { + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar") + public static class FromChar 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("byte.kt") + public void testByte() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt"); + } + + @TestMetadata("double.kt") + public void testDouble() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt"); + } + + @TestMetadata("float.kt") + public void testFloat() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt"); + } + + @TestMetadata("int.kt") + public void testInt() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt"); + } + + @TestMetadata("intFromCharLiteral.kt") + public void testIntFromCharLiteral() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt"); + } + + @TestMetadata("long.kt") + public void testLong() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt"); + } + + @TestMetadata("longFromCharLiteral.kt") + public void testLongFromCharLiteral() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt"); + } + + @TestMetadata("short.kt") + public void testShort() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt"); + } + + @TestMetadata("shortWithVer1_4.kt") + public void testShortWithVer1_4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte") + public static class ToByte 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("double.kt") + public void testDouble() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt"); + } + + @TestMetadata("float.kt") + public void testFloat() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt"); + } + + @TestMetadata("floatWithVer1_2.kt") + public void testFloatWithVer1_2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt"); + } + + @TestMetadata("long.kt") + public void testLong() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar") + public static class ToChar 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("byte.kt") + public void testByte() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt"); + } + + @TestMetadata("double.kt") + public void testDouble() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt"); + } + + @TestMetadata("doubleLiteral.kt") + public void testDoubleLiteral() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt"); + } + + @TestMetadata("float.kt") + public void testFloat() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt"); + } + + @TestMetadata("floatLiteral.kt") + public void testFloatLiteral() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt"); + } + + @TestMetadata("int.kt") + public void testInt() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt"); + } + + @TestMetadata("long.kt") + public void testLong() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt"); + } + + @TestMetadata("longLiteral.kt") + public void testLongLiteral() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt"); + } + + @TestMetadata("short.kt") + public void testShort() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt"); + } + + @TestMetadata("shortWithVer1_4.kt") + public void testShortWithVer1_4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort") + public static class ToShort 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("double.kt") + public void testDouble() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt"); + } + + @TestMetadata("float.kt") + public void testFloat() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt"); + } + + @TestMetadata("floatWithVer1_2.kt") + public void testFloatWithVer1_2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt"); + } + + @TestMetadata("long.kt") + public void testLong() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion") + public static class Uncategorized 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("convertBinaryExpression.kt") + public void testConvertBinaryExpression() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt"); + } + + @TestMetadata("convertExpression.kt") + public void testConvertExpression() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt"); + } + + @TestMetadata("convertToSigned.kt") + public void testConvertToSigned() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt"); + } + + @TestMetadata("convertToUnsigned.kt") + public void testConvertToUnsigned() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt"); + } + } + } + @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../../idea/tests/testData/quickfix/typeMismatch/parameterTypeMismatch") public static class ParameterTypeMismatch extends AbstractHighLevelQuickFixTest { @@ -5975,7 +6204,92 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/equalityNotApplicable") + public abstract static class EqualityNotApplicable extends AbstractHighLevelQuickFixTest { + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion") + public static class CharLiteralConversion 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("charEqString.kt") + public void testCharEqString() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt"); + } + + @TestMetadata("charEqString2.kt") + public void testCharEqString2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt"); + } + + @TestMetadata("charEqString3.kt") + public void testCharEqString3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt"); + } + + @TestMetadata("charEqString4.kt") + public void testCharEqString4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString4.kt"); + } + + @TestMetadata("charEqStringDoubleQuote.kt") + public void testCharEqStringDoubleQuote() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt"); + } + + @TestMetadata("charEqStringSingleQuote.kt") + public void testCharEqStringSingleQuote() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt"); + } + + @TestMetadata("interpolation.kt") + public void testInterpolation() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/interpolation.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/equalityNotApplicable/numberConversion") + public static class NumberConversion 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("left.kt") + public void testLeft() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt"); + } + + @TestMetadata("nullableLeft.kt") + public void testNullableLeft() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt"); + } + + @TestMetadata("nullableRight.kt") + public void testNullableRight() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt"); + } + + @TestMetadata("right.kt") + public void testRight() throws Exception { + runTest("../../../idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt"); + } + } + } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt index f902785667f6..4ab78dff37b1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == "a" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt.after index 3792b5c42d44..33e3742865c0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString.kt.after @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == 'a' } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt index 9ff24d1368f5..2dc8beeb1193 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return "\t" == c } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt.after index bbcf1d8752f6..4fc741927026 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString2.kt.after @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return '\t' == c } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt index 5982d2ba5a8d..8c9890a22eec 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == """a""" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt.after index 3792b5c42d44..33e3742865c0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqString3.kt.after @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == 'a' } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt index f3bcf2ca7bbe..52c57c546abf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == "\"" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt.after index b4e4c34e95bb..2f0cf1cf4dd2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringDoubleQuote.kt.after @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == '"' } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt index ee826dbf98dd..b5c2251c3b06 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == "'" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt.after index 587d382c169c..84bd0002065a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/charLiteralConversion/charEqStringSingleQuote.kt.after @@ -2,4 +2,5 @@ fun test(c: Char): Boolean { return c == '\'' } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ConvertStringToCharLiteralFix +/* IGNORE_K2 */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt index 96b80dd3c559..b56083b8b088 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt @@ -2,4 +2,5 @@ fun test(b: Byte, i: Int): Boolean { return b == i } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt.after index 6a1f2bc33e02..ac2c2a4d2638 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/left.kt.after @@ -2,4 +2,5 @@ fun test(b: Byte, i: Int): Boolean { return b.toInt() == i } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt index 3eba86fc8d2c..b32dbc82437e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt @@ -2,4 +2,5 @@ fun test(s: Short?, l: Long?): Boolean { return s == l } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt.after index 31c230b1657d..d1a9db8e2ee1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableLeft.kt.after @@ -2,4 +2,5 @@ fun test(s: Short?, l: Long?): Boolean { return s?.toLong() == l } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt index 9e31fe2e5a2e..9e5ae31be8ce 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt @@ -2,4 +2,5 @@ fun test(s: Short?, l: Long?): Boolean { return s == l } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt.after index 089d08018b5a..f8083359d257 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/nullableRight.kt.after @@ -2,4 +2,5 @@ fun test(s: Short?, l: Long?): Boolean { return s == l?.toShort() } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt index a85935d15942..5fa4cc55e051 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt @@ -2,4 +2,5 @@ fun test(b: Byte, i: Int): Boolean { return b == i } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt.after index 1ffac4f20f0a..a9a9732dcdb4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/equalityNotApplicable/numberConversion/right.kt.after @@ -2,4 +2,5 @@ fun test(b: Byte, i: Int): Boolean { return b == i.toByte() } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt index 0058b54c8134..8be035c7be06 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt @@ -5,4 +5,5 @@ fun foo() { fun bar(l: Float) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt.after index 92b91a6d721e..d5a5ce436589 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertBinaryExpression.kt.after @@ -5,4 +5,5 @@ fun foo() { fun bar(l: Float) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt index 12b04a584dec..50f1ffbbf3a8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt @@ -6,4 +6,5 @@ fun foo() { fun bar(l: Int) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt.after index 60447cd30309..e920a65545f0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertExpression.kt.after @@ -6,4 +6,5 @@ fun foo() { fun bar(l: Int) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt index 267262afd932..0d10511963b0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt @@ -5,4 +5,5 @@ fun foo(param: Int) {} fun test(expr: UInt) { foo(expr) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt.after index 2f5de62bb533..bd30afb1e72b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToSigned.kt.after @@ -5,4 +5,5 @@ fun foo(param: Int) {} fun test(expr: UInt) { foo(expr.toInt()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt index 6186862e7184..ba9dfefffa7a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt @@ -5,4 +5,5 @@ fun foo(param: UInt) {} fun test(expr: Int) { foo(expr) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt.after index 58f6ba803471..fb942dba203b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/convertToUnsigned.kt.after @@ -5,4 +5,5 @@ fun foo(param: UInt) {} fun test(expr: Int) { foo(expr.toUInt()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt index 0b1319c66af9..134064d35674 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt @@ -5,4 +5,5 @@ fun byte(x: Byte) {} fun test(c: Char) { byte(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt.after index 6abfe84b7efc..9270f4593553 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/byte.kt.after @@ -5,4 +5,5 @@ fun byte(x: Byte) {} fun test(c: Char) { byte(c.code.toByte()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt index 5f1f6ac8ffd1..b1e042524754 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt @@ -5,4 +5,5 @@ fun double(x: Double) {} fun test(c: Char) { double(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt.after index 7545543f7099..c3c1f326b20b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/double.kt.after @@ -5,4 +5,5 @@ fun double(x: Double) {} fun test(c: Char) { double(c.code.toDouble()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt index 4cd82195151e..77925a8d4afc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt @@ -5,4 +5,5 @@ fun float(x: Float) {} fun test(c: Char) { float(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt.after index f1db63c71947..aaac33ddc751 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/float.kt.after @@ -5,4 +5,5 @@ fun float(x: Float) {} fun test(c: Char) { float(c.code.toFloat()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt index d69e3eb16698..91daf5b03108 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt @@ -5,4 +5,5 @@ fun int(x: Int) {} fun test(c: Char) { int(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt.after index f153a0a1aa57..9b4a1e74f5c5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/int.kt.after @@ -5,4 +5,5 @@ fun int(x: Int) {} fun test(c: Char) { int(c.code) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt index 4161cc6f0bb0..c657296ffe5c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt @@ -5,4 +5,5 @@ fun int(x: Int) {} fun test(c: Char) { int('c') } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt.after index 5850568e616e..d70005a730c4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/intFromCharLiteral.kt.after @@ -5,4 +5,5 @@ fun int(x: Int) {} fun test(c: Char) { int('c'.code) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt index f4663a01bda7..0ac9209cb31e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt @@ -5,4 +5,5 @@ fun long(x: Long) {} fun test(c: Char) { long(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt.after index 04a0a0136775..a2008770d697 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/long.kt.after @@ -5,4 +5,5 @@ fun long(x: Long) {} fun test(c: Char) { long(c.code.toLong()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt index 12f76e5ad139..2ec3e8d7246a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt @@ -5,4 +5,5 @@ fun long(x: Long) {} fun test(c: Char) { long('c') } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt.after index 3fb7c5fac8a9..248e2a95f4a1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/longFromCharLiteral.kt.after @@ -5,4 +5,5 @@ fun long(x: Long) {} fun test(c: Char) { long('c'.code.toLong()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt index c28b0b63007c..ca43189486ea 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(c: Char) { short(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt.after index 946aee3f86d5..7c455846987c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/short.kt.after @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(c: Char) { short(c.code.toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt index bc9e74613aef..9dd3a01982a9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(c: Char) { short(c) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt.after index 0379a3bb072b..4a9fb6f78fd9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/fromChar/shortWithVer1_4.kt.after @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(c: Char) { short(c.toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt index 5c71f19182a8..93a5226e16df 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(d: Double) { byte(d) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt.after index a2e75c4974b2..dab8f0efdaf7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/double.kt.after @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(d: Double) { byte(d.toInt().toByte()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt index a3ce6b879c4d..df2a715e22cf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(f: Float) { byte(f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt.after index fd91c0580902..89ae34a448d5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/float.kt.after @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(f: Float) { byte(f.toInt().toByte()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt index 5e78542b6606..d2afe8b7ddfe 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt @@ -5,4 +5,5 @@ fun byte(x: Byte) {} fun test(f: Float) { byte(f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt.after index 1656a1d77e41..f51424d008c5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/floatWithVer1_2.kt.after @@ -5,4 +5,5 @@ fun byte(x: Byte) {} fun test(f: Float) { byte(f.toByte()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt index 2f6fd0fe5195..42a7c980381e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(l: Long) { byte(l) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt.after index 69f53fb9bdb9..0003d69e10da 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toByte/long.kt.after @@ -4,4 +4,5 @@ fun byte(x: Byte) {} fun test(l: Long) { byte(l.toByte()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt index 56a2972d9c8b..50b46945401c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt @@ -5,4 +5,5 @@ fun test(b: Byte) { char(b) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt.after index ae5642600544..8748fc1eded7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/byte.kt.after @@ -5,4 +5,5 @@ fun test(b: Byte) { char(b.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt index 24bae5ddb46c..b0c3e8b849dc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt @@ -5,4 +5,5 @@ fun test(d: Double) { char(d) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt.after index 494bbf03cf2d..91de43688dcf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/double.kt.after @@ -5,4 +5,5 @@ fun test(d: Double) { char(d.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt index fd9c7c6c2401..09b6e00e2c29 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt @@ -5,4 +5,5 @@ fun test() { char(1.0) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt.after index eec22cb91287..177573c7d671 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/doubleLiteral.kt.after @@ -5,4 +5,5 @@ fun test() { char(1.0.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt index 94313e411262..5ac343f3fb77 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt @@ -5,4 +5,5 @@ fun test(f: Float) { char(f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt.after index b1d1ca6c1e48..9142f8cdecfc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/float.kt.after @@ -5,4 +5,5 @@ fun test(f: Float) { char(f.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt index 64fc027e3840..08986d16caf7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt @@ -5,4 +5,5 @@ fun test() { char(1.0f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt.after index 618cf85f9cd6..3ff1a5739c3b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/floatLiteral.kt.after @@ -5,4 +5,5 @@ fun test() { char(1.0f.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt index 86375be079bc..f511ef990fc8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt @@ -5,4 +5,5 @@ fun test() { char(1) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt.after index 346b20d7c6a2..6dd0ec0dc7c8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/int.kt.after @@ -5,4 +5,5 @@ fun test() { char(1.toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt index 42444bf5c124..cf7bec32123d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt @@ -5,4 +5,5 @@ fun test(l: Long) { char(l) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt.after index 4cbe550d0208..00e1e40f9e01 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/long.kt.after @@ -5,4 +5,5 @@ fun test(l: Long) { char(l.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt index cecd9c2a5dba..8527f9cdfd46 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt @@ -5,4 +5,5 @@ fun test() { char(1L) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt.after index ff1c61d9bd20..f5648b1d46ac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/longLiteral.kt.after @@ -5,4 +5,5 @@ fun test() { char(1L.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt index 19b0d386dfe1..839a5e8451e4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt @@ -5,4 +5,5 @@ fun test(s: Short) { char(s) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt.after index 6a212382c500..e202f9ad9fa2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/short.kt.after @@ -5,4 +5,5 @@ fun test(s: Short) { char(s.toInt().toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt index 705dcb1551a3..a49c478ba4d0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt @@ -6,4 +6,5 @@ fun test(s: Short) { char(s) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt.after index c2e2ee3e1c69..69ef79b5139b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toChar/shortWithVer1_4.kt.after @@ -6,4 +6,5 @@ fun test(s: Short) { char(s.toChar()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt index 8d823891ae72..7b7c9e4ee76d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(d: Double) { short(d) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt.after index d2eaf6e294dc..a4d887a076c0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/double.kt.after @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(d: Double) { short(d.toInt().toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt index cff9439729f3..cce181840f3c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(f: Float) { short(f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt.after index 827905c21a3a..863b90cbcd62 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/float.kt.after @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(f: Float) { short(f.toInt().toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt index 88ed5f19a008..e599b60966a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(f: Float) { short(f) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt.after index 8cb2dffd1572..bd1b9777788b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/floatWithVer1_2.kt.after @@ -5,4 +5,5 @@ fun short(x: Short) {} fun test(f: Float) { short(f.toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt index db1fb9bcd263..c6d84f13ccc2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(l: Long) { short(l) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt.after index f2d121accd50..f09a8a6b2a28 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/numberConversion/toShort/long.kt.after @@ -4,4 +4,5 @@ fun short(x: Short) {} fun test(l: Long) { short(l.toShort()) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.NumberConversionFix \ No newline at end of file diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt index 34d0f620a46d..7d8f3c6db3bc 100644 --- a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt +++ b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt @@ -46,6 +46,7 @@ internal fun MutableTWorkspace.generateK2FixTests() { model("$idea/quickfix/typeAddition", pattern = pattern) model("$idea/quickfix/typeMismatch/casts", pattern = pattern) model("$idea/quickfix/typeMismatch/componentFunctionReturnTypeMismatch", pattern = pattern) + model("$idea/quickfix/typeMismatch/numberConversion", pattern = pattern) model("$idea/quickfix/typeMismatch/parameterTypeMismatch", pattern = pattern) model("$idea/quickfix/typeMismatch/typeMismatchOnReturnedExpression", pattern = pattern) model("$idea/quickfix/typeMismatch/wrongPrimitive", pattern = pattern) @@ -114,7 +115,7 @@ internal fun MutableTWorkspace.generateK2FixTests() { model("$idea/quickfix/decreaseVisibility", pattern = pattern, isIgnored = true) model("$idea/quickfix/deprecatedJavaAnnotation", pattern = pattern, isIgnored = true) model("$idea/quickfix/deprecatedSymbolUsage", pattern = pattern, isIgnored = true) - model("$idea/quickfix/equalityNotApplicable", pattern = pattern, isIgnored = true) + model("$idea/quickfix/equalityNotApplicable", pattern = pattern) model("$idea/quickfix/final", pattern = pattern, isIgnored = true) model("$idea/quickfix/foldTryCatch", pattern = pattern, isIgnored = true) model("$idea/quickfix/functionWithLambdaExpressionBody", pattern = pattern, isIgnored = true)