diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java index 1b925e02eabe..87cc8e38cb2f 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java @@ -18,6 +18,7 @@ package com.intellij.psi.search.searches; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.project.Project; @@ -170,6 +171,9 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory() { @Override public SearchScope compute() { + if (!aClass.isValid()) { + throw new ProcessCanceledException(); + } return aClass.getUseScope(); } }), checkDeep);