diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java
index b770bac42989..6e22cf433d34 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java
@@ -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;
   }
 }