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

Rename method

Browse Source
This commit is contained in:
Alexey Sedunov
2013-04-12 20:40:56 +04:00
parent 033e82666d
commit a778ce24e7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java
+7 -7
View File
@@ -45,7 +45,7 @@ public class BranchedUnfoldingUtils {
return checkUnfoldableAssignment(root) || checkUnfoldableReturn(root);
}
private static JetExpression unwrapBranch(@Nullable JetExpression expression) {
private static JetExpression getOutermostLastBlockElement(@Nullable JetExpression expression) {
return (JetExpression) JetPsiUtil.getOutermostLastBlockElement(expression, null);
}
@@ -59,8 +59,8 @@ public class BranchedUnfoldingUtils {
ifExpression = (JetIfExpression)assignment.replace(ifExpression);
JetExpression thenExpr = unwrapBranch(ifExpression.getThen());
JetExpression elseExpr = unwrapBranch(ifExpression.getElse());
JetExpression thenExpr = getOutermostLastBlockElement(ifExpression.getThen());
JetExpression elseExpr = getOutermostLastBlockElement(ifExpression.getElse());
assert thenExpr != null;
assert elseExpr != null;
@@ -80,7 +80,7 @@ public class BranchedUnfoldingUtils {
whenExpression = (JetWhenExpression)assignment.replace(whenExpression);
for (JetWhenEntry entry : whenExpression.getEntries()) {
JetExpression currExpr = unwrapBranch(entry.getExpression());
JetExpression currExpr = getOutermostLastBlockElement(entry.getExpression());
assert currExpr != null;
@@ -96,8 +96,8 @@ public class BranchedUnfoldingUtils {
ifExpression = (JetIfExpression)returnExpression.replace(ifExpression);
JetExpression thenExpr = unwrapBranch(ifExpression.getThen());
JetExpression elseExpr = unwrapBranch(ifExpression.getElse());
JetExpression thenExpr = getOutermostLastBlockElement(ifExpression.getThen());
JetExpression elseExpr = getOutermostLastBlockElement(ifExpression.getElse());
assert thenExpr != null;
assert elseExpr != null;
@@ -115,7 +115,7 @@ public class BranchedUnfoldingUtils {
whenExpression = (JetWhenExpression)returnExpression.replace(whenExpression);
for (JetWhenEntry entry : whenExpression.getEntries()) {
JetExpression currExpr = unwrapBranch(entry.getExpression());
JetExpression currExpr = getOutermostLastBlockElement(entry.getExpression());
assert currExpr != null;