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

Add 'else' check for 'when' expressions

Browse Source
This commit is contained in:
Alexey Sedunov
2013-05-15 18:54:01 +04:00
parent 9442f96b87
commit 71e76bc690
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java
+6 -2
View File
@@ -42,12 +42,16 @@ public class BranchedUnfoldingUtils {
JetExpression rhs = assignment.getRight(); JetExpression rhs = assignment.getRight();
if (rhs instanceof JetIfExpression) return UnfoldableKind.ASSIGNMENT_TO_IF; if (rhs instanceof JetIfExpression) return UnfoldableKind.ASSIGNMENT_TO_IF;
if (rhs instanceof JetWhenExpression) return UnfoldableKind.ASSIGNMENT_TO_WHEN; if (rhs instanceof JetWhenExpression && JetPsiUtil.checkWhenExpressionHasSingleElse((JetWhenExpression) rhs)) {
return UnfoldableKind.ASSIGNMENT_TO_WHEN;
}
} else if (root instanceof JetReturnExpression) { } else if (root instanceof JetReturnExpression) {
JetExpression resultExpr = ((JetReturnExpression)root).getReturnedExpression(); JetExpression resultExpr = ((JetReturnExpression)root).getReturnedExpression();
if (resultExpr instanceof JetIfExpression) return UnfoldableKind.RETURN_TO_IF; if (resultExpr instanceof JetIfExpression) return UnfoldableKind.RETURN_TO_IF;
if (resultExpr instanceof JetWhenExpression) return UnfoldableKind.RETURN_TO_WHEN; if (resultExpr instanceof JetWhenExpression && JetPsiUtil.checkWhenExpressionHasSingleElse((JetWhenExpression) resultExpr)) {
return UnfoldableKind.RETURN_TO_WHEN;
}
} }
return null; return null;