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

(no message)

Browse Source
This commit is contained in:
Alexey Kudravtsev
2005-03-04 13:41:40 +03:00
parent 0caed6fc80
commit f2ed809a44
1 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/openapi/editor/actions/MoveStatementHandler.java
+43 -5
View File
@@ -35,13 +35,13 @@ class MoveStatementHandler extends EditorWriteActionHandler {
final LineRange lineRange = getRangeToMove(editor,file);
final int startLine = lineRange.startLine;
final int endLine = lineRange.endLine;
final int insertOffset = editor.logicalPositionToOffset(new LogicalPosition(isDown ? endLine + 2 : startLine - 1, 0));
final int insertOffset = calcInsertOffset(editor, startLine, endLine);
final int start = editor.logicalPositionToOffset(new LogicalPosition(startLine, 0));
final int end = editor.logicalPositionToOffset(new LogicalPosition(endLine+1, 0));
final String toInsert = document.getCharsSequence().subSequence(start, end).toString();
final int insStart = isDown ? insertOffset - toInsert.length() : insertOffset;
final int insEnd = isDown ? insertOffset : insertOffset + toInsert.length();
final int insEnd = insStart + toInsert.length();
final SelectionModel selectionModel = editor.getSelectionModel();
final int selectionStart = selectionModel.getSelectionStart();
@@ -55,7 +55,6 @@ class MoveStatementHandler extends EditorWriteActionHandler {
document.insertString(insStart, toInsert);
documentManager.commitDocument(document);
caretModel.moveToLogicalPosition(new LogicalPosition(caretLine + (isDown ? 1 : -1), caretColumn));
if (hasSelection) {
restoreSelection(editor, selectionStart, selectionEnd, start, insStart);
}
@@ -64,6 +63,8 @@ class MoveStatementHandler extends EditorWriteActionHandler {
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
final int line1 = editor.offsetToLogicalPosition(insStart).line;
final int line2 = editor.offsetToLogicalPosition(insEnd).line;
caretModel.moveToLogicalPosition(new LogicalPosition(line1, caretColumn));
for (int line = line1; line <= line2; line++) {
int lineStart = document.getLineStartOffset(line);
codeStyleManager.adjustLineIndent(file, lineStart);
@@ -76,6 +77,39 @@ class MoveStatementHandler extends EditorWriteActionHandler {
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
}
private int calcInsertOffset(final Editor editor, final int startLine, final int endLine) {
int line = isDown ? endLine + 2 : startLine - 1;
final PsiFile file = PsiDocumentManager.getInstance(editor.getProject()).getPsiFile(editor.getDocument());
if (!(file instanceof PsiJavaFile)) {
return editor.logicalPositionToOffset(new LogicalPosition(line, 0));
}
while (true) {
final int offset = editor.logicalPositionToOffset(new LogicalPosition(line, 0));
PsiElement element = file.findElementAt(offset);
if (element instanceof PsiWhiteSpace) {
element = element.getNextSibling();
}
while (true) {
if (element == null) break;
if ((element instanceof PsiStatement || element instanceof PsiComment) && element.getParent() instanceof PsiCodeBlock) {
return offset;
}
if (element instanceof PsiJavaToken
&& ((PsiJavaToken)element).getTokenType() == JavaTokenType.RBRACE
&& element.getParent() instanceof PsiCodeBlock) {
return offset;
}
element = element.getParent();
if (!isDown && element.getTextOffset() < offset) break;
if (isDown && element.getTextRange().getEndOffset() >= editor.logicalPositionToOffset(new LogicalPosition(line+1, 0))) break;
}
line += isDown ? 1 : -1;
if (line == 0 || line >= editor.getDocument().getLineCount()) {
return 0;
}
}
}
private static void restoreSelection(final Editor editor, final int selectionStart, final int selectionEnd, final int moveOffset, int insOffset) {
final int selectionRelativeOffset = selectionStart - moveOffset;
int newSelectionStart = insOffset + selectionRelativeOffset;
@@ -122,7 +156,7 @@ class MoveStatementHandler extends EditorWriteActionHandler {
if (elementAt == null) return null;
final PsiElement guard = PsiTreeUtil.getParentOfType(elementAt, new Class[]{PsiMethod.class, PsiClassInitializer.class, PsiClass.class});
// move operation should not go out of method
final int insertOffset = editor.logicalPositionToOffset(new LogicalPosition(isDown ? result.endLine + 2 : result.startLine - 1, 0));
final int insertOffset = calcInsertOffset(editor, result.startLine, result.endLine);
if (guard != null && !guard.getTextRange().shiftRight(1).grown(-1).contains(insertOffset)) return null;
return result;
@@ -175,4 +209,8 @@ class MoveStatementHandler extends EditorWriteActionHandler {
this.endLine = endLine;
}
}
}
}
//todo
// no move inside/outside class/method/initializer/comment
// create codeblock when moving inside statement
// moving declarations