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

Reuse getElementLineCount()

Browse Source
This commit is contained in:
Alexey Sedunov
2013-09-04 17:23:16 +04:00
parent b3b948ac39
commit 5cee3ae5b3
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/AbstractJetUpDownMover.java
+1 -1
View File
@@ -99,7 +99,7 @@ public abstract class AbstractJetUpDownMover extends LineMover {
return sourceRange; return sourceRange;
} }
private static int getElementLineCount(PsiElement element, Editor editor) { protected static int getElementLineCount(PsiElement element, Editor editor) {
Document doc = editor.getDocument(); Document doc = editor.getDocument();
TextRange spaceRange = element.getTextRange(); TextRange spaceRange = element.getTextRange();
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
+1 -7
View File
@@ -400,13 +400,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
} }
if (whiteSpaceTestSubject instanceof PsiWhiteSpace) { if (whiteSpaceTestSubject instanceof PsiWhiteSpace) {
Document doc = editor.getDocument(); if (getElementLineCount(whiteSpaceTestSubject, editor) > 1) {
TextRange spaceRange = whiteSpaceTestSubject.getTextRange();
int startLine = doc.getLineNumber(spaceRange.getStartOffset());
int endLine = doc.getLineNumber(spaceRange.getEndOffset());
if (endLine - startLine > 1) {
int nearLine = down ? sourceRange.endLine : sourceRange.startLine - 1; int nearLine = down ? sourceRange.endLine : sourceRange.startLine - 1;
info.toMove = sourceRange; info.toMove = sourceRange;