From dfd636746fc33e2403ef249fbc2f109c87301d47 Mon Sep 17 00:00:00 2001 From: Artemiy Sartakov Date: Mon, 14 Oct 2019 12:52:51 +0700 Subject: [PATCH] ExplicitArrayFillingInspection: better quick fix message GitOrigin-RevId: b411271e0d9d4670630f6a54dd7fac7bf1423a68 --- .../codeInspection/ExplicitArrayFillingInspection.java | 3 ++- .../inspection/explicitArrayFilling/afterEmptyByteArray.java | 2 +- .../afterInitializerWithDefaultValues.java | 2 +- .../inspection/explicitArrayFilling/afterInnerLoop.java | 2 +- .../explicitArrayFilling/afterNewlyCreatedArray.java | 2 +- .../inspection/explicitArrayFilling/afterRedundantLoop.java | 2 +- .../inspection/explicitArrayFilling/afterUsedAfterLoop.java | 2 +- .../inspection/explicitArrayFilling/beforeEmptyByteArray.java | 2 +- .../beforeInitializerWithDefaultValues.java | 2 +- .../inspection/explicitArrayFilling/beforeInnerLoop.java | 2 +- .../explicitArrayFilling/beforeNewlyCreatedArray.java | 2 +- .../inspection/explicitArrayFilling/beforeRedundantLoop.java | 2 +- .../inspection/explicitArrayFilling/beforeUsedAfterLoop.java | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java b/java/java-impl/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java index 79fba47d0c9a..8267d26c86b0 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java @@ -67,7 +67,8 @@ public class ExplicitArrayFillingInspection extends AbstractBaseJavaLocalInspect if (isDefaultValue(rValue, defaultValue, lType) && isFilledWithDefaultValues(container.getQualifier(), statement, defaultValue)) { holder.registerProblem(statement, getRange(statement, ProblemHighlightType.WARNING), InspectionsBundle.message("inspection.explicit.array.filling.redundant.loop.description"), - QuickFixFactory.getInstance().createDeleteFix(statement)); + QuickFixFactory.getInstance() + .createDeleteFix(statement, CommonQuickFixBundle.message("fix.remove.statement", PsiKeyword.FOR))); return; } registerProblem(statement, false); diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterEmptyByteArray.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterEmptyByteArray.java index 235f42a69b9b..2541262cfc0b 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterEmptyByteArray.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterEmptyByteArray.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterInitializerWithDefaultValues.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterInitializerWithDefaultValues.java index f584932f754a..d3a18c6aa204 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterInitializerWithDefaultValues.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterInitializerWithDefaultValues.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterInnerLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterInnerLoop.java index d1d813c3267e..5bc601010881 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterInnerLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterInnerLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterNewlyCreatedArray.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterNewlyCreatedArray.java index 165b9632d382..f0865fd60ef5 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterNewlyCreatedArray.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterNewlyCreatedArray.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterRedundantLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterRedundantLoop.java index 401e0ae3cfd6..e7e8490e4766 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterRedundantLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterRedundantLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" import java.util.Arrays; import java.util.List; diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterUsedAfterLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterUsedAfterLoop.java index 0fbd51a0664b..d24e197471a6 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/afterUsedAfterLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterUsedAfterLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeEmptyByteArray.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeEmptyByteArray.java index a95a24a59b70..095c826d6173 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeEmptyByteArray.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeEmptyByteArray.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeInitializerWithDefaultValues.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeInitializerWithDefaultValues.java index fb80bcb29e10..4831f7484efc 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeInitializerWithDefaultValues.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeInitializerWithDefaultValues.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeInnerLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeInnerLoop.java index 67c61f65ad71..8eb3c7ac78af 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeInnerLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeInnerLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeNewlyCreatedArray.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeNewlyCreatedArray.java index edcd2413bc93..5c553fe933a8 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeNewlyCreatedArray.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeNewlyCreatedArray.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test { diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeRedundantLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeRedundantLoop.java index 5f3959228ea1..ab3b3104881a 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeRedundantLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeRedundantLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" import java.util.Arrays; import java.util.List; diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeUsedAfterLoop.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeUsedAfterLoop.java index 66568afaf709..554e181ffbf1 100644 --- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeUsedAfterLoop.java +++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeUsedAfterLoop.java @@ -1,4 +1,4 @@ -// "Delete element" "true" +// "Remove 'for' statement" "true" public class Test {