From 93fff99d8d7d2c9a63d174043265605af705b387 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 28 Nov 2018 13:57:28 +0300 Subject: [PATCH] Extract stub library file from "Result is Result" inspection tests --- .../coroutines/resultIsSuccessOrFailure/abstract.kt | 4 ---- .../resultIsSuccessOrFailure/abstract.kt.after | 4 ---- .../coroutines/resultIsSuccessOrFailure/anonymous.kt | 4 ---- .../resultIsSuccessOrFailure/anonymous.kt.after | 4 ---- .../coroutines/resultIsSuccessOrFailure/complexBlock.kt | 4 ---- .../resultIsSuccessOrFailure/complexBlock.kt.after | 4 ---- .../coroutines/resultIsSuccessOrFailure/lambdaSimple.kt | 4 ---- .../resultIsSuccessOrFailure/lambdaSimple.kt.after | 4 ---- .../resultIsSuccessOrFailure/lambdaWithPartialReturn.kt | 4 ---- .../lambdaWithPartialReturn.kt.after | 4 ---- .../resultIsSuccessOrFailure/lambdaWithReturn.kt | 4 ---- .../resultIsSuccessOrFailure/lambdaWithReturn.kt.after | 4 ---- .../resultIsSuccessOrFailure/needParentheses.kt | 7 ------- .../resultIsSuccessOrFailure/needParentheses.kt.after | 7 ------- .../coroutines/resultIsSuccessOrFailure/rename.kt | 4 ---- .../coroutines/resultIsSuccessOrFailure/rename.kt.after | 4 ---- .../coroutines/resultIsSuccessOrFailure/result.lib.kt | 9 +++++++++ .../coroutines/resultIsSuccessOrFailure/simple.kt | 4 ---- .../coroutines/resultIsSuccessOrFailure/simple.kt.after | 4 ---- .../coroutines/resultIsSuccessOrFailure/simpleBlock.kt | 4 ---- .../resultIsSuccessOrFailure/simpleBlock.kt.after | 4 ---- 21 files changed, 9 insertions(+), 86 deletions(-) create mode 100644 idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt index eca0fa2cc49..ee587a2cdf2 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt @@ -1,10 +1,6 @@ // FIX: Unwrap 'Result' return type (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - abstract class Abstract { abstract fun foo(): Result } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after index 298ec69dc8f..ad590b060f9 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/abstract.kt.after @@ -1,10 +1,6 @@ // FIX: Unwrap 'Result' return type (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - abstract class Abstract { abstract fun foo(): Int } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt index 18e1d1fef52..d520b4d27d8 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = fun() = Result("123") } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after index 0ed75a0da15..66c3da061f4 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/anonymous.kt.after @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = fun() = Result("123").getOrThrow() } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt index 339241f0076..86dae3ce116 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt @@ -3,10 +3,6 @@ package kotlin -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) { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after index 98ca6d08fe1..9ea1736d824 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/complexBlock.kt.after @@ -3,10 +3,6 @@ package kotlin -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) { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt index 054a6d60da8..af81384e572 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = { Result(true) } } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after index 40720e00bf4..9c1d6c2d0e1 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaSimple.kt.after @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = { Result(true).getOrThrow() } } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt index b41a5bcaa70..c9a9490aaa7 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test(arg: Boolean) { val x = foo@{ if (!arg) { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after index 130de70bf80..8d979634680 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithPartialReturn.kt.after @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test(arg: Boolean) { val x = foo@{ (if (!arg) { diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt index 980f2e9966b..e210be0474f 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = foo@{ return@foo Result(true) } } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after index e7b645afe21..2ce344b37b8 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/lambdaWithReturn.kt.after @@ -1,9 +1,5 @@ package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun test() { val x = foo@{ return@foo Result(true).getOrThrow() } } diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt index 1f756bf93ab..7873cfa83aa 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt @@ -1,12 +1,5 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) 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 c220e421cc0..54e6e2a9257 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/needParentheses.kt.after @@ -1,12 +1,5 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) 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 0155f729075..358cac85bef 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt @@ -1,9 +1,5 @@ // FIX: Rename to 'incorrectCatching' package kotlin -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 fcced454704..1d8376d85b1 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/rename.kt.after @@ -1,9 +1,5 @@ // FIX: Rename to 'incorrectCatching' package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - @Suppress("RESULT_CLASS_IN_RETURN_TYPE") fun incorrectCatching() = Result("123") diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt new file mode 100644 index 00000000000..bf05ff628dd --- /dev/null +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/result.lib.kt @@ -0,0 +1,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 +} + diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt index 7b87764cfcf..e9258655f1f 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt @@ -1,8 +1,4 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun incorrect() = Result("123") diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after index 936cd9048d5..13363ae57ae 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simple.kt.after @@ -1,8 +1,4 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun incorrect() = Result("123").getOrThrow() diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt index 471d2dee293..174a8a771a3 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt @@ -1,10 +1,6 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun incorrectBlock(arg: Boolean, arg2: Boolean?): Result { if (arg) { return Result(1) diff --git a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after index a077719ec33..9c565aceb64 100644 --- a/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after +++ b/idea/testData/inspectionsLocal/coroutines/resultIsSuccessOrFailure/simpleBlock.kt.after @@ -1,10 +1,6 @@ // FIX: Add '.getOrThrow()' to function result (breaks use-sites!) package kotlin -class Result(val value: T?) { - fun getOrThrow(): T = value ?: throw AssertionError("") -} - fun incorrectBlock(arg: Boolean, arg2: Boolean?): Int { if (arg) { return Result(1).getOrThrow()