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

IDEA-59329 CTRL+W on field declaration: one additional step

Browse Source
This commit is contained in:
peter
2017-05-09 14:37:54 +02:00
parent 74f9eca710
commit c7d41b6576
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java
+10 -11
View File
@@ -44,23 +44,22 @@ public class FieldSelectioner extends WordSelectioner {
@Override
public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
List<TextRange> result = super.select(e, editorText, cursorOffset, editor);
final PsiField field = (PsiField)e;
final TextRange range = field.getTextRange();
final PsiIdentifier first = field.getNameIdentifier();
final TextRange firstRange = first.getTextRange();
final PsiElement last = field.getInitializer();
final int end = last == null ? firstRange.getEndOffset() : last.getTextRange().getEndOffset();
PsiField field = (PsiField)e;
TextRange fieldRange = field.getTextRange();
PsiIdentifier nameId = field.getNameIdentifier();
TextRange nameRange = nameId.getTextRange();
PsiElement last = field.getInitializer();
int end = last == null ? nameRange.getEndOffset() : last.getTextRange().getEndOffset();
PsiDocComment comment = field.getDocComment();
if (comment != null) {
TextRange commentTextRange = comment.getTextRange();
addRangeElem(result, editorText, comment, commentTextRange.getEndOffset());
}
addRangeElem(result, editorText, first, end);
//addRangeElem (result, editorText, field, textLength, field.getTypeElement(), end);
addRangeElem(result, editorText, field.getModifierList(), range.getEndOffset());
//addRangeElem (result, editorText, field, textLength, field.getDocComment(), end);
result.addAll(expandToWholeLine(editorText, range));
addRangeElem(result, editorText, nameId, end);
addRangeElem(result, editorText, field.getTypeElement(), nameRange.getEndOffset());
addRangeElem(result, editorText, field.getModifierList(), fieldRange.getEndOffset());
result.addAll(expandToWholeLine(editorText, fieldRange));
return result;
}
}