EA-33340 - NPE: RegExpWordSelectionFilter.value

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpWordSelectionFilter.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpWordSelectionFilter.java
index 29ce387b74650f66f233604471e00017383a11a4..6ac84b85c7e13dd5b787f2a46a99a6a77417cd1f 100644 (file)
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpWordSelectionFilter.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpWordSelectionFilter.java
@@ -15,17 +15,20 @@
  */
 package org.intellij.lang.regexp;
 
  */
 package org.intellij.lang.regexp;
 

+import com.intellij.lang.ASTNode;

 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
 import org.intellij.lang.regexp.psi.RegExpChar;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
 import org.intellij.lang.regexp.psi.RegExpChar;

+import org.jetbrains.annotations.NotNull;

 
 /**
  * @author yole
  */
 public class RegExpWordSelectionFilter implements Condition<PsiElement> {
   @Override
 
 /**
  * @author yole
  */
 public class RegExpWordSelectionFilter implements Condition<PsiElement> {
   @Override

-  public boolean value(PsiElement element) {
-    if (element.getNode().getElementType() == RegExpTT.CHARACTER || element instanceof RegExpChar) {
+  public boolean value(@NotNull PsiElement element) {
+    final ASTNode node = element.getNode();
+    if ((node != null && node.getElementType() == RegExpTT.CHARACTER) || element instanceof RegExpChar) {

       return false;
     }
     return true;
       return false;
     }
     return true;