From bcafc90de6f8ea086dd000004c77598b41827e1e Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 11 Jun 2026 18:55:47 +0200 Subject: [PATCH] IJPL-245459 [java]: improve 2 intention names GitOrigin-RevId: 5fa28f365a9f7b80ae3c475c5a9c2aa3a4128d93 --- .../quickFix/convertToSingleReturn/afterBlankLine.java | 2 +- .../convertToSingleReturn/afterBooleanInnerLoop.java | 2 +- .../quickFix/convertToSingleReturn/afterBooleanLoop.java | 2 +- .../quickFix/convertToSingleReturn/afterBooleanLoopIf.java | 2 +- .../convertToSingleReturn/afterBooleanNestedIf.java | 2 +- .../quickFix/convertToSingleReturn/afterBooleanSimple.java | 2 +- .../convertToSingleReturn/afterChangedParameter.java | 2 +- .../quickFix/convertToSingleReturn/afterDefaultValue.java | 2 +- .../quickFix/convertToSingleReturn/afterDeleteFinished.java | 2 +- .../quickFix/convertToSingleReturn/afterForParameter.java | 2 +- .../quickFix/convertToSingleReturn/afterIntIfs.java | 2 +- .../quickFix/convertToSingleReturn/afterIntIfs2.java | 2 +- .../quickFix/convertToSingleReturn/afterIntRanges.java | 2 +- .../quickFix/convertToSingleReturn/afterIntRanges2.java | 2 +- .../convertToSingleReturn/afterMostPopularReturn.java | 2 +- .../convertToSingleReturn/afterNestedIfUnknown.java | 2 +- .../afterNestedIfUnknownLocalUsed.java | 2 +- .../convertToSingleReturn/afterNestedIfUnknownPlusCall.java | 2 +- .../quickFix/convertToSingleReturn/afterNonBlockInLoop.java | 2 +- .../quickFix/convertToSingleReturn/afterNonNulls.java | 2 +- .../quickFix/convertToSingleReturn/afterNonNulls2.java | 2 +- .../quickFix/convertToSingleReturn/afterNulls.java | 2 +- .../quickFix/convertToSingleReturn/afterNullsInBlock.java | 2 +- .../convertToSingleReturn/afterOneBranchDefault.java | 2 +- .../convertToSingleReturn/afterPreserveComments.java | 2 +- .../convertToSingleReturn/afterStatementsAfterReturn.java | 2 +- .../quickFix/convertToSingleReturn/afterSwitch.java | 2 +- .../quickFix/convertToSingleReturn/afterSynchronized.java | 2 +- .../quickFix/convertToSingleReturn/afterSynchronized2.java | 2 +- .../quickFix/convertToSingleReturn/afterTryCatch.java | 2 +- .../quickFix/convertToSingleReturn/afterTryCatch2.java | 2 +- .../quickFix/convertToSingleReturn/afterTryCatch3.java | 2 +- .../convertToSingleReturn/afterTwoBranchesDefault.java | 2 +- .../quickFix/convertToSingleReturn/afterUninit.java | 2 +- .../quickFix/convertToSingleReturn/afterVoidLoop.java | 2 +- .../convertToSingleReturn/afterVoidLoopNotFound.java | 2 +- .../quickFix/convertToSingleReturn/afterVoidSimple.java | 2 +- .../quickFix/convertToSingleReturn/beforeBlankLine.java | 2 +- .../convertToSingleReturn/beforeBooleanInnerLoop.java | 2 +- .../quickFix/convertToSingleReturn/beforeBooleanLoop.java | 2 +- .../quickFix/convertToSingleReturn/beforeBooleanLoopIf.java | 2 +- .../convertToSingleReturn/beforeBooleanNestedIf.java | 2 +- .../quickFix/convertToSingleReturn/beforeBooleanSimple.java | 2 +- .../convertToSingleReturn/beforeChangedParameter.java | 2 +- .../quickFix/convertToSingleReturn/beforeDefaultValue.java | 2 +- .../convertToSingleReturn/beforeDeleteFinished.java | 2 +- .../quickFix/convertToSingleReturn/beforeForParameter.java | 2 +- .../convertToSingleReturn/beforeIncompleteBlock.java | 2 +- .../quickFix/convertToSingleReturn/beforeIntIfs.java | 2 +- .../quickFix/convertToSingleReturn/beforeIntIfs2.java | 2 +- .../quickFix/convertToSingleReturn/beforeIntRanges.java | 2 +- .../quickFix/convertToSingleReturn/beforeIntRanges2.java | 2 +- .../convertToSingleReturn/beforeMostPopularReturn.java | 2 +- .../convertToSingleReturn/beforeNestedIfUnknown.java | 2 +- .../beforeNestedIfUnknownLocalUsed.java | 2 +- .../beforeNestedIfUnknownPlusCall.java | 2 +- .../convertToSingleReturn/beforeNonBlockInLoop.java | 2 +- .../quickFix/convertToSingleReturn/beforeNonNulls.java | 2 +- .../quickFix/convertToSingleReturn/beforeNonNulls2.java | 2 +- .../quickFix/convertToSingleReturn/beforeNulls.java | 2 +- .../quickFix/convertToSingleReturn/beforeNullsInBlock.java | 2 +- .../convertToSingleReturn/beforeOneBranchDefault.java | 2 +- .../convertToSingleReturn/beforePreserveComments.java | 2 +- .../convertToSingleReturn/beforeStatementsAfterReturn.java | 2 +- .../quickFix/convertToSingleReturn/beforeSwitch.java | 2 +- .../quickFix/convertToSingleReturn/beforeSynchronized.java | 2 +- .../quickFix/convertToSingleReturn/beforeSynchronized2.java | 2 +- .../quickFix/convertToSingleReturn/beforeTryCatch.java | 2 +- .../quickFix/convertToSingleReturn/beforeTryCatch2.java | 2 +- .../quickFix/convertToSingleReturn/beforeTryCatch3.java | 2 +- .../convertToSingleReturn/beforeTwoBranchesDefault.java | 2 +- .../quickFix/convertToSingleReturn/beforeUninit.java | 2 +- .../quickFix/convertToSingleReturn/beforeVoidLoop.java | 2 +- .../convertToSingleReturn/beforeVoidLoopNotFound.java | 2 +- .../quickFix/convertToSingleReturn/beforeVoidSimple.java | 2 +- java/openapi/resources/messages/JavaBundle.properties | 6 ++---- 76 files changed, 77 insertions(+), 79 deletions(-) diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBlankLine.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBlankLine.java index 4f4e09fb2927..087a55401424 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBlankLine.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBlankLine.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String s) { String result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanInnerLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanInnerLoop.java index 2ff4a15eef00..76455146e295 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanInnerLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanInnerLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean noEmptyStrings(String[][] list) { boolean result = true; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoop.java index f4ce47725838..3110141adff5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean hasEmptyString(List list) { boolean result = false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoopIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoopIf.java index 2910ba1f9541..caafa322d9c5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoopIf.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanLoopIf.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String[] arr) { boolean result = false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanNestedIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanNestedIf.java index 0122e200e1a3..96ff6b435a5e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanNestedIf.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanNestedIf.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String[] arr) { boolean result = true; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanSimple.java index e5eeec7f3067..f454005bf5d7 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanSimple.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterBooleanSimple.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String s) { boolean result = false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterChangedParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterChangedParameter.java index 610cce516817..9542e5ac2e92 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterChangedParameter.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterChangedParameter.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test2(List list, String foo, String bar) { String result = foo; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDefaultValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDefaultValue.java index a644df6788bb..97a2fdc91304 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDefaultValue.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDefaultValue.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int i) { String result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDeleteFinished.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDeleteFinished.java index bdb4b65999ee..edabf9ec06ba 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDeleteFinished.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterDeleteFinished.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { native String get(String s); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterForParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterForParameter.java index b24b3479aa9b..84140092f235 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterForParameter.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterForParameter.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class X { private static Integer testMultipleReturnPoints() { Integer result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs.java index 7791b382bd3e..844ab55b308f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { int result = 1; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs2.java index fc2037ca0325..33c478f33528 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntIfs2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { int result = 1; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges.java index ec741b19e2b1..5fb501d59917 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String[] strings) { int result = 0; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges2.java index fd0c35c2b89c..313329483db0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterIntRanges2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String[] strings) { int result = -1; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterMostPopularReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterMostPopularReturn.java index 702aa146a8dd..98daa84b6cf5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterMostPopularReturn.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterMostPopularReturn.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" import java.util.Collections; class Test { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknown.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknown.java index f197f92e87c0..cd882a4cbb60 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknown.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknown.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { String result = ""; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownLocalUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownLocalUsed.java index f773d709b19e..86768053f2cb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownLocalUsed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownLocalUsed.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { String res = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownPlusCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownPlusCall.java index 88c45d92f2d9..61dc6971f0d2 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownPlusCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNestedIfUnknownPlusCall.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { String result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonBlockInLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonBlockInLoop.java index a83b9f2ac04a..1d648353dedf 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonBlockInLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonBlockInLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test2(List list, String foo, String bar) { String result = bar; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls.java index 525fe7714498..715bb99295fc 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s, int x) { String result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls2.java index b819b316f549..a3a0413805c0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNonNulls2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s, int x) { String result; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNulls.java index 8d6a588ffcc6..31adc2b6ca77 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNulls.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNulls.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s) { String res = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNullsInBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNullsInBlock.java index 8d6a588ffcc6..31adc2b6ca77 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNullsInBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterNullsInBlock.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s) { String res = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterOneBranchDefault.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterOneBranchDefault.java index 20b878ea37ef..d4d9b6570d7d 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterOneBranchDefault.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterOneBranchDefault.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { private String nameByIndex(int colourIndex) { String result = "Blue"; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterPreserveComments.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterPreserveComments.java index 44ba3f9a3b45..7b8e225759c8 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterPreserveComments.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterPreserveComments.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int foo(int i) { int result = -1; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterStatementsAfterReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterStatementsAfterReturn.java index 697c6e4c9bbf..7e812eeab689 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterStatementsAfterReturn.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterStatementsAfterReturn.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String s) { return "foo"; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSwitch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSwitch.java index 09a6a4743637..8fccb8e6eefc 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSwitch.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSwitch.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { String result; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized.java index a3b351e5c839..35c95f8e1179 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { String result; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized2.java index ae73fb9421b8..cd09863d0c96 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterSynchronized2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { String result = null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch.java index 9663a3f99b94..468caef90d6c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { int result; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch2.java index 85906f1b8edb..d46d6e98056f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { int res = -2; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch3.java index 6728351e06e1..f73e4aaddb42 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTryCatch3.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { int res = -2; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTwoBranchesDefault.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTwoBranchesDefault.java index aee9a3cf5325..fe483b45f2ad 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTwoBranchesDefault.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterTwoBranchesDefault.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { private String nameByIndex(int colourIndex) { String result = "Blue"; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterUninit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterUninit.java index 27ec868102e3..fee85581d8c8 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterUninit.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterUninit.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test(String s) { boolean finished = false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoop.java index ec3beb0fdfa7..52cce064a9e1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String[] arr) { for(String s : arr) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoopNotFound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoopNotFound.java index 3e4952ed189b..a3cec492eba6 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoopNotFound.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidLoopNotFound.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String[] arr) { boolean finished = false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidSimple.java index f87959c7a916..5ff417f2ca66 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidSimple.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/afterVoidSimple.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String s) { if(s != null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBlankLine.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBlankLine.java index d5ef5b14b0c1..b024357346ab 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBlankLine.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBlankLine.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String s) { try { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanInnerLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanInnerLoop.java index 426f064c2117..206bab284755 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanInnerLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanInnerLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean noEmptyStrings(String[][] list) { for (String[] inner : list) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoop.java index aa69830f4b9a..561368910c26 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean hasEmptyString(List list) { for (String s : list) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoopIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoopIf.java index cb09f1db9b9c..73a71db1b174 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoopIf.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanLoopIf.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String[] arr) { if (arr != null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanNestedIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanNestedIf.java index 7d858c701b68..e530009932a6 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanNestedIf.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanNestedIf.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String[] arr) { if (arr == null) return false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanSimple.java index d8178743f5b0..69ec36dad57a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanSimple.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeBooleanSimple.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { boolean test(String s) { if(s == null) return false; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeChangedParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeChangedParameter.java index 2fb7205166c6..1138d71add87 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeChangedParameter.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeChangedParameter.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test2(List list, String foo, String bar) { for(String s : list) diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDefaultValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDefaultValue.java index 47137d9165ed..3205d184adcb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDefaultValue.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDefaultValue.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int i) { if (i > 0) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDeleteFinished.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDeleteFinished.java index f2ffa3a31a51..ec4c653ad050 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDeleteFinished.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeDeleteFinished.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { native String get(String s); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeForParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeForParameter.java index 7a3381a99e0a..e1da31bbd2be 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeForParameter.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeForParameter.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class X { private static Integer testMultipleReturnPoints() { try { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIncompleteBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIncompleteBlock.java index e97a4697beba..1c595fd34582 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIncompleteBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIncompleteBlock.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "false" +// "Transform method body to single exit-point form" "false" class Scratch { public Object foo(Object o) { if (o instanceof String) { return null; } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs.java index f18350fe7c57..192e49a0723d 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { if(s == null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs2.java index 261b82c1e899..3aab636f3cd9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntIfs2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { if(s == null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges.java index 9982c7876422..357f3396bcf6 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String[] strings) { for (String string : strings) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges2.java index 2d6b96b3364b..9104c4b7e833 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeIntRanges2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String[] strings) { for (String string : strings) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeMostPopularReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeMostPopularReturn.java index 0d6b8230189e..7f6eee3b3e17 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeMostPopularReturn.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeMostPopularReturn.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" import java.util.Collections; class Test { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknown.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknown.java index 8c630ffad447..d93202ed322a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknown.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknown.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { if (strings.length > 2) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownLocalUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownLocalUsed.java index 19168c660ccc..012c13df7ebc 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownLocalUsed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownLocalUsed.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { if (strings.length > 2) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownPlusCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownPlusCall.java index c4c576864320..7bcb4c3c7835 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownPlusCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNestedIfUnknownPlusCall.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String[] strings) { if (strings.length > 2) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonBlockInLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonBlockInLoop.java index 8d21ef7b6eed..c1fb72c4e3c9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonBlockInLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonBlockInLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test2(List list, String foo, String bar) { for(String s : list) diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls.java index eaef9410b6e7..95e315026c43 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s, int x) { if (x > 0) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls2.java index f674064f9bb2..0951add5f8c5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNonNulls2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s, int x) { if (x > 0) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNulls.java index f9149616734a..fcc4e8d6278b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNulls.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNulls.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s) { if (s == null) return null; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNullsInBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNullsInBlock.java index b80f03a64e20..9da87335698f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNullsInBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeNullsInBlock.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String process(String s) { if (s == null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeOneBranchDefault.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeOneBranchDefault.java index 7b9d3b5a6376..f979129ef178 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeOneBranchDefault.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeOneBranchDefault.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { private String nameByIndex(int colourIndex) { if (colourIndex == 1) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforePreserveComments.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforePreserveComments.java index 392aee064931..70a91ee16599 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforePreserveComments.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforePreserveComments.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int foo(int i) { // comment 1 diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeStatementsAfterReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeStatementsAfterReturn.java index 5de0a31fb86d..3afbcc58e121 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeStatementsAfterReturn.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeStatementsAfterReturn.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(String s) { return "foo"; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSwitch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSwitch.java index 86c1845a265f..528bf7021fb7 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSwitch.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSwitch.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { switch (x) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized.java index 2f268ceb99ef..951d603f4d01 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { synchronized(this) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized2.java index 2da36a417d02..fa59e00a0684 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeSynchronized2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { String test(int x) { synchronized(this) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch.java index 609b065d6cdc..ee92b34f4356 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { try { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch2.java index 88ee5a0024bb..26e911a776dd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch2.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { try { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch3.java index 6604b69bc291..fc15ad137353 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTryCatch3.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { int test(String s) { try { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTwoBranchesDefault.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTwoBranchesDefault.java index 0014e6188572..5e78ece1ffe0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTwoBranchesDefault.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeTwoBranchesDefault.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { private String nameByIndex(int colourIndex) { if (colourIndex == 1) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeUninit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeUninit.java index d8a8c0bc255f..21bfa24cfdcd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeUninit.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeUninit.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test(String s) { if (s != null) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoop.java index 36c8c556741f..2b910585972c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoop.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoop.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String[] arr) { for(String s : arr) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoopNotFound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoopNotFound.java index 8cb7b18efdb7..f8ba000b8895 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoopNotFound.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidLoopNotFound.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String[] arr) { for(String s : arr) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidSimple.java index f9d217e98d3a..7ad09f15fbd0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidSimple.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertToSingleReturn/beforeVoidSimple.java @@ -1,4 +1,4 @@ -// "Transform body to single exit-point form" "true-preview" +// "Transform method body to single exit-point form" "true-preview" class Test { void test2(String s) { if(s == null) return; diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties index 9611ce3615d1..2185723296a4 100644 --- a/java/openapi/resources/messages/JavaBundle.properties +++ b/java/openapi/resources/messages/JavaBundle.properties @@ -833,9 +833,7 @@ intention.compose.function.text=Replace nested function call with andThen call intention.convert.color.representation.family=Convert Color representation intention.convert.color.representation.text=Convert to ''new Color{0}'' intention.convert.compact.constructor.to.canonical=Convert compact constructor to canonical -intention.convert.to.single.return.name=Transform body to single exit-point form -intention.convert.to.single.return.progress.title=Transform body to single exit-point form -intention.convert.to.single.return.command.text=Transform Body To Single Exit-Point Form +intention.convert.to.single.return.name=Transform method body to single exit-point form intention.create.annotation.method.from.usage=Create @interface method ''{0}()'' intention.create.field.from.parameter.family=Create field for parameter intention.create.field.from.parameter.text=Create field for parameter ''{0}'' @@ -914,7 +912,7 @@ intention.split.filter.text=Split into filter chain intention.split.if.family=Split 'if' intention.split.if.text=Split into 2 'if' statements intention.split.switch.branch.with.several.case.values.copy.text=Copy 'switch' branch -intention.split.switch.branch.with.several.case.values.family=Split switch branch with several case values into individual 'switch' branches +intention.split.switch.branch.with.several.case.values.family=Split switch branch with several case values intention.split.switch.branch.with.several.case.values.split.text=Split values of 'switch' branch intention.surround.resource.with.ARM.block=Surround with try-with-resources block intention.surround.with.ARM.block.template=try-with-resources