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

KT-20282 'Move statement up' works incorrectly for statement after 'finally' block if 'try' block contains closure

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-03-01 19:23:11 +09:00
committed by Nikolay Krasko
parent d3b1b7a5be
commit 9d6b36c249
16 changed files with 247 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
+47 -6
View File
@@ -229,16 +229,57 @@ public class KotlinExpressionMover extends AbstractKotlinUpDownMover {
@Nullable
private static LineRange getExpressionTargetRange(@NotNull Editor editor, @NotNull PsiElement sibling, boolean down) {
if (sibling instanceof KtIfExpression && !down) {
KtExpression elseBranch = ((KtIfExpression) sibling).getElse();
if (elseBranch instanceof KtBlockExpression) {
sibling = elseBranch;
}
}
PsiElement start = sibling;
PsiElement end = sibling;
if (!down) {
if (sibling instanceof KtIfExpression) {
KtIfExpression ifExpression = (KtIfExpression) sibling;
KtExpression elseExpression = ifExpression.getElse();
while (elseExpression instanceof KtIfExpression) {
KtIfExpression elseIfExpression = (KtIfExpression) elseExpression;
KtExpression next = elseIfExpression.getElse();
if (next == null) {
elseExpression = elseIfExpression.getThen();
break;
}
elseExpression = next;
}
if (elseExpression instanceof KtBlockExpression) {
sibling = elseExpression;
start = sibling;
}
} else if (sibling instanceof KtWhenExpression) {
List<KtWhenEntry> entries = ((KtWhenExpression) sibling).getEntries();
if (!entries.isEmpty()) {
KtWhenEntry lastEntry = null;
for (KtWhenEntry entry : entries) {
if (entry.getExpression() instanceof KtBlockExpression) lastEntry = entry;
}
if (lastEntry != null) {
sibling = lastEntry;
start = sibling;
}
}
} else if (sibling instanceof KtTryExpression) {
KtTryExpression tryExpression = (KtTryExpression) sibling;
KtFinallySection finallyBlock = tryExpression.getFinallyBlock();
if (finallyBlock != null) {
sibling = finallyBlock;
start = sibling;
} else {
List<KtCatchClause> clauses = tryExpression.getCatchClauses();
if (!clauses.isEmpty()) {
sibling = clauses.get(clauses.size() - 1);
start = sibling;
}
}
}
}
// moving out of code block
if (sibling.getNode().getElementType() == (down ? KtTokens.RBRACE : KtTokens.LBRACE)) {
PsiElement parent = sibling.getParent();