survive context invalidation (EA-36089)

2026-09-27 10:03:11 +07:00 · 2012-08-07 19:07:44 +02:00
parent 315a6015f2
commit 0695aa715e
1 changed files with 4 additions and 0 deletions
@@ -57,6 +57,7 @@ public class PsiScopesUtil {
                                   @NotNull final PsiElement entrance,
                                   @Nullable final PsiElement maxScope,
                                   @NotNull final ResolveState state) {
+    assert entrance.isValid();
    PsiElement prevParent = entrance;
    PsiElement scope = entrance;

@@ -78,6 +79,9 @@ public class PsiScopesUtil {
      if (scope == maxScope) break;
      prevParent = scope;
      scope = prevParent.getContext();
+      if (scope != null && scope != prevParent.getParent() && !scope.isValid()) {
+        break;
+      }
      processor.handleEvent(JavaScopeProcessorEvent.CHANGE_LEVEL, null);
    }