azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress RESULT_CLASS_IN_RETURN_TYPE in ResultIsResultInspection tests

Browse Source 
This fixes four relevant inspection tests
This commit is contained in:
Mikhail Glukhikh
2018-09-12 18:21:27 +03:00
parent 54e7fe6c52
commit 2e2b15853e
8 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt
Vendored
+1
View File
@@ -6,6 +6,7 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <T> runCatching(block: () -> T) = Result(block()) fun <T> runCatching(block: () -> T) = Result(block())
fun correct(arg: Boolean) = runCatching<caret> { if (arg) throw AssertionError("") else 12 }.getOrThrow() fun correct(arg: Boolean) = runCatching<caret> { if (arg) throw AssertionError("") else 12 }.getOrThrow()
idea/testData/inspectionsLocal/coroutines/redundantRunCatching/simple.kt.after
Vendored
+1
View File
@@ -6,6 +6,7 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <T> runCatching(block: () -> T) = Result(block()) fun <T> runCatching(block: () -> T) = Result(block())
fun correct(arg: Boolean) = run { if (arg) throw AssertionError("") else 12 } fun correct(arg: Boolean) = run { if (arg) throw AssertionError("") else 12 }
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt
Vendored
+1
View File
@@ -7,6 +7,7 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <caret>incorrectBlock(arg: Boolean, arg2: Boolean?): Result<Int> { fun <caret>incorrectBlock(arg: Boolean, arg2: Boolean?): Result<Int> {
if (arg) { if (arg) {
class Local { class Local {
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after
Vendored
+1
View File
@@ -7,6 +7,7 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun incorrectBlock(arg: Boolean, arg2: Boolean?): Int { fun incorrectBlock(arg: Boolean, arg2: Boolean?): Int {
if (arg) { if (arg) {
class Local { class Local {
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt
Vendored
+2
View File
@@ -4,7 +4,9 @@ package kotlin
class Result<T>(val value: T?) { class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
operator fun plus(other: Result<T>) = other operator fun plus(other: Result<T>) = other
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <caret>incorrect() = Result("123") + Result("456") fun <caret>incorrect() = Result("123") + Result("456")
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after
Vendored
+2
View File
@@ -4,7 +4,9 @@ package kotlin
class Result<T>(val value: T?) { class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
operator fun plus(other: Result<T>) = other operator fun plus(other: Result<T>) = other
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun incorrect() = (Result("123") + Result("456")).getOrThrow() fun incorrect() = (Result("123") + Result("456")).getOrThrow()
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt
Vendored
+1
View File
@@ -5,4 +5,5 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <caret>incorrect() = Result("123") fun <caret>incorrect() = Result("123")
idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after
Vendored
+1
View File
@@ -5,4 +5,5 @@ class Result<T>(val value: T?) {
fun getOrThrow(): T = value ?: throw AssertionError("") fun getOrThrow(): T = value ?: throw AssertionError("")
} }
@Suppress("RESULT_CLASS_IN_RETURN_TYPE")
fun <caret>incorrectCatching() = Result("123") fun <caret>incorrectCatching() = Result("123")