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

IDEA-121420 ctrl+b on "def" keyword of a variable without explicit type with initializer should navigate to inferred type

Browse Source
This commit is contained in:
Max Medvedev
2014-03-04 16:58:48 +04:00
parent ed39848efd
commit 1b0f4e8936
1 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
+35 -16
View File
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -25,7 +25,6 @@ import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.stubs.EmptyStub;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -212,7 +211,7 @@ public class GrVariableDeclarationImpl extends GrStubElementBase<EmptyStub> impl
@Nullable
@Override
public Result<PsiReference> compute() {
return Result.create(getReferenceInner(), PsiModificationTracker.MODIFICATION_COUNT);
return Result.create(getReferenceInner(), getContainingFile());
}
});
}
@@ -226,20 +225,40 @@ public class GrVariableDeclarationImpl extends GrStubElementBase<EmptyStub> impl
final GrVariable[] variables = getVariables();
if (variables.length == 0) return null;
final PsiElement resolved = variables[0];
return new PsiReferenceBase<GrVariableDeclaration>(this, range, true) {
@Nullable
@Override
public PsiElement resolve() {
return resolved;
}
final GrVariable resolved = variables[0];
final PsiType inferredType = resolved.getTypeGroovy();
if (inferredType == null) return null;
@NotNull
@Override
public Object[] getVariants() {
return EMPTY_ARRAY;
}
};
if (inferredType instanceof PsiClassType) {
return new PsiReferenceBase<GrVariableDeclaration>(this, range, true) {
@Nullable
@Override
public PsiElement resolve() {
return ((PsiClassType)inferredType).resolve();
}
@NotNull
@Override
public Object[] getVariants() {
return EMPTY_ARRAY;
}
};
}
else {
return new PsiReferenceBase<GrVariableDeclaration>(this, range, true) {
@Nullable
@Override
public PsiElement resolve() {
return resolved;
}
@NotNull
@Override
public Object[] getVariants() {
return EMPTY_ARRAY;
}
};
}
}
private TextRange getRangeForReference() {