MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

handle moving catch sections up/down better when using selection (IDEA-36496)

Browse Source
This commit is contained in:
Bas Leijdekkers
2019-01-31 14:47:26 +01:00
parent e407129596
commit 8dd82d71fd
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/CatchBlockMover.java
+30 -27
View File
@@ -3,6 +3,7 @@ package com.intellij.codeInsight.editorActions.moveUpDown;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.SelectionModel;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
@@ -18,38 +19,40 @@ public class CatchBlockMover extends LineMover {
if (!super.checkAvailable(editor, file, info, down)) return false;
final Document document = editor.getDocument();
int startOffset = document.getLineStartOffset(info.toMove.startLine);
int endOffset = document.getLineEndOffset(info.toMove.endLine);
PsiElement element = file.findElementAt(startOffset);
if (element == null) return false;
PsiKeyword keyword = null;
while (element != null && element.getTextOffset() < endOffset) {
if (element instanceof PsiKeyword) {
keyword = (PsiKeyword)element;
if (keyword.getTokenType() != JavaTokenType.CATCH_KEYWORD) {
return false;
}
break;
}
element = PsiTreeUtil.nextLeaf(element);
final SelectionModel selectionModel = editor.getSelectionModel();
final int startOffset;
final int endOffset;
if (selectionModel.hasSelection()) {
startOffset = selectionModel.getSelectionStart();
endOffset = selectionModel.getSelectionEnd();
}
if (keyword == null) return false;
final PsiElement parent = keyword.getParent();
if (!(parent instanceof PsiCatchSection)) return false;
final PsiCatchSection firstToMove = (PsiCatchSection)parent;
else {
startOffset = document.getLineStartOffset(info.toMove.startLine);
endOffset = document.getLineStartOffset(info.toMove.endLine);
}
final PsiElement element = file.findElementAt(startOffset);
if (element == null) return false;
final PsiTryStatement tryStatement = PsiTreeUtil.getParentOfType(element, PsiTryStatement.class, true, PsiMember.class);
if (tryStatement == null) return false;
PsiCatchSection firstToMove = null;
PsiCatchSection lastToMove = null;
for (PsiCatchSection catchSection : tryStatement.getCatchSections()) {
final int offset = catchSection.getTextOffset();
if (offset >= startOffset && offset < endOffset || catchSection.getFirstChild().getTextRange().contains(startOffset)) {
if (firstToMove == null) firstToMove = catchSection;
lastToMove = catchSection;
}
}
if (firstToMove == null) return false;
if (!sanityCheck(firstToMove)) {
return info.prohibitMove();
}
PsiCatchSection lastToMove = firstToMove;
while (true) {
final PsiCatchSection next = PsiTreeUtil.getNextSiblingOfType(lastToMove, PsiCatchSection.class);
if (next == null || next.getTextRange().getStartOffset() >= endOffset) {
break;
}
lastToMove = next;
if (element instanceof PsiWhiteSpace && element.getNextSibling() instanceof PsiStatement
|| PsiTreeUtil.getParentOfType(element, PsiStatement.class, true, PsiMember.class) != tryStatement) {
// nonsensical selection
return info.prohibitMove();
}
final PsiCatchSection sibling = down
? PsiTreeUtil.getNextSiblingOfType(lastToMove, PsiCatchSection.class)
: PsiTreeUtil.getPrevSiblingOfType(firstToMove, PsiCatchSection.class);