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

Extract Function: Support implicit abnormal exits via Nothing-typed expressions

Browse Source
This commit is contained in:
Alexey Sedunov
2016-10-05 14:17:29 +03:00
parent 8e9f32db9e
commit d3c14ce7d6
8 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+3 -1
View File
@@ -243,6 +243,8 @@ private fun ExtractionData.analyzeControlFlow(
when {
it !is ReturnValueInstruction && it !is ReturnNoValueInstruction && it.owner != pseudocode ->
null
it is UnconditionalJumpInstruction && it.targetLabel.isJumpToError ->
it
e != null && e !is KtBreakExpression && e !is KtContinueExpression ->
it.previousInstructions.firstOrNull()
else ->
@@ -268,7 +270,7 @@ private fun ExtractionData.analyzeControlFlow(
|| element is KtContinueExpression) {
jumpExits.add(inst)
}
else if (element !is KtThrowExpression) {
else if (element !is KtThrowExpression && !inst.targetLabel.isJumpToError) {
defaultExits.add(inst)
}
}