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

don't perform resolve to preselect class in the view (IDEA-167197)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-02-09 17:20:26 +01:00
parent 801f2805ab
commit cf5347d190
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java
+14 -3
View File
@@ -25,10 +25,12 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeClassChooserFactory;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFunctionalExpression;
import com.intellij.psi.PsiFile;
import com.intellij.psi.presentation.java.ClassPresentationUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
@@ -37,7 +39,6 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.search.searches.FunctionalExpressionSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.Processor;
import org.jetbrains.annotations.Nullable;
import java.util.LinkedList;
@@ -51,7 +52,17 @@ public class ClassHierarchyScopeDescriptor extends ScopeDescriptor {
public ClassHierarchyScopeDescriptor(final Project project) {
super(null);
myProject = project;
myRootClass = PsiTreeUtil.getParentOfType(CommonDataKeys.PSI_ELEMENT.getData(DataManager.getInstance().getDataContext()), PsiClass.class, false);
DataContext dataContext = DataManager.getInstance().getDataContext();
PsiElement element;
Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
if (editor != null) {
PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext);
element = file != null ? file.findElementAt(editor.getCaretModel().getOffset()) : null;
}
else {
element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
}
myRootClass = PsiTreeUtil.getParentOfType(element, PsiClass.class, false);
}
public String getDisplay() {