MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

goto type declaration: place aware (IDEA-85106)

Browse Source
This commit is contained in:
anna
2012-04-25 17:19:03 +02:00
parent 736a74a221
commit f1fcd7ccd8
3 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java
+17 -2
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.codeInsight.navigation.actions;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import org.jetbrains.annotations.Nullable;
@@ -22,9 +24,15 @@ import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public class JavaTypeDeclarationProvider implements TypeDeclarationProvider {
public class JavaTypeDeclarationProvider implements TypeDeclarationPlaceAwareProvider {
@Override
public PsiElement[] getSymbolTypeDeclarations(PsiElement symbol) {
return getSymbolTypeDeclarations(symbol, null, -1);
}
@Nullable
public PsiElement[] getSymbolTypeDeclarations(final PsiElement targetElement) {
@Override
public PsiElement[] getSymbolTypeDeclarations(PsiElement targetElement, Editor editor, int offset) {
PsiType type;
if (targetElement instanceof PsiVariable){
type = ((PsiVariable)targetElement).getType();
@@ -36,6 +44,13 @@ public class JavaTypeDeclarationProvider implements TypeDeclarationProvider {
return null;
}
if (type == null) return null;
if (editor != null) {
final PsiReference reference = TargetElementUtilBase.findReference(editor, offset);
if (reference instanceof PsiJavaReference) {
final JavaResolveResult resolveResult = ((PsiJavaReference)reference).advancedResolve(true);
type = resolveResult.getSubstitutor().substitute(type);
}
}
PsiClass psiClass = PsiUtil.resolveClassInType(type);
return psiClass == null ? null : new PsiElement[] {psiClass};
}