From 9fbe901e0df4758a1f57092065889fa96bac2a69 Mon Sep 17 00:00:00 2001 From: Pavel Dolgov Date: Thu, 29 Nov 2018 13:06:44 +0300 Subject: [PATCH] Java: Better wording in warning message and quick fix title (IDEA-202622) --- .../switchLabeledRuleCanBeCodeBlock/InExpression.java | 4 ++-- .../afterCallInExpression.java | 2 +- .../afterConstInExpression.java | 2 +- .../beforeCallInExpression.java | 2 +- .../beforeConstInExpression.java | 2 +- .../src/messages/InspectionsBundle.properties | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InExpression.java b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InExpression.java index 4e0262c4ad85..fd94fde4a5ae 100644 --- a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InExpression.java +++ b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InExpression.java @@ -1,12 +1,12 @@ class C { String foo(int n) { return switch (n) { - case 1 -> Integer.toString(n); + case 1 -> Integer.toString(n); case 2 -> { break Integer.toString(n); } case 3 -> throw new RuntimeException(); case 4 -> { throw new RuntimeException(); } case 5 -> { break "a";} - default -> "b"; + default -> "b"; }; } } \ No newline at end of file diff --git a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterCallInExpression.java b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterCallInExpression.java index 91f7eda7843c..584529a3c9df 100644 --- a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterCallInExpression.java +++ b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterCallInExpression.java @@ -1,4 +1,4 @@ -// "Wrap labeled rule's result with code block" "GENERIC_ERROR_OR_WARNING" +// "Wrap labeled rule's result expression with code block" "GENERIC_ERROR_OR_WARNING" class C { String foo(int n) { return switch (n) { diff --git a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterConstInExpression.java b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterConstInExpression.java index 466f79f67b45..e2a80e650473 100644 --- a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterConstInExpression.java +++ b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/afterConstInExpression.java @@ -1,4 +1,4 @@ -// "Wrap labeled rule's result with code block" "GENERIC_ERROR_OR_WARNING" +// "Wrap labeled rule's result expression with code block" "GENERIC_ERROR_OR_WARNING" class C { String foo(int n) { return switch (n) { diff --git a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeCallInExpression.java b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeCallInExpression.java index fafdc4fe88e5..84e730dcb877 100644 --- a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeCallInExpression.java +++ b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeCallInExpression.java @@ -1,4 +1,4 @@ -// "Wrap labeled rule's result with code block" "GENERIC_ERROR_OR_WARNING" +// "Wrap labeled rule's result expression with code block" "GENERIC_ERROR_OR_WARNING" class C { String foo(int n) { return switch (n) { diff --git a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeConstInExpression.java b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeConstInExpression.java index fcdcdc26b08d..d9ae3cf59d4c 100644 --- a/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeConstInExpression.java +++ b/java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlockFix/beforeConstInExpression.java @@ -1,4 +1,4 @@ -// "Wrap labeled rule's result with code block" "GENERIC_ERROR_OR_WARNING" +// "Wrap labeled rule's result expression with code block" "GENERIC_ERROR_OR_WARNING" class C { String foo(int n) { return switch (n) { diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index c83ca9a9a8da..a0e1468f580c 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -1038,9 +1038,9 @@ inspection.duplicate.branches.in.switch.fix.family.name=Merge duplicate branches inspection.duplicate.branches.in.switch.fix.name=Merge with ''{0}:'' inspection.switch.labeled.rule.can.be.code.block.display.name=Labeled switch rule can have code block -inspection.switch.labeled.rule.can.be.code.block.expression.message=Labeled rule's result can be wrapped with code block +inspection.switch.labeled.rule.can.be.code.block.expression.message=Labeled rule's result expression can be wrapped with code block inspection.switch.labeled.rule.can.be.code.block.statement.message=Labeled rule's statement can be wrapped with code block -inspection.switch.labeled.rule.can.be.code.block.fix.expression.name=Wrap labeled rule's result with code block +inspection.switch.labeled.rule.can.be.code.block.fix.expression.name=Wrap labeled rule's result expression with code block inspection.switch.labeled.rule.can.be.code.block.fix.statement.name=Wrap labeled rule's statement with code block inspection.labeled.switch.rule.redundant.code.block.display.name=Labeled switch rule has redundant code block