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

extract a method

Browse Source
This commit is contained in:
peter
2012-09-24 17:37:11 +04:00
parent 56ecd09734
commit 6b5682c0f6
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
+21 -19
View File
@@ -37,7 +37,6 @@ public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelect
@Override
public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
final TextRange originalRange = e.getTextRange();
LOG.assertTrue(originalRange.getEndOffset() <= editorText.length(), getClass() + "; " + e);
@@ -51,7 +50,6 @@ public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelect
}
public static List<TextRange> expandToWholeLine(CharSequence text, @Nullable TextRange range, boolean isSymmetric) {
int textLength = text.length();
List<TextRange> result = new ArrayList<TextRange>();
if (range == null) {
@@ -63,13 +61,24 @@ public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelect
result.add(range);
}
TextRange expanded = getExpandedRange(text, range, isSymmetric);
if (expanded != null) {
result.add(expanded);
} else {
result.add(range);
}
return result;
}
@Nullable
private static TextRange getExpandedRange(CharSequence text, TextRange range, boolean isSymmetric) {
int startOffset = range.getStartOffset();
int endOffset = range.getEndOffset();
int index1 = CharArrayUtil.shiftBackward(text, startOffset - 1, " \t");
if (endOffset > startOffset && text.charAt(endOffset - 1) == '\n') {
endOffset--;
}
int textLength = text.length();
int index2 = Math.min(textLength, CharArrayUtil.shiftForward(text, endOffset, " \t"));
if (index1 < 0 || text.charAt(index1) == '\n' || index2 == textLength || text.charAt(index2) == '\n') {
@@ -85,28 +94,21 @@ public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelect
}
}
result.add(new TextRange(startOffset, endOffset));
return new TextRange(startOffset, endOffset);
}
else {
if ((index1 < 0 || text.charAt(index1) == '\n') &&
(index2 == textLength || text.charAt(index2) == '\n')) {
startOffset = index1 + 1;
endOffset = index2;
if (endOffset < textLength) {
endOffset++;
}
result.add(new TextRange(startOffset, endOffset));
}
else {
result.add(range);
if ((index1 < 0 || text.charAt(index1) == '\n') &&
(index2 == textLength || text.charAt(index2) == '\n')) {
startOffset = index1 + 1;
endOffset = index2;
if (endOffset < textLength) {
endOffset++;
}
return new TextRange(startOffset, endOffset);
}
}
else {
result.add(range);
}
return result;
return null;
}
public static List<TextRange> expandToWholeLine(CharSequence text, TextRange range) {