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

bind external annotation gutter markers to name identifiers to avoid excessive blinking

Browse Source
This commit is contained in:
peter
2014-10-02 16:40:41 +02:00
parent ffa6cca625
commit 53496fae8b
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsLineMarkerProvider.java
+22 -14
View File
@@ -45,26 +45,31 @@ import java.util.Collection;
import java.util.List;
public class ExternalAnnotationsLineMarkerProvider implements LineMarkerProvider {
private static final Function<PsiElement, String> ourTooltipProvider = new Function<PsiElement, String>() {
@Override
public String fun(PsiElement nameIdentifier) {
return XmlStringUtil.wrapInHtml(JavaDocInfoGenerator.generateSignature(nameIdentifier.getParent()));
}
};
@Nullable
@Override
public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
if (!(element instanceof PsiModifierListOwner)) return null;
public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement element) {
if (!(element instanceof PsiModifierListOwner) || !(element instanceof PsiNameIdentifierOwner)) return null;
if (element instanceof PsiParameter || element instanceof PsiLocalVariable) return null;
PsiElement nameIdentifier = ((PsiNameIdentifierOwner)element).getNameIdentifier();
if (nameIdentifier == null || nameIdentifier.getParent() != element) return null;
if (!shouldShowSignature((PsiModifierListOwner)element)) {
return null;
}
final Function<PsiModifierListOwner, String> annotationsCollector = new Function<PsiModifierListOwner, String>() {
@Override
public String fun(PsiModifierListOwner owner) {
return XmlStringUtil.wrapInHtml(JavaDocInfoGenerator.generateSignature(owner));
}
};
return new LineMarkerInfo<PsiModifierListOwner>((PsiModifierListOwner)element, element.getTextOffset(), AllIcons.Gutter.ExtAnnotation,
Pass.UPDATE_ALL,
annotationsCollector, new MyIconGutterHandler(),
GutterIconRenderer.Alignment.LEFT);
return new LineMarkerInfo<PsiElement>(nameIdentifier, nameIdentifier.getTextRange().getStartOffset(),
AllIcons.Gutter.ExtAnnotation,
Pass.UPDATE_ALL,
ourTooltipProvider, MyIconGutterHandler.INSTANCE,
GutterIconRenderer.Alignment.LEFT);
}
private static boolean shouldShowSignature(PsiModifierListOwner owner) {
@@ -112,9 +117,12 @@ public class ExternalAnnotationsLineMarkerProvider implements LineMarkerProvider
@Override
public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {}
private static class MyIconGutterHandler implements GutterIconNavigationHandler<PsiModifierListOwner> {
private static class MyIconGutterHandler implements GutterIconNavigationHandler<PsiElement> {
static final MyIconGutterHandler INSTANCE = new MyIconGutterHandler();
@Override
public void navigate(MouseEvent e, final PsiModifierListOwner listOwner) {
public void navigate(MouseEvent e, PsiElement nameIdentifier) {
final PsiElement listOwner = nameIdentifier.getParent();
final PsiFile containingFile = listOwner.getContainingFile();
final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(listOwner);
if (virtualFile != null && containingFile != null) {