EA-71083 - NPE: BnfFlipChoiceIntention.invoke

Author: gregsh

support/org/intellij/grammar/intention/BnfFlipChoiceIntention.java

@@ -44,7 +44,7 @@ public String getText() {
   @NotNull
   @Override
   public String getFamilyName() {
-    return "Flip Choice Intention";
+    return "Flip choice intention";
   }
 
   @Override
@@ -63,15 +63,15 @@ public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws
   }
 
   @Nullable
-  private Pair<PsiElement, PsiElement> getArguments(PsiFile file, int offset) {
+  private static Pair<PsiElement, PsiElement> getArguments(PsiFile file, int offset) {
     PsiElement element = file.getViewProvider().findElementAt(offset);
     final BnfChoice choice = PsiTreeUtil.getParentOfType(element, BnfChoice.class);
     if (choice == null) return null;
     for (PsiElement cur = choice.getFirstChild(), prev = null; cur != null; cur = cur.getNextSibling()) {
       if (!(cur instanceof BnfExpression) ) continue;
       int start = prev == null? choice.getTextRange().getStartOffset() : prev.getTextRange().getEndOffset();
       int end = cur.getTextRange().getStartOffset();
-      if (start <= offset && offset <= end) return Pair.create(cur, prev);
+      if (start <= offset && offset <= end) return prev == null ? null : Pair.create(cur, prev);
       prev = cur;
     }
     return null;