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

hierarchy view: getNavigationElement to support kotlin light classes (IDEA-169532)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-03-13 15:04:33 +01:00
parent 887d412b45
commit 4e1baa5177
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/fileEditor/PsiElementNavigatable.java
+5 -3
View File
@@ -26,6 +26,7 @@ import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.SmartPointerManager;
import com.intellij.psi.SmartPsiElementPointer;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import static com.intellij.openapi.util.Conditions.or;
@@ -39,8 +40,9 @@ public class PsiElementNavigatable implements Navigatable {
@Override
public final void navigate(boolean requestFocus) {
PsiElement element = myPointer.getElement();
if (element != null && element.isValid()) {
PsiElement originalElement = myPointer.getElement();
if (originalElement != null && originalElement.isValid()) {
PsiElement element = ObjectUtils.notNull(originalElement.getNavigationElement(), originalElement);
VirtualFile file = element.getContainingFile().getVirtualFile();
if (file != null) {
new Task.Modal(element.getProject(), EditorBundle.message("editor.open.file.progress", file.getName()), true) {
@@ -62,7 +64,7 @@ public class PsiElementNavigatable implements Navigatable {
@Override
public boolean canNavigate() {
PsiElement element = myPointer.getElement();
return element != null && element.isValid() && element.getContainingFile().getVirtualFile() != null;
return element != null && element.isValid() && ObjectUtils.notNull(element.getNavigationElement(), element).getContainingFile().getVirtualFile() != null;
}
@Override