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

Convert IfThenToElvisIntention to inspection & decrease severity to INFO

Browse Source 
#KT-16067 Fixed
This commit is contained in:
Dmitry Gridin
2019-06-03 20:27:35 +07:00
parent d8f32b1a0c
commit f2accb7b9e
101 changed files with 498 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/branched/ifThenToElvis/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention
idea/testData/intentions/branched/ifThenToElvis/applicableForLocalStableVar.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// WITH_RUNTIME
fun maybeFoo(): String? {
return "foo"
}
fun test(): String? {
var foo = maybeFoo()
val bar = if (foo == null<caret>)
"hello"
else
foo
return foo
}
idea/testData/intentions/branched/ifThenToElvis/applicableForLocalStableVar.kt.after
Vendored
-10
View File
@@ -1,10 +0,0 @@
// WITH_RUNTIME
fun maybeFoo(): String? {
return "foo"
}
fun test(): String? {
var foo = maybeFoo()
val bar = foo ?: "hello"
return foo
}
idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo: String? = null
val bar = "bar"
if (foo != null<caret>) {
doSomething ("Hello")
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = null
val a = "a"
val b = "b"
if (foo != null<caret>) {
a
}
else {
b
}
}
idea/testData/intentions/branched/ifThenToElvis/comparisonInElse.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// See KT-15227
class My(val local: Boolean)
class Your(val my: My?, val parent: Any?)
fun foo(your: Your): Boolean {
val my = your.my
return <caret>if (my != null) my.local else your.parent != null
}
idea/testData/intentions/branched/ifThenToElvis/comparisonInElse.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
// See KT-15227
class My(val local: Boolean)
class Your(val my: My?, val parent: Any?)
fun foo(your: Your): Boolean {
val my = your.my
return my?.local ?: (your.parent != null)
}
idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
if (null == <caret>null) {
foo
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// IS_APPLICABLE: false
operator fun <T> T.compareTo(a: T): Int = 0
fun main(args: Array<String>) {
val foo = null
val bar = "bar"
if (foo > null<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// IS_APPLICABLE: false
// ERROR: Type mismatch: inferred type is Int but Boolean was expected
// ERROR: Type mismatch: inferred type is Int but Boolean was expected
// ERROR: Operator call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'.
fun main(args: Array<String>) {
val foo: Int? = 4
val bar = 3
if (foo * 10<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/doesNotInlineVariableInMultiDeclaration.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Replace 'if' expression with elvis expression" "true"
data class IntPair(val first: Int?, val second: Int?)
fun f(pair: IntPair): Int {
val (x, y) = pair
return if (x != <caret>null) x else 5
}
idea/testData/intentions/branched/ifThenToElvis/doesNotInlineVariableInMultiDeclaration.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// "Replace 'if' expression with elvis expression" "true"
data class IntPair(val first: Int?, val second: Int?)
fun f(pair: IntPair): Int {
val (x, y) = pair
return x ?: 5
}
idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
fun <T> doSomething(a: T) {}
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
val bar = "bar"
if (foo != null<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun <T> doSomething(a: T) {}
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
val bar = "bar"
foo ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
val x = maybeFoo()
fun main(args: Array<String>) {
if (x !=<caret> null) {
x
} else {
"abc"
}
}
idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
val x = maybeFoo()
fun main(args: Array<String>) {
x ?: "abc"
}
idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = "foo"
val bar = "foo"
if (<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = null
if (foo != null<caret>) {
foo
}
else {
}
}
idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
val bar = "bar"
if (foo == null<caret>) {
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/extensionFunctionInClass.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class Foo {
fun Foo.bar(): Int = 1
}
fun Foo.test(foo: Foo?): Int = <caret>if (foo == null) { 0 } else { foo.bar() }
idea/testData/intentions/branched/ifThenToElvis/extensionFunctionInClass.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class Foo {
fun Foo.bar(): Int = 1
}
fun Foo.test(foo: Foo?): Int = foo?.bar() ?: 0
idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
if (foo != null<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
if (foo != null<caret>)
foo
else
bar
}
idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
val x = if (foo == null<caret>) {
bar
}
else {
foo
}
}
idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
val x = maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
val x = "baz" + if (foo == null<caret>) bar else foo
}
idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
val x = "baz" + (maybeFoo() ?: bar)
}
idea/testData/intentions/branched/ifThenToElvis/ifToElvisSwallowComments.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun foo(arg: Any): Int {
// 1
return <caret>if (arg is Int) arg
// 2
else 10
}
idea/testData/intentions/branched/ifThenToElvis/ifToElvisSwallowComments.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun foo(arg: Any): Int {
// 1
return arg as? Int
// 2
?: 10
}
idea/testData/intentions/branched/ifThenToElvis/implicitReceiver.kt
Vendored
-2
View File
@@ -1,2 +0,0 @@
// WITH_RUNTIME
fun String?.foo() = <caret>if (this == null) true else isEmpty()
idea/testData/intentions/branched/ifThenToElvis/implicitReceiver.kt.after
Vendored
-2
View File
@@ -1,2 +0,0 @@
// WITH_RUNTIME
fun String?.foo() = this?.isEmpty() ?: true
idea/testData/intentions/branched/ifThenToElvis/inspectionData/expected.xml
Vendored
-90
View File
@@ -1,90 +0,0 @@
<problems>
<problem>
<file>willNotInlineClassProperty.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/willNotInlineClassProperty.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>ifAsExpression.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAsExpression.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>ifAsPartOfExpression.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAsPartOfExpression.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>doesNotInlineVariableInMultiDeclaration.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/doesNotInlineVariableInMultiDeclaration.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'.</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>nullCheckWithSelector.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="nullCheckWithSelector.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>nullCheckWithSelectorCall.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="nullCheckWithSelectorCall.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>nullCheckWithSelectorCallChain.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="nullCheckWithSelectorCallChain.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>comparisonInElse.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/comparisonInElse.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>implicitReceiver.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/implicitReceiver.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>applicableForLocalStableVar.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/applicableForLocalStableVar.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
<problem>
<file>extensionFunctionInClass.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/extensionFunctionInClass.kt" />
<problem_class severity="INFO" attribute_key="INFO_ATTRIBUTES">If-Then foldable to '?:'</problem_class>
<description>Replace 'if' expression with elvis expression</description>
</problem>
</problems>
idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test
Vendored
-2
View File
@@ -1,2 +0,0 @@
// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisInspection
// WITH_RUNTIME
idea/testData/intentions/branched/ifThenToElvis/isCheck.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): My {
return if (<caret>arg is My) arg else My(42)
}
idea/testData/intentions/branched/ifThenToElvis/isCheck.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): My {
return arg as? My ?: My(42)
}
idea/testData/intentions/branched/ifThenToElvis/isCheckForNullableType.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun foo(x: CharSequence?) {
val y = if (x is String?) {
x
}
else {
(x as CharSequence).toString()
}<caret>
}
idea/testData/intentions/branched/ifThenToElvis/isCheckForUnrelatedType.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// IS_APPLICABLE: false
interface A
interface B
fun prepare(x: A) = x
fun use(x: A) {}
fun test(x: A) {
val xx = <caret>if (x is B) x else prepare(x)
use(xx)
}
idea/testData/intentions/branched/ifThenToElvis/isCheckWithSelector.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): Int {
return if (<caret>arg is My) arg.x else 42
}
idea/testData/intentions/branched/ifThenToElvis/isCheckWithSelector.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): Int {
return (arg as? My)?.x ?: 42
}
idea/testData/intentions/branched/ifThenToElvis/isCheckWithSelectorChain.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): Int {
return if (<caret>arg is My) arg.x.hashCode() else 42
}
idea/testData/intentions/branched/ifThenToElvis/isCheckWithSelectorChain.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): Int {
return (arg as? My)?.x?.hashCode() ?: 42
}
idea/testData/intentions/branched/ifThenToElvis/kt19666.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// WITH_RUNTIME
interface Taggable {
val tag: String
}
fun Any.log() {
val tag = <caret>if (this is Taggable) {
tag
}
else {
this::class.java.simpleName
}
}
idea/testData/intentions/branched/ifThenToElvis/kt19666.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// WITH_RUNTIME
interface Taggable {
val tag: String
}
fun Any.log() {
val tag = (this as? Taggable)?.tag ?: this::class.java.simpleName
}
idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
if (foo == null<caret>)
bar
else
foo
}
idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val bar = "bar"
if (foo != null<caret>)
foo
else
bar
}
idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo == null<caret>) {
null
}
}
idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
val bar = "bar"
if (foo != null<caret>)
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/noCondition.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
val bar = "bar"
if<caret> {
foo
} else bar
}
idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = "foo"
val bar = "bar"
if (foo == bar<caret>) {
foo
}
else {
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
//IS_APPLICABLE: false
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
if (maybeFoo() == null<caret>)
maybeFoo()
else
"bar"
}
idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalUnstableVar.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
fun maybeFoo(): String? {
return "foo"
}
fun capture(block: () -> Unit): Unit = Unit
fun test(): String? {
var foo = maybeFoo()
capture {
foo = null
}
val bar = if (foo == null<caret>)
42
else
foo
return foo
}
idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleKotlinNPE.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
fun main(args: Array<String>) {
val t: String? = "abc"
if (t != null<caret>) t else throw KotlinNullPointerException()
}
idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleNPE.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
fun main(args: Array<String>) {
val t: String? = "abc"
if (t == null<caret>) throw NullPointerException() else t
}
idea/testData/intentions/branched/ifThenToElvis/notIsCheck.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): My {
return if (<caret>arg !is My) My(42) else arg
}
idea/testData/intentions/branched/ifThenToElvis/notIsCheck.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): My {
return arg as? My ?: My(42)
}
idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo == null<caret>) {
null
}
else {
foo
}
}
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelector.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: My?): Int {
return if (<caret>arg != null) arg.x else 42
}
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelector.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: My?): Int {
return arg?.x ?: 42
}
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelectorCall.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
val nullableString: String? = "abc"
val foo = if (<caret>nullableString != null) {
nullableString.toUpperCase()
} else {
""
}
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelectorCall.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
val nullableString: String? = "abc"
val foo = nullableString?.toUpperCase() ?: ""
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelectorCallChain.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// WITH_RUNTIME
val nullableString: String? = "abc"
val foo = if (<caret>nullableString != null) {
nullableString.toUpperCase().toLowerCase()
} else {
""
}
idea/testData/intentions/branched/ifThenToElvis/nullCheckWithSelectorCallChain.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
val nullableString: String? = "abc"
val foo = nullableString?.toUpperCase()?.toLowerCase() ?: ""
idea/testData/intentions/branched/ifThenToElvis/nullableResultWithImplicitReceiver.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
class Something {
fun nullable(): Int? = null
}
fun Something?.nullable(value: Int): Int? =
<caret>if (this == null) value else nullable()
idea/testData/intentions/branched/ifThenToElvis/nullableThen.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
fun foo(p: String?): String? {
return <caret>if (p != null) p.bar() else "a"
}
fun String.bar(): String? = null
idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo: String? = null
val bar = "bar"
if (foo != null<caret>) {
foo
}
else {
doSomething("Hello")
bar
}
}
idea/testData/intentions/branched/ifThenToElvis/replaceWithLet.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// WITH_RUNTIME
fun foo(s: String?) {
val x = <caret>if (s != null) {
bar(s)
}
else {
13
}
}
fun bar(s: String): Int = 42
idea/testData/intentions/branched/ifThenToElvis/replaceWithLet.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
fun foo(s: String?) {
val x = s?.let { bar(it) } ?: 13
}
fun bar(s: String): Int = 42
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetAndRenameIt.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// WITH_RUNTIME
fun foo(it: String?) {
val x = <caret>if (it != null) {
bar(it)
}
else {
13
}
}
fun bar(s: String): Int = 42
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetAndRenameIt.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// WITH_RUNTIME
fun foo(it: String?) {
val x = it?.let { it1 -> bar(it1) } ?: 13
}
fun bar(s: String): Int = 42
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetInMember.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// WITH_RUNTIME
class Test {
fun doAThing(param1: String): String {
return param1
}
fun doAThingIfPresent(param1: String?): String {
return <caret>if (param1 != null) {
doAThing(param1)
} else {
""
}
}
}
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetInMember.kt.after
Vendored
-11
View File
@@ -1,11 +0,0 @@
// WITH_RUNTIME
class Test {
fun doAThing(param1: String): String {
return param1
}
fun doAThingIfPresent(param1: String?): String {
return param1?.let { doAThing(it) } ?: ""
}
}
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetInMemberWithIs.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// WITH_RUNTIME
class Test {
fun doAThing(param1: String): String {
return param1
}
fun doAThingIfPresent(param1: Any?): String {
return <caret>if (param1 is String) {
doAThing(param1)
} else {
""
}
}
}
idea/testData/intentions/branched/ifThenToElvis/replaceWithLetInMemberWithIs.kt.after
Vendored
-11
View File
@@ -1,11 +0,0 @@
// WITH_RUNTIME
class Test {
fun doAThing(param1: String): String {
return param1
}
fun doAThingIfPresent(param1: Any?): String {
return (param1 as? String)?.let { doAThing(it) } ?: ""
}
}
idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
val foo = maybeFoo()
if (null == foo<caret>)
bar
else
foo
}
idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val bar = "bar"
maybeFoo() ?: bar
}
idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun bar(): String = "bar"
fun main(args: Array<String>) {
val foo = maybeFoo()
if (null != foo<caret>)
foo
else
bar()
}
idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun bar(): String = "bar"
fun main(args: Array<String>) {
maybeFoo() ?: bar()
}
idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = null
if (foo == null<caret>) {
null
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// WITH_RUNTIME
fun main(args: Array<String>) {
val t: String? = "abc"
if (t != null<caret>) t else throw NullPointerException("'t' must not be null")
}
idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// WITH_RUNTIME
fun main(args: Array<String>) {
"abc" ?: throw NullPointerException("'t' must not be null")
}
idea/testData/intentions/branched/ifThenToElvis/unitResult.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
// IS_APPLICABLE: false
open class Some {
fun bar() {}
}
object Obj : Some()
fun foo(arg: Any?) {
<caret>if (arg is Some) {
arg.bar()
}
else {
Obj.bar()
}
}
idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class F(a: Int?) {
val b = a
val c = if (b !=<caret> null) b else 2
}
fun main(args: Array<String>) {
F(1).c
}
idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
class F(a: Int?) {
val b = a
val c = b ?: 2
}
fun main(args: Array<String>) {
F(1).c
}