EA-47125 - NPE: UnSelectWordHandler.doAction

This commit is contained in:
Alexey Kudravtsev
2013-06-25 08:58:04 +04:00
parent 869324801b
commit 94dbd1ee65
@@ -83,12 +83,19 @@ public class UnSelectWordHandler extends EditorActionHandler {
}
}
while (element instanceof PsiWhiteSpace) {
if (element.getNextSibling() == null) {
if (element instanceof PsiWhiteSpace) {
PsiElement nextSibling = element.getNextSibling();
if (nextSibling == null) {
element = element.getParent();
if (element == null || element instanceof PsiFile) {
return;
}
nextSibling = element.getNextSibling();
if (nextSibling == null) {
return;
}
}
element = element.getNextSibling();
element = nextSibling;
cursorOffset = element.getTextRange().getStartOffset();
}