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

Convert "lift return / assignment" intentions into a single inspection

Browse Source 
Also includes minor test fix, related to KT-14900
This commit is contained in:
Mikhail Glukhikh
2017-06-27 13:01:33 +03:00
committed by Mikhail Glukhikh
parent 8f33bd0768
commit 2d1abda9a1
91 changed files with 373 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/LiftReturnOrAssignment.html
+14
View File
@@ -0,0 +1,14 @@
<html>
<body>
This inspection reports if and when statements that can be converted to expressions
by lifting return or assignment out. Typical example:
<code><pre>
<b>fun</b> foo(arg: Boolean): String {
<b>when</b> (arg) {
<b>true</b> -> <b>return</b> "Truth"
<b>false</b> -> <b>return</b> "Falsehood"
}
}
</pre></code>
</body>
</html>
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldIfToAssignmentIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
res = if (ok) {
"ok"
} else {
"failed"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldIfToAssignmentIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
if (ok) {
res = "ok"
} else {
res = "failed"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldIfToReturnIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
return if (ok) {
"ok"
} else {
"failed"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldIfToReturnIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
if (ok) {
return "ok"
} else {
return "failed"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldWhenToAssignmentIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
res = when (n) {
1 -> "one"
2 -> "two"
else -> "many"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldWhenToAssignmentIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "many"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldWhenToReturnIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
return when (n) {
1 -> "one"
2 -> "two"
else -> "many"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntentionFoldWhenToReturnIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
when (n) {
1 -> return "one"
2 -> return "two"
else -> return "many"
}
idea/resources/intentionDescriptions/FoldIfToAssignmentIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
res = if (ok) {
"ok"
} else {
"failed"
}
idea/resources/intentionDescriptions/FoldIfToAssignmentIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
if (ok) {
res = "ok"
} else {
res = "failed"
}
idea/resources/intentionDescriptions/FoldIfToAssignmentIntention/description.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This intention converts 'if' expression where each branch is terminated with assignment into a single assignment with 'if' expression as a right-hand side
</body>
</html>
idea/resources/intentionDescriptions/FoldIfToReturnIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
return if (ok) {
"ok"
} else {
"failed"
}
idea/resources/intentionDescriptions/FoldIfToReturnIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
if (ok) {
return "ok"
} else {
return "failed"
}
idea/resources/intentionDescriptions/FoldIfToReturnIntention/description.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This intention converts 'if' expression where each branch is terminated with 'return' into a single 'return' with 'if' expression as a right-hand side
</body>
</html>
idea/resources/intentionDescriptions/FoldWhenToAssignmentIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
res = when (n) {
1 -> "one"
2 -> "two"
else -> "many"
}
idea/resources/intentionDescriptions/FoldWhenToAssignmentIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "many"
}
idea/resources/intentionDescriptions/FoldWhenToAssignmentIntention/description.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This intention converts 'when' expression where each branch is terminated with assignment into a single assignment with 'when' expression as right-hand side
</body>
</html>
idea/resources/intentionDescriptions/FoldWhenToReturnIntention/after.kt.template
-5
View File
@@ -1,5 +0,0 @@
return when (n) {
1 -> "one"
2 -> "two"
else -> "many"
}
idea/resources/intentionDescriptions/FoldWhenToReturnIntention/before.kt.template
-5
View File
@@ -1,5 +0,0 @@
when (n) {
1 -> return "one"
2 -> return "two"
else -> return "many"
}
idea/resources/intentionDescriptions/FoldWhenToReturnIntention/description.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This intention converts 'when' expression where each branch is terminated with 'return' into a single 'return' with 'when' expression as a right-hand side
</body>
</html>