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 18:07:20 +03:00
parent ac4433f6d0
commit 1a71a5cfb6
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/openapi/editor/actions/MoveStatementHandler.java
+30 -23
View File
@@ -84,25 +84,26 @@ class MoveStatementHandler extends EditorWriteActionHandler {
if (!(file instanceof PsiJavaFile)) {
return editor.logicalPositionToOffset(new LogicalPosition(nearLine, 0));
}
while (true) {
final int offset = editor.logicalPositionToOffset(new LogicalPosition(line, 0));
PsiElement element = firstNonWhiteElement(offset, file, true);
while (element != null) {
if ((element instanceof PsiStatement || element instanceof PsiComment)
&& element.getParent() instanceof PsiCodeBlock
&& !element.getTextRange().contains(offset)
) {
return offset;
}
if (element instanceof PsiJavaToken
&& ((PsiJavaToken)element).getTokenType() == JavaTokenType.RBRACE
&& element.getParent() instanceof PsiCodeBlock) {
return offset;
while (element != null && element != file) {
if (!element.getTextRange().contains(offset)) {
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;
}
if (element instanceof PsiMember) {
return offset;
}
}
element = element.getParent();
final TextRange range = element.getTextRange();
if (!isDown && range.getStartOffset() < offset) break;
if (isDown && range.getEndOffset() >= editor.logicalPositionToOffset(new LogicalPosition(line+1, 0))) break;
}
line += isDown ? 1 : -1;
if (line == 0 || line >= editor.getDocument().getLineCount()) {
@@ -224,18 +225,24 @@ class MoveStatementHandler extends EditorWriteActionHandler {
return element;
}
private static class LineRange {
private final int startLine;
private final int endLine;
public LineRange(final int startLine, final int endLine) {
this.startLine = startLine;
this.endLine = endLine;
}
}
}
//todo
// + no move inside/outside class(except nested)/method/initializer/comment
// moving declarations
// create codeblock when moving inside statement
class LineRange {
final int startLine;
final int endLine;
public LineRange(final int startLine, final int endLine) {
this.startLine = startLine;
this.endLine = endLine;
}
}
interface Mover {
boolean isItMe();
LineRange getRangeToMove();
int getOffsetToMoveTo();
}