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

Refactoring: make "if-then to safe access" an inspection

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-12-19 15:41:09 +03:00
parent 91bcfb97c6
commit a8b01a6b00
86 changed files with 433 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/branched/ifThenToSafeAccess/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention
idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo: String? = "abc"
if (foo != null<caret>) {
doSomething ("Hello")
foo.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
var foo: String? = "foo"
var bar: String? = "bar"
if (foo != null<caret>) {
bar?.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/conditionComparesNullWithNull.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = "foo"
if (null == <caret>null) {
foo.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
operator fun <T> T.compareTo(a: T): Int = 0
fun main(args: Array<String>) {
val foo = "foo"
if (foo > null<caret>) {
foo.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
operator fun String?.times(a: Int): Boolean = a == 0
fun main(args: Array<String>) {
val foo: String = "foo"
if (foo * 10<caret>) {
foo.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
if (foo != null<caret>) {
foo.length
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
foo?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/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.length
} else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/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?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/emptyCondition.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = "foo"
if (<caret>) {
foo.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// IS_APPLICABLE: false
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length
}
else {
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// IS_APPLICABLE: false
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo == null<caret>) {
}
else {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>)
foo.length
else
null
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
val x = if (foo == null<caret>) {
null
}
else {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val x = maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/implicitReceiver.kt
Vendored
-2
View File
@@ -1,2 +0,0 @@
// WITH_RUNTIME
fun String?.foo() = <caret>if (this == null) null else isEmpty()
idea/testData/intentions/branched/ifThenToSafeAccess/implicitReceiver.kt.after
Vendored
-2
View File
@@ -1,2 +0,0 @@
// WITH_RUNTIME
fun String?.foo() = this?.isEmpty()
idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/expected.xml
Vendored
-170
View File
@@ -1,170 +0,0 @@
<problems>
<problem>
<file>rhsNotEqualsNull.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/rhsNotEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>rhsEqualsNull.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/rhsEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>noThenBlock.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/noThenBlock.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>noElseBlock.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/noElseBlock.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>lhsNotEqualsNull.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/lhsNotEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>lhsEqualsNull.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/lhsEqualsNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>ifAsExpression.kt</file>
<line>7</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 safe access expression</description>
</problem>
<problem>
<file>ifAndElseNotInBlocks.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseNotInBlocks.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>ifAndElseBothInBlocks.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/ifAndElseBothInBlocks.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>doesNotinlineValueOutsideOfScope.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/doesNotInlineValueOutsideOfScope.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>doesNotinlineValueIfUsedMoreThanOnce.kt</file>
<line>10</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/doesNotInlineValueIfUsedMoreThanOnce.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<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 safe access expression</description>
</problem>
<problem>
<file>isCondition.kt</file>
<line>1</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/isCondition.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>isNotCondition.kt</file>
<line>1</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/src/isNotCondition.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>nullCheckWithSelectorCallChain.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/nullCheckWithSelectorCallChain.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>isCheckWithSelectorChain.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/isCheckWithSelectorChain.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe access expression</description>
</problem>
<problem>
<file>isCheckSimple.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/isCheckSimple.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe cast expression</description>
</problem>
<problem>
<file>nullCheckSimple.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/nullCheckSimple.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Remove redundant 'if' 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 safe access expression</description>
</problem>
<problem>
<file>property.kt</file>
<line>10</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/property.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Replace 'if' expression with safe cast expression</description>
</problem>
<problem>
<file>propertyNotNull.kt</file>
<line>9</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/propertyNotNull.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">If-Then foldable to '?.'</problem_class>
<description>Remove redundant 'if' expression</description>
</problem>
</problems>
idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test
Vendored
-2
View File
@@ -1,2 +0,0 @@
// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessInspection
// WITH_RUNTIME
idea/testData/intentions/branched/ifThenToSafeAccess/isCheckSimple.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 null
}
idea/testData/intentions/branched/ifThenToSafeAccess/isCheckSimple.kt.after
Vendored
-5
View File
@@ -1,5 +0,0 @@
class My(val x: Int)
fun foo(arg: Any?): My? {
return arg as? My
}
idea/testData/intentions/branched/ifThenToSafeAccess/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 null
}
idea/testData/intentions/branched/ifThenToSafeAccess/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()
}
idea/testData/intentions/branched/ifThenToSafeAccess/isCondition.kt
Vendored
-1
View File
@@ -1 +0,0 @@
fun foo(arg: Any) = if (arg is String<caret>) arg.length else null
idea/testData/intentions/branched/ifThenToSafeAccess/isCondition.kt.after
Vendored
-1
View File
@@ -1 +0,0 @@
fun foo(arg: Any) = (arg as? String)?.length
idea/testData/intentions/branched/ifThenToSafeAccess/isNotCondition.kt
Vendored
-1
View File
@@ -1 +0,0 @@
fun foo(arg: Any) = if (arg !is String<caret>) null else arg.length
idea/testData/intentions/branched/ifThenToSafeAccess/isNotCondition.kt.after
Vendored
-1
View File
@@ -1 +0,0 @@
fun foo(arg: Any) = (arg as? String)?.length
idea/testData/intentions/branched/ifThenToSafeAccess/isNotNullable.kt
Vendored
-2
View File
@@ -1,2 +0,0 @@
// IS_APPLICABLE: false
fun foo(arg: Any) = if (arg !is String?<caret>) null else arg?.length
idea/testData/intentions/branched/ifThenToSafeAccess/isNullable.kt
Vendored
-2
View File
@@ -1,2 +0,0 @@
// IS_APPLICABLE: false
fun foo(arg: Any) = if (arg is String?<caret>) arg?.length else null
idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo == null<caret>)
null
else
foo.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>)
foo.length
else
null
}
idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = null
if (foo == null<caret>) {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo = null
if (foo != null<caret>)
else {
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// IS_APPLICABLE: false
// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
fun main(args: Array<String>) {
val foo: String? = "foo"
if<caret> {
foo.length
} else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlockAsExpression.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
// IS_APPLICABLE: false
// ERROR: 'if' must have both main and 'else' branches if used as an expression
// ERROR: Type mismatch: inferred type is Unit but Int was expected
fun maybeFoo(): String? {
return "foo"
}
fun bar(): Int {
val foo = maybeFoo()
return if (foo != null<caret>) {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
val bar: String? = null
if (foo == bar<caret>) {
foo?.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
val bar: String? = null
if (foo == bar<caret>) {
bar?.length
}
else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo == null<caret>) else {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/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>)
null
else
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
//IS_APPLICABLE: false
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
var foo = maybeFoo()
if (foo == null<caret>)
null
else
foo?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
fun foo(arg: Any?): Any? {
return if (<caret>arg != null) arg else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/nullCheckSimple.kt.after
Vendored
-3
View File
@@ -1,3 +0,0 @@
fun foo(arg: Any?): Any? {
return arg
}
idea/testData/intentions/branched/ifThenToSafeAccess/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 {
null
}
idea/testData/intentions/branched/ifThenToSafeAccess/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/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun main(args: Array<String>) {
val foo: String? = "abc"
if (foo != null<caret>) {
foo.length
}
else {
doSomething("Hi")
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/property.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
// IS_APPLICABLE: true
// INTENTION_TEXT: Replace 'if' expression with safe cast expression
interface Foo
interface Bar : Foo
data class Data(val foo: Foo)
fun handle(data: Data) {
val bar = <caret>if (data.foo is Bar) data.foo else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/property.kt.after
Vendored
-11
View File
@@ -1,11 +0,0 @@
// IS_APPLICABLE: true
// INTENTION_TEXT: Replace 'if' expression with safe cast expression
interface Foo
interface Bar : Foo
data class Data(val foo: Foo)
fun handle(data: Data) {
val bar = data.foo as? Bar
}
idea/testData/intentions/branched/ifThenToSafeAccess/propertyNotNull.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: true
// INTENTION_TEXT: Remove redundant 'if' expression
interface Bar
data class Data(val bar: Bar?)
fun handle(data: Data) {
val bar = <caret>if (data.bar != null) data.bar else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/propertyNotNull.kt.after
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: true
// INTENTION_TEXT: Remove redundant 'if' expression
interface Bar
data class Data(val bar: Bar?)
fun handle(data: Data) {
val bar = data.bar
}
idea/testData/intentions/branched/ifThenToSafeAccess/propertyWithProperty.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// IS_APPLICABLE: false
interface Foo
interface Bar : Foo {
val x: String
}
data class Data(val foo: Foo)
fun handle(data: Data) {
// Not available yet (possible in principle)
val bar = <caret>if (data.foo is Bar) data.foo.x else null
}
idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (null == foo<caret>)
null
else
foo.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
val foo = maybeFoo()
if (null != foo<caret>)
foo.length
else
null
}
idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun maybeFoo(): String? {
return "foo"
}
fun main(args: Array<String>) {
maybeFoo()?.length
}
idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseBothNull.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
<caret>if (foo == null) {
null
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
// IS_APPLICABLE: false
// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo == null<caret>) {
foo.length
}
else {
foo.length
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.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 {
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.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>) {
}
else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.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/ifThenToSafeAccess/unacceptableNoThenBlock.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo != null<caret>)
else {
null
}
}
idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class F(a: Int?) {
val b = a
val c = if (b !=<caret> null) b.toString() else null
}
fun main(args: Array<String>) {
F(1).c
}
idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
class F(a: Int?) {
val b = a
val c = b?.toString()
}
fun main(args: Array<String>) {
F(1).c
}