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

select word to work meaningfully at the end of line/file

Browse Source
This commit is contained in:
peter
2012-01-01 23:14:31 +01:00
parent 8720fb18fe
commit 620d54b647
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java
+20 -8
View File
@@ -79,7 +79,6 @@ public class SelectWordHandler extends EditorActionHandler {
}
private static void doAction(Editor editor, PsiFile file) {
CharSequence text = editor.getDocument().getCharsSequence();
if (file instanceof PsiCompiledElement) {
file = (PsiFile)((PsiCompiledElement)file).getMirror();
@@ -87,12 +86,7 @@ public class SelectWordHandler extends EditorActionHandler {
FeatureUsageTracker.getInstance().triggerFeatureUsed("editing.select.word");
int caretOffset = editor.getCaretModel().getOffset();
if (caretOffset > 0 && caretOffset < editor.getDocument().getTextLength() &&
!Character.isJavaIdentifierPart(text.charAt(caretOffset)) && Character.isJavaIdentifierPart(text.charAt(caretOffset - 1))) {
caretOffset--;
}
int caretOffset = adjustCaretOffset(editor);
PsiElement element = findElementAt(file, caretOffset);
@@ -144,7 +138,7 @@ public class SelectWordHandler extends EditorActionHandler {
final Ref<TextRange> minimumRange = new Ref<TextRange>(new TextRange(0, editor.getDocument().getTextLength()));
SelectWordUtil.processRanges(element, text, caretOffset, editor, new Processor<TextRange>() {
SelectWordUtil.processRanges(element, editor.getDocument().getCharsSequence(), caretOffset, editor, new Processor<TextRange>() {
@Override
public boolean process(TextRange range) {
if (range.contains(selectionRange) && !range.equals(selectionRange)) {
@@ -161,6 +155,24 @@ public class SelectWordHandler extends EditorActionHandler {
editor.getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset());
}
private static int adjustCaretOffset(Editor editor) {
int caretOffset = editor.getCaretModel().getOffset();
if (caretOffset == 0) {
return caretOffset;
}
CharSequence text = editor.getDocument().getCharsSequence();
char prev = text.charAt(caretOffset - 1);
if (caretOffset < text.length() &&
!Character.isJavaIdentifierPart(text.charAt(caretOffset)) && Character.isJavaIdentifierPart(prev)) {
return caretOffset - 1;
}
if ((caretOffset == text.length() || Character.isWhitespace(text.charAt(caretOffset))) && !Character.isWhitespace(prev)) {
return caretOffset - 1;
}
return caretOffset;
}
@Nullable
private static PsiElement findElementAt(final PsiFile file, final int caretOffset) {
PsiElement elementAt = file.findElementAt(caretOffset);