From 83bba063e77701bef8d589c1d5aac36ddc41583e Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 26 Aug 2024 12:13:19 +0200 Subject: [PATCH] Java: improve message for cast fix GitOrigin-RevId: 40cd180ca8fdae46a3ea0216ec7b08e82ca22364 --- .../daemon/impl/quickfix/AddTypeCastFix.java | 7 +++---- .../impl/quickfix/CastMethodArgumentFix.java | 20 +++++++++---------- .../addTypeCast/afterFloatToDouble.java | 2 +- .../addTypeCast/afterFloatToDouble2.java | 2 +- .../addTypeCast/afterIntToDouble.java | 2 +- .../quickFix/addTypeCast/afterIntToFloat.java | 2 +- .../quickFix/addTypeCast/afterIntToLong.java | 2 +- .../quickFix/addTypeCast/afterLongToInt.java | 2 +- .../addTypeCast/beforeFloatToDouble.java | 2 +- .../addTypeCast/beforeFloatToDouble2.java | 2 +- .../addTypeCast/beforeIntToDouble.java | 2 +- .../addTypeCast/beforeIntToFloat.java | 2 +- .../quickFix/addTypeCast/beforeIntToLong.java | 2 +- .../quickFix/addTypeCast/beforeLongToInt.java | 2 +- .../castConstructorParameters/after3.java | 2 +- .../castConstructorParameters/after4.java | 2 +- .../castConstructorParameters/before3.java | 2 +- .../castConstructorParameters/before4.java | 2 +- .../afterPrimitiveWrappers.java | 2 +- .../afterVarargsLessArgs.java | 2 +- .../afterVarargsMoreArgs.java | 2 +- .../afterVarargsSameArgsLength.java | 2 +- .../beforePrimitiveWrappers.java | 2 +- .../beforeVarargsLessArgs.java | 2 +- .../beforeVarargsMoreArgs.java | 2 +- .../beforeVarargsSameArgsLength.java | 2 +- .../quickFix/convertDoubleToFloat/after1.java | 2 +- .../quickFix/convertDoubleToFloat/after2.java | 2 +- .../quickFix/convertDoubleToFloat/after3.java | 2 +- .../quickFix/convertDoubleToFloat/after4.java | 2 +- .../quickFix/convertDoubleToFloat/after5.java | 2 +- .../quickFix/convertDoubleToFloat/after6.java | 2 +- .../convertDoubleToFloat/before1.java | 2 +- .../convertDoubleToFloat/before2.java | 2 +- .../convertDoubleToFloat/before3.java | 2 +- .../convertDoubleToFloat/before4.java | 2 +- .../convertDoubleToFloat/before5.java | 2 +- .../convertDoubleToFloat/before6.java | 2 +- 38 files changed, 49 insertions(+), 50 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java index bf3992011227..ca98d504f926 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java @@ -1,5 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; @@ -63,7 +62,7 @@ public class AddTypeCastFix extends PsiUpdateModCommandAction { } public static void addTypeCast(Project project, PsiExpression originalExpression, PsiType type) { - PsiExpression typeCast = createCastExpression(originalExpression, project, type); + PsiExpression typeCast = createCastExpression(originalExpression, type); originalExpression.replace(Objects.requireNonNull(typeCast)); } @@ -74,7 +73,7 @@ public class AddTypeCastFix extends PsiUpdateModCommandAction { return null; } - static PsiExpression createCastExpression(PsiExpression original, Project project, PsiType type) { + static PsiExpression createCastExpression(PsiExpression original, PsiType type) { // remove nested casts PsiElement expression = PsiUtil.deparenthesizeExpression(original); if (expression == null) return null; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java index 8fffe319f41b..82ce65f6a9f1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java @@ -1,5 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; @@ -20,7 +19,8 @@ public final class CastMethodArgumentFix extends MethodArgumentFix implements Hi String role = list.getExpressionCount() == 1 ? QuickFixBundle.message("fix.expression.role.argument") : QuickFixBundle.message("fix.expression.role.nth.argument", myIndex + 1); - return QuickFixBundle.message("add.typecast.cast.text", myToType.getPresentableText(), role); + boolean literal = AddTypeCastFix.createCastExpression(list.getExpressions()[myIndex], myToType) instanceof PsiLiteralExpression; + return QuickFixBundle.message(literal ? "add.typecast.convert.text" : "add.typecast.cast.text", myToType.getPresentableText(), role); } private static class MyFixerActionFactory extends ArgumentFixerActionFactory { @@ -32,18 +32,18 @@ public final class CastMethodArgumentFix extends MethodArgumentFix implements Hi @Override protected PsiExpression getModifiedArgument(final PsiExpression expression, PsiType toType) throws IncorrectOperationException { final PsiType exprType = expression.getType(); - if (exprType instanceof PsiClassType && toType instanceof PsiPrimitiveType) { - PsiClassType boxed = ((PsiPrimitiveType)toType).getBoxedType(expression); + if (exprType instanceof PsiClassType && toType instanceof PsiPrimitiveType primitiveType) { + PsiClassType boxed = primitiveType.getBoxedType(expression); assert boxed != null : toType + ":" + PsiUtil.getLanguageLevel(expression); toType = boxed; } - return AddTypeCastFix.createCastExpression(expression, expression.getProject(), toType); + return AddTypeCastFix.createCastExpression(expression, toType); } @Override public boolean areTypesConvertible(@NotNull PsiType exprType, @NotNull PsiType parameterType, @NotNull final PsiElement context) { - if (exprType instanceof PsiClassType && parameterType instanceof PsiPrimitiveType) { - parameterType = ((PsiPrimitiveType)parameterType).getBoxedType(context); //unboxing from type of cast expression will take place at runtime + if (exprType instanceof PsiClassType && parameterType instanceof PsiPrimitiveType primitiveType) { + parameterType = primitiveType.getBoxedType(context); //unboxing from type of cast expression will take place at runtime if (parameterType == null) return false; } if (exprType instanceof PsiPrimitiveType && parameterType instanceof PsiClassType) { @@ -57,8 +57,8 @@ public final class CastMethodArgumentFix extends MethodArgumentFix implements Hi return true; } - return parameterType instanceof PsiEllipsisType && - areTypesConvertible(exprType, ((PsiEllipsisType)parameterType).getComponentType(), context); + return parameterType instanceof PsiEllipsisType ellipsisType && + areTypesConvertible(exprType, ellipsisType.getComponentType(), context); } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble.java index 0cfca4f477a1..42ebf456863c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble2.java index 0cfca4f477a1..42ebf456863c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterFloatToDouble2.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToDouble.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToDouble.java index 0971d93ac023..b498522b4fb2 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToDouble.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToDouble.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToFloat.java index 46a7963a35a0..28a881f52964 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToFloat.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToFloat.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class a { void test(Float f) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToLong.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToLong.java index b2cb0a48f637..4a463ab9046f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToLong.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterIntToLong.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void test(Long l) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterLongToInt.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterLongToInt.java index 51a640a7417f..2d06d6e555ae 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterLongToInt.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/afterLongToInt.java @@ -1,4 +1,4 @@ -// "Cast argument to 'int'" "true-preview" +// "Convert argument to 'int'" "true-preview" class a { void test(int d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble.java index a304f7472c53..b8377ceffd9e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble2.java index e6d7868f0644..acf124841c0c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeFloatToDouble2.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToDouble.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToDouble.java index 6437b686afbc..7f0a6982cbac 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToDouble.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToDouble.java @@ -1,4 +1,4 @@ -// "Cast argument to 'double'" "true-preview" +// "Convert argument to 'double'" "true-preview" class a { void test(Double d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToFloat.java index a4e131e6de4d..15412153f105 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToFloat.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToFloat.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class a { void test(Float f) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToLong.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToLong.java index bc3c599d65fd..77c2331ca503 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToLong.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeIntToLong.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void test(Long l) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeLongToInt.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeLongToInt.java index dc81cd1a20d2..33519edafcaa 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeLongToInt.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeCast/beforeLongToInt.java @@ -1,4 +1,4 @@ -// "Cast argument to 'int'" "true-preview" +// "Convert argument to 'int'" "true-preview" class a { void test(int d) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after3.java index 41d8c970523c..f7859cf739fb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after3.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'double'" "true-preview" +// "Convert 1st argument to 'double'" "true-preview" class x {} class a extends x { a(a a) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after4.java index 1c9a139755ed..ae1512e18cda 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/after4.java @@ -1,4 +1,4 @@ -// "Cast 2nd argument to 'double'" "true-preview" +// "Convert 2nd argument to 'double'" "true-preview" class x {} class a extends x { a(a a) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before3.java index 5e27fbbd4efc..0d4407006767 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before3.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'double'" "true-preview" +// "Convert 1st argument to 'double'" "true-preview" class x {} class a extends x { a(a a) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before4.java index 6ba90f41bdd6..f5760ab9a17b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castConstructorParameters/before4.java @@ -1,4 +1,4 @@ -// "Cast 2nd argument to 'double'" "true-preview" +// "Convert 2nd argument to 'double'" "true-preview" class x {} class a extends x { a(a a) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterPrimitiveWrappers.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterPrimitiveWrappers.java index 15cd628ce8f7..49745acdabeb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterPrimitiveWrappers.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterPrimitiveWrappers.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void f(Long l) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsLessArgs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsLessArgs.java index ffed97385f54..0efa30630153 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsLessArgs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsLessArgs.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsMoreArgs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsMoreArgs.java index 118492eaa1fe..76c9b20015d0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsMoreArgs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsMoreArgs.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'long'" "true-preview" +// "Convert 1st argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsSameArgsLength.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsSameArgsLength.java index 1c18e71c3c5c..1d0dcbccd7d3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsSameArgsLength.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/afterVarargsSameArgsLength.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'long'" "true-preview" +// "Convert 1st argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforePrimitiveWrappers.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforePrimitiveWrappers.java index 87b908cea4fe..bb1b1d36b7ad 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforePrimitiveWrappers.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforePrimitiveWrappers.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void f(Long l) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsLessArgs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsLessArgs.java index ef6003ebec25..d8375905bbf4 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsLessArgs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsLessArgs.java @@ -1,4 +1,4 @@ -// "Cast argument to 'long'" "true-preview" +// "Convert argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsMoreArgs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsMoreArgs.java index a44ef6ad8ad6..80abc959ca73 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsMoreArgs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsMoreArgs.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'long'" "true-preview" +// "Convert 1st argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsSameArgsLength.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsSameArgsLength.java index 29719f5909a2..c31a5eea4e49 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsSameArgsLength.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/castMethodParameters15/beforeVarargsSameArgsLength.java @@ -1,4 +1,4 @@ -// "Cast 1st argument to 'long'" "true-preview" +// "Convert 1st argument to 'long'" "true-preview" class a { void f(Long l, String... s) {} void g() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after1.java index 83ce2ae0d6d6..613d79943772 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after1.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(1e1F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after2.java index 3fa658af6c5d..0a25f7e27768 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after2.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(2.F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after3.java index 53402ba8bbb7..c86ae2fdbafd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after3.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(.3F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after4.java index ae2b8482a103..174183615645 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after4.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(0.0F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after5.java index 757932e02b8f..5c7898ba7896 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after5.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(3.14F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after6.java index 421525da1f8f..fd75ea7e1b5f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/after6.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(1e-9F); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before1.java index 98f65680fb99..4105c304b73c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before1.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(1e1); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before2.java index 830cd0962b52..00032c19a9a9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before2.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(2.); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before3.java index 9786c36cd73f..d2008687e1dc 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before3.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(.3); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before4.java index ae134fd28070..730cb66aba41 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before4.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(0.0); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before5.java index 59f6f8a04508..d97000453c58 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before5.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(3.14); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before6.java index 7c7b9e3a4e5d..76b28cb1f964 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat/before6.java @@ -1,4 +1,4 @@ -// "Cast argument to 'float'" "true-preview" +// "Convert argument to 'float'" "true-preview" class Test { void bar() { foo(1e-9d);