Allow to move "when entry" at closing brace

This commit is contained in:
Alexey Sedunov
2013-05-31 19:23:27 +04:00
parent 2cc163cd90
commit 30e333c670
7 changed files with 50 additions and 5 deletions
@@ -23,7 +23,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
@SuppressWarnings("FieldMayBeFinal")
private static Class[] BLOCKLIKE_ELEMENT_CLASSES =
{JetBlockExpression.class, JetWhenExpression.class, JetPropertyAccessor.class, JetClassBody.class, JetFile.class};
{JetBlockExpression.class, JetWhenExpression.class, JetClassBody.class, JetFile.class};
@SuppressWarnings("FieldMayBeFinal")
private static Class[] FUNCTIONLIKE_ELEMENT_CLASSES =
@@ -126,7 +126,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
PsiElement blockLikeElement = closingBrace.getParent();
if (!(blockLikeElement instanceof JetBlockExpression)) return BraceStatus.NOT_MOVABLE;
if (blockLikeElement.getParent() instanceof JetWhenEntry) return BraceStatus.NOT_MOVABLE;
if (blockLikeElement.getParent() instanceof JetWhenEntry) return BraceStatus.NOT_FOUND;
PsiElement enclosingExpression = PsiTreeUtil.getParentOfType(blockLikeElement, JetExpression.class);
@@ -1,4 +1,3 @@
// IS_APPLICABLE: false
// MOVE: up
fun foo(n: Int) {
@@ -0,0 +1,16 @@
// MOVE: up
fun foo(n: Int) {
when (n) {
0 -> {
}
else -> {
}<caret>
1 -> {
}
}
val x = ""
}
@@ -1,4 +1,3 @@
// IS_APPLICABLE: false
// MOVE: down
fun foo(n: Int) {
@@ -0,0 +1,16 @@
// MOVE: down
fun foo(n: Int) {
when (n) {
0 -> {
}
else -> {
}
1 -> {
}<caret>
}
val x = ""
}
@@ -1,4 +1,3 @@
// IS_APPLICABLE: false
// MOVE: up
fun foo(n: Int) {
@@ -0,0 +1,16 @@
// MOVE: up
fun foo(n: Int) {
when (n) {
1 -> {
}<caret>
0 -> {
}
else -> {
}
}
val x = ""
}