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

Cleanup (extracts common method)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-03-14 12:39:29 +01:00
parent cd9ecc98d0
commit 636abcd2e3
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/fileEditor/PsiElementNavigatable.java
+14 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ 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;
@@ -40,9 +39,8 @@ public class PsiElementNavigatable implements Navigatable {
@Override
public final void navigate(boolean requestFocus) {
PsiElement originalElement = myPointer.getElement();
if (originalElement != null && originalElement.isValid()) {
PsiElement element = ObjectUtils.notNull(originalElement.getNavigationElement(), originalElement);
PsiElement element = getElement();
if (element != null) {
VirtualFile file = element.getContainingFile().getVirtualFile();
if (file != null) {
new Task.Modal(element.getProject(), EditorBundle.message("editor.open.file.progress", file.getName()), true) {
@@ -63,8 +61,18 @@ public class PsiElementNavigatable implements Navigatable {
@Override
public boolean canNavigate() {
PsiElement element = getElement();
return element != null && element.getContainingFile().getVirtualFile() != null;
}
private PsiElement getElement() {
PsiElement element = myPointer.getElement();
return element != null && element.isValid() && ObjectUtils.notNull(element.getNavigationElement(), element).getContainingFile().getVirtualFile() != null;
if (element != null && element.isValid()) {
PsiElement navigationElement = element.getNavigationElement();
return navigationElement != null ? navigationElement : element;
}
return null;
}
@Override