From 2e2b15853ebf64f26b4fa473fa034e76951fa2a8 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 12 Sep 2018 18:21:27 +0300 Subject: [PATCH] Suppress RESULT_CLASS_IN_RETURN_TYPE in ResultIsResultInspection tests This fixes four relevant inspection tests --- .../inspectionsLocal/coroutines/redundantRunCatching/simple.kt | 1 + .../coroutines/redundantRunCatching/simple.kt.after | 1 + .../coroutines/resultIsSuccessOrFailure/complexBlock.kt | 1 + .../coroutines/resultIsSuccessOrFailure/complexBlock.kt.after | 1 + .../coroutines/resultIsSuccessOrFailure/needParentheses.kt | 2 ++ .../resultIsSuccessOrFailure/needParentheses.kt.after | 2 ++ .../coroutines/resultIsSuccessOrFailure/rename.kt | 1 + .../coroutines/resultIsSuccessOrFailure/rename.kt.after | 1 + 8 files changed, 10 insertions(+) diff --git a/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt b/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt index 31b0297a26e..a47738f645e 100644 --- a/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt +++ b/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt @@ -6,6 +6,7 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun runCatching(block: () -> T) = Result(block()) fun correct(arg: Boolean) = runCatching { if (arg) throw AssertionError("") else 12 }.getOrThrow() diff --git a/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt.after b/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt.after index 08774304918..3de777f1924 100644 --- a/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt.after @@ -6,6 +6,7 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun runCatching(block: () -> T) = Result(block()) fun correct(arg: Boolean) = run { if (arg) throw AssertionError("") else 12 } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt index 7d9fbc896e1..339241f0076 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt @@ -7,6 +7,7 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrectBlock(arg: Boolean, arg2: Boolean?): Result { if (arg) { class Local { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after index 272921fd2f4..98ca6d08fe1 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after @@ -7,6 +7,7 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrectBlock(arg: Boolean, arg2: Boolean?): Int { if (arg) { class Local { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt index c84a0006e72..1f756bf93ab 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt @@ -4,7 +4,9 @@ package kotlin class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") + @Suppress("RESULT_CLASS_IN_RETURN_TYPE") operator fun plus(other: Result) = other } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrect() = Result("123") + Result("456") diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after index e60c1a75f6b..c220e421cc0 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after @@ -4,7 +4,9 @@ package kotlin class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") + @Suppress("RESULT_CLASS_IN_RETURN_TYPE") operator fun plus(other: Result) = other } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrect() = (Result("123") + Result("456")).getOrThrow() diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt index c3ca9a4eefd..0155f729075 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt @@ -5,4 +5,5 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrect() = Result("123") diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after index cb49ccf7263..fcced454704 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after @@ -5,4 +5,5 @@ class Result(val value: T?) { fun getOrThrow(): T = value ?: throw AssertionError("") } +@Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrectCatching() = Result("123")