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

allow external documentation over references with multiple resolve

Browse Source
This commit is contained in:
Maxim.Mossienko
2014-01-08 13:20:51 +01:00
parent 1c993e808b
commit 7b239dfc2a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java
+17 -3
View File
@@ -16,6 +16,7 @@
package com.intellij.ide.actions;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.codeInsight.documentation.DocumentationManager;
import com.intellij.ide.BrowserUtil;
import com.intellij.ide.DataManager;
@@ -32,6 +33,7 @@ import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.Nullable;
@@ -52,7 +54,8 @@ public class ExternalJavaDocAction extends AnAction {
return;
}
PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
PsiElement element = getElement(dataContext, editor);
if (element == null) {
Messages.showMessageDialog(
project,
@@ -65,7 +68,7 @@ public class ExternalJavaDocAction extends AnAction {
PsiFile context = CommonDataKeys.PSI_FILE.getData(dataContext);
Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
PsiElement originalElement = getOriginalElement(context, editor);
DocumentationManager.storeOriginalElement(project, originalElement, element);
final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element);
@@ -112,7 +115,7 @@ public class ExternalJavaDocAction extends AnAction {
Presentation presentation = event.getPresentation();
DataContext dataContext = event.getDataContext();
Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
final PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
PsiElement element = getElement(dataContext, editor);
final PsiElement originalElement = getOriginalElement(CommonDataKeys.PSI_FILE.getData(dataContext), editor);
DocumentationManager.storeOriginalElement(CommonDataKeys.PROJECT.getData(dataContext), originalElement, element);
final DocumentationProvider provider = DocumentationManager.getProviderFromElement(element);
@@ -139,4 +142,15 @@ public class ExternalJavaDocAction extends AnAction {
presentation.setVisible(true);
}
}
private PsiElement getElement(DataContext dataContext, Editor editor) {
PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
if (element == null) {
PsiReference reference = TargetElementUtilBase.findReference(editor, editor.getCaretModel().getOffset());
if (reference != null) {
element = reference.getElement();
}
}
return element;
}
}