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

Extract method for else branch check in when expression

Browse Source
This commit is contained in:
Alexey Sedunov
2013-04-12 18:42:35 +04:00
parent edea00f53e
commit 033e82666d
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedFoldingUtils.java
+6 -12
View File
@@ -88,23 +88,19 @@ public class BranchedFoldingUtils {
}
private static boolean checkFoldableWhenExpressionWithAssignments(JetWhenExpression whenExpression) {
if (!JetPsiUtil.checkWhenExpressionHasSingleElse(whenExpression)) return false;
List<JetWhenEntry> entries = whenExpression.getEntries();
if (entries.isEmpty()) return false;
boolean hasElse = false;
List<JetBinaryExpression> assignments = new ArrayList<JetBinaryExpression>();
for (JetWhenEntry entry : entries) {
if (entry.isElse()) {
hasElse = true;
}
JetBinaryExpression assignment = checkAndGetFoldableBranchedAssignment(entry.getExpression());
if (assignment == null) return false;
assignments.add(assignment);
}
if (!hasElse) return false;
assert !assignments.isEmpty();
JetBinaryExpression firstAssignment = assignments.get(0);
@@ -121,24 +117,22 @@ public class BranchedFoldingUtils {
}
private static boolean checkFoldableWhenExpressionWithReturns(JetWhenExpression whenExpression) {
if (!JetPsiUtil.checkWhenExpressionHasSingleElse(whenExpression)) return false;
List<JetWhenEntry> entries = whenExpression.getEntries();
if (entries.isEmpty()) return false;
boolean hasElse = false;
for (JetWhenEntry entry : entries) {
if (entry.isElse()) {
hasElse = true;
}
if (checkAndGetFoldableBranchedReturn(entry.getExpression()) == null) return false;
}
return hasElse;
return true;
}
private static boolean checkFoldableIfExpressionWithAsymmetricReturns(JetIfExpression ifExpression) {
if (checkAndGetFoldableBranchedReturn(ifExpression.getThen()) == null ||
checkAndGetFoldableBranchedReturn(ifExpression.getElse()) != null) {
ifExpression.getElse() != null) {
return false;
}
idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java
+2 -7
View File
@@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.JetWhenEntry;
import org.jetbrains.jet.lang.psi.JetWhenExpression;
import org.jetbrains.jet.plugin.JetBundle;
@@ -53,13 +54,7 @@ public class MoveWhenElseBranchFix extends JetIntentionAction<JetWhenExpression>
if (!super.isAvailable(project, editor, file)) {
return false;
}
int elseCount = 0;
for (JetWhenEntry entry : element.getEntries()) {
if (entry.isElse()) {
elseCount++;
}
}
return (elseCount == 1);
return JetPsiUtil.checkWhenExpressionHasSingleElse(element);
}
@Override