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

Simplified declaration's up/down mover because it does not need to attach comments to declaration manually anymore

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-03 18:33:07 +04:00
parent b811a6cab4
commit c562cfb83d
2 changed files with 12 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java
+5 -20
View File
@@ -45,16 +45,6 @@ public abstract class AbstractJetUpDownMover extends LineMover {
@NotNull LineRange oldRange
);
protected PsiElement adjustElement(PsiElement element, Editor editor, boolean first) {
return element;
}
protected final Pair<PsiElement, PsiElement> adjustElementRange(Pair<PsiElement, PsiElement> elementRange, Editor editor) {
PsiElement first = adjustElement(elementRange.first, editor, true);
PsiElement second = adjustElement(elementRange.second, editor, false);
return new Pair<PsiElement, PsiElement>(first, second);
}
@Nullable
protected LineRange getSourceRange(
@NotNull PsiElement firstElement,
@@ -101,18 +91,13 @@ public abstract class AbstractJetUpDownMover extends LineMover {
if (parent == null) return null;
Pair<PsiElement, PsiElement> originalRange = getElementRange(parent, firstElement, lastElement);
Pair<PsiElement, PsiElement> combinedRange = adjustElementRange(originalRange, editor);
if (combinedRange == null
|| !checkSourceElement(originalRange.first)
|| !checkSourceElement(originalRange.second)) {
return null;
}
if (!checkSourceElement(originalRange.first) || !checkSourceElement(originalRange.second)) return null;
LineRange lineRange1 = getElementSourceLineRange(combinedRange.first, editor, oldRange);
LineRange lineRange1 = getElementSourceLineRange(originalRange.first, editor, oldRange);
if (lineRange1 == null) return null;
LineRange lineRange2 = getElementSourceLineRange(combinedRange.second, editor, oldRange);
LineRange lineRange2 = getElementSourceLineRange(originalRange.second, editor, oldRange);
if (lineRange2 == null) return null;
LineRange parentLineRange = getElementSourceLineRange(parent, editor, oldRange);
@@ -126,8 +111,8 @@ public abstract class AbstractJetUpDownMover extends LineMover {
sourceRange.firstElement = sourceRange.lastElement = parent;
}
else {
sourceRange.firstElement = combinedRange.first;
sourceRange.lastElement = combinedRange.second;
sourceRange.firstElement = originalRange.first;
sourceRange.lastElement = originalRange.second;
}
return sourceRange;
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java
+7 -66
View File
@@ -21,13 +21,14 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.refactoring.RefactoringPackage;
import java.util.ArrayList;
import java.util.List;
@@ -123,28 +124,14 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
return element instanceof JetDeclaration;
}
@Nullable
private static PsiElement skipInsignificantElements(@Nullable PsiElement element, boolean down) {
if (element == null) return null;
PsiElement result = element;
while (result instanceof PsiWhiteSpace || result.getTextLength() == 0) {
result = down ? result.getNextSibling() : result.getPrevSibling();
if (result == null) break;
}
return result;
}
@Override
protected LineRange getElementSourceLineRange(@NotNull PsiElement element, @NotNull Editor editor, @NotNull LineRange oldRange) {
PsiElement first;
PsiElement last;
if (element instanceof JetDeclaration) {
first = skipInsignificantElements(element.getFirstChild(), true);
last = skipInsignificantElements(element.getLastChild(), false);
first = element.getFirstChild();
last = element.getLastChild();
if (first == null || last == null) return null;
}
@@ -181,11 +168,6 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
return null;
}
@Override
protected PsiElement adjustElement(PsiElement element, Editor editor, boolean first) {
return first ? getTopmostSiblingCommentOrOriginal(element) : element;
}
@Nullable
private static LineRange getTargetRange(
@NotNull Editor editor,
@@ -198,10 +180,6 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
PsiElement nextParent = null;
if (target instanceof PsiComment) {
target = PsiTreeUtil.getNextSiblingOfType(target, JetDeclaration.class);
}
// moving out of code block
if (sibling.getNode().getElementType() == (down ? JetTokens.RBRACE : JetTokens.LBRACE)) {
// elements which aren't immediately placed in class body can't leave the block
@@ -220,13 +198,8 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
// moving into code block
// element may move only into class body
else {
PsiElement adjustedSibling = sibling;
if (adjustedSibling instanceof PsiComment || isEmptyPackageDirective(adjustedSibling)) {
adjustedSibling = PsiTreeUtil.getNextSiblingOfType(adjustedSibling, JetDeclaration.class);
}
if (adjustedSibling instanceof JetClassOrObject) {
JetClassOrObject jetClassOrObject = (JetClassOrObject) adjustedSibling;
if (sibling instanceof JetClassOrObject) {
JetClassOrObject jetClassOrObject = (JetClassOrObject) sibling;
JetClassBody classBody = jetClassOrObject.getBody();
// confined elements can't leave their block
@@ -255,23 +228,6 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
if (target instanceof JetPropertyAccessor && !(sibling instanceof JetPropertyAccessor)) return null;
if (!down && start instanceof JetDeclaration) {
start = getTopmostSiblingCommentOrOriginal(start);
}
else if (start != null && start.getFirstChild() != null) {
start = skipInsignificantElements(start.getFirstChild(), true);
}
if (down && end instanceof PsiComment) {
PsiElement nextDeclaration = PsiTreeUtil.getNextSiblingOfType(end, JetDeclaration.class);
if (nextDeclaration != null) {
end = nextDeclaration;
}
}
else if (end != null && end.getFirstChild() != null) {
end = skipInsignificantElements(end.getLastChild(), false);
}
return start != null && end != null ? new LineRange(start, end, editor.getDocument()) : null;
}
@@ -310,19 +266,4 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
info.toMove2 = getTargetRange(editor, sibling, down, sourceRange.firstElement);
return true;
}
@NotNull
private static PsiElement getTopmostSiblingCommentOrOriginal(@NotNull PsiElement originalElement) {
PsiElement element = originalElement;
PsiElement sibling = element.getPrevSibling();
while (sibling instanceof PsiComment
|| (sibling instanceof PsiWhiteSpace && !RefactoringPackage.isMultiLine(sibling))
|| (sibling != null && (sibling.getText() == null || sibling.getText().isEmpty()))) {
if (sibling instanceof PsiComment) {
element = sibling;
}
sibling = sibling.getPrevSibling();
}
return element;
}
}