diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index 6873e50d897..e9826450f15 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -3019,8 +3019,8 @@ language="kotlin" /> - light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -14,7 +14,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -23,7 +23,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function 'incorrectCatching' returning 'Result<Double>' without the corresponding function 'incorrect' returning 'Double' @@ -32,7 +32,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function 'strangeCatching' returning 'Result<Boolean>' without the corresponding function 'strange' returning 'Boolean' @@ -41,7 +41,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -50,7 +50,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -59,7 +59,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function 'classIncorrectCatching' returning 'Result<Double>' without the corresponding function 'classIncorrect' returning 'Double' @@ -68,7 +68,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -77,7 +77,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -86,7 +86,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function returning Result with a name that does not end with Catching @@ -95,7 +95,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function 'calcComplexCatching' returning 'Result<Double>' without the corresponding function 'calcComplex' returning 'Double' @@ -104,7 +104,7 @@ light_idea_test_case <default> - Function returning Result + Function returning Result directly Function 'extensionActCatching' returning 'Result<Int>' without the corresponding function 'extensionAct' returning 'Int' \ No newline at end of file diff --git a/idea/testData/inspections/coroutines/resultIsSuccessOrFailure/inspectionData/inspections.test b/idea/testData/inspections/coroutines/directUseOfResultType/inspectionData/inspections.test similarity index 62% rename from idea/testData/inspections/coroutines/resultIsSuccessOrFailure/inspectionData/inspections.test rename to idea/testData/inspections/coroutines/directUseOfResultType/inspectionData/inspections.test index 8593daf400f..1a4127605f3 100644 --- a/idea/testData/inspections/coroutines/resultIsSuccessOrFailure/inspectionData/inspections.test +++ b/idea/testData/inspections/coroutines/directUseOfResultType/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.coroutines.ResultIsResultInspection +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.coroutines.DirectUseOfResultTypeInspection diff --git a/idea/testData/inspections/coroutines/resultIsSuccessOrFailure/test.kt b/idea/testData/inspections/coroutines/directUseOfResultType/test.kt similarity index 100% rename from idea/testData/inspections/coroutines/resultIsSuccessOrFailure/test.kt rename to idea/testData/inspections/coroutines/directUseOfResultType/test.kt diff --git a/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/.inspection b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/.inspection new file mode 100644 index 00000000000..15fc03dc2b5 --- /dev/null +++ b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/.inspection @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.inspections.coroutines.DirectUseOfResultTypeInspection diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/abstract.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/abstract.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/abstract.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/abstract.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/anonymous.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/anonymous.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/anonymous.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/anonymous.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/complexBlock.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/complexBlock.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/complexBlock.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/complexBlock.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaSimple.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaSimple.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaSimple.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaSimple.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithPartialReturn.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithPartialReturn.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithPartialReturn.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithPartialReturn.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithReturn.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithReturn.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithReturn.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithReturn.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/needParentheses.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/needParentheses.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/needParentheses.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/needParentheses.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/rename.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/rename.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/rename.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/rename.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/result.lib.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/result.lib.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simple.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simple.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simple.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simple.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simpleBlock.kt similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simpleBlock.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after b/idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simpleBlock.kt.after similarity index 100% rename from idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after rename to idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simpleBlock.kt.after diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/.inspection b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/.inspection deleted file mode 100644 index 2472e3b1763..00000000000 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/.inspection +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.inspections.coroutines.ResultIsResultInspection diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java index 5b4a7fd67a1..e031aa1562f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java @@ -144,9 +144,9 @@ public class InspectionTestGenerated extends AbstractInspectionTest { runTest("idea/testData/inspections/coroutines/asyncResultUnused/inspectionData/inspections.test"); } - @TestMetadata("coroutines/resultIsSuccessOrFailure/inspectionData/inspections.test") - public void testCoroutines_resultIsSuccessOrFailure_inspectionData_Inspections_test() throws Exception { - runTest("idea/testData/inspections/coroutines/resultIsSuccessOrFailure/inspectionData/inspections.test"); + @TestMetadata("coroutines/directUseOfResultType/inspectionData/inspections.test") + public void testCoroutines_directUseOfResultType_inspectionData_Inspections_test() throws Exception { + runTest("idea/testData/inspections/coroutines/directUseOfResultType/inspectionData/inspections.test"); } @TestMetadata("dataClassPrivateConstructor/inspectionData/inspections.test") diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 400425147e4..597b20c7e94 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -1990,6 +1990,69 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/coroutines"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } + @TestMetadata("idea/testData/inspectionsLocal/coroutines/directUseOfResultType") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DirectUseOfResultType extends AbstractLocalInspectionTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + @TestMetadata("abstract.kt") + public void testAbstract() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/abstract.kt"); + } + + public void testAllFilesPresentInDirectUseOfResultType() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/coroutines/directUseOfResultType"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("anonymous.kt") + public void testAnonymous() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/anonymous.kt"); + } + + @TestMetadata("complexBlock.kt") + public void testComplexBlock() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/complexBlock.kt"); + } + + @TestMetadata("lambdaSimple.kt") + public void testLambdaSimple() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaSimple.kt"); + } + + @TestMetadata("lambdaWithPartialReturn.kt") + public void testLambdaWithPartialReturn() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithPartialReturn.kt"); + } + + @TestMetadata("lambdaWithReturn.kt") + public void testLambdaWithReturn() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/lambdaWithReturn.kt"); + } + + @TestMetadata("needParentheses.kt") + public void testNeedParentheses() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/needParentheses.kt"); + } + + @TestMetadata("rename.kt") + public void testRename() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/rename.kt"); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simple.kt"); + } + + @TestMetadata("simpleBlock.kt") + public void testSimpleBlock() throws Exception { + runTest("idea/testData/inspectionsLocal/coroutines/directUseOfResultType/simpleBlock.kt"); + } + } + @TestMetadata("idea/testData/inspectionsLocal/coroutines/redundantAsync") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -2055,69 +2118,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { runTest("idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt"); } } - - @TestMetadata("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ResultIsSuccessOrFailure extends AbstractLocalInspectionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - @TestMetadata("abstract.kt") - public void testAbstract() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt"); - } - - public void testAllFilesPresentInResultIsSuccessOrFailure() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); - } - - @TestMetadata("anonymous.kt") - public void testAnonymous() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt"); - } - - @TestMetadata("complexBlock.kt") - public void testComplexBlock() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt"); - } - - @TestMetadata("lambdaSimple.kt") - public void testLambdaSimple() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt"); - } - - @TestMetadata("lambdaWithPartialReturn.kt") - public void testLambdaWithPartialReturn() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt"); - } - - @TestMetadata("lambdaWithReturn.kt") - public void testLambdaWithReturn() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt"); - } - - @TestMetadata("needParentheses.kt") - public void testNeedParentheses() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt"); - } - - @TestMetadata("rename.kt") - public void testRename() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt"); - } - - @TestMetadata("simpleBlock.kt") - public void testSimpleBlock() throws Exception { - runTest("idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt"); - } - } } @TestMetadata("idea/testData/inspectionsLocal/delegationToVarProperty")