MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

To support plugin unloading from Search Everywhere, keep context reference as smart pointer (IDEA-233601)

Browse Source 
GitOrigin-RevId: 016aa93be3adbcd29cb22e3332522f45b7db605d
This commit is contained in:
Dmitry Jemerov
2020-03-10 09:34:33 +00:00
committed by intellij-monorepo-bot
parent 17fd84c526
commit 7b926c16f8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java
+6 -3
View File
@@ -37,6 +37,8 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.SmartPointerManager;
import com.intellij.psi.SmartPsiElementPointer;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.ComponentUtil;
@@ -82,12 +84,13 @@ public abstract class AbstractGotoSEContributor implements WeightedSearchEverywh
private final GlobalSearchScope myEverywhereScope;
private final GlobalSearchScope myProjectScope;
protected final PsiElement myPsiContext;
protected final SmartPsiElementPointer<PsiElement> myPsiContext;
protected final List<ScopeDescriptor> myScopeDescriptors = new ArrayList<>();
protected AbstractGotoSEContributor(@NotNull AnActionEvent event) {
myProject = event.getRequiredData(CommonDataKeys.PROJECT);
myPsiContext = GotoActionBase.getPsiContext(event);
PsiElement context = GotoActionBase.getPsiContext(event);
myPsiContext = context != null ? SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(context) : null;
myEverywhereScope = GlobalSearchScope.everythingScope(myProject);
ScopeChooserCombo.processScopes(
myProject, event.getDataContext(),
@@ -231,7 +234,7 @@ public abstract class AbstractGotoSEContributor implements WeightedSearchEverywh
FilteringGotoByModel<?> model = createModel(myProject);
if (progressIndicator.isCanceled()) return;
PsiElement context = myPsiContext != null && myPsiContext.isValid() ? myPsiContext : null;
PsiElement context = myPsiContext != null ? myPsiContext.getElement() : null;
ChooseByNamePopup popup = ChooseByNamePopup.createPopup(myProject, model, context);
try {
ChooseByNameItemProvider provider = popup.getProvider();