This commit is contained in:
Maxim Shafirov
2011-03-12 16:29:08 +03:00
parent f54e601620
commit e9192a61ee
2 changed files with 2 additions and 3 deletions
@@ -6,7 +6,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiReference;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -69,7 +68,7 @@ public class JetReferenceExpression extends JetExpression {
@Override
public PsiElement resolve() {
PsiElement element = getElement();
JetFile file = PsiTreeUtil.getParentOfType(element, JetFile.class);
JetFile file = (JetFile) element.getContainingFile();
BindingContext bindingContext = AnalyzingUtils.analyzeFile(file, ErrorHandler.DO_NOTHING);
PsiElement psiElement = bindingContext.resolveToDeclarationPsiElement(JetReferenceExpression.this);
return psiElement == null
@@ -20,7 +20,7 @@ public class JetQuickDocumentationProvider extends QuickDocumentationProvider {
public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) {
JetReferenceExpression ref = PsiTreeUtil.getParentOfType(originalElement, JetReferenceExpression.class);
if (ref != null) {
BindingContext bindingContext = AnalyzingUtils.analyzeFile(PsiTreeUtil.getParentOfType(originalElement, JetFile.class), ErrorHandler.DO_NOTHING);
BindingContext bindingContext = AnalyzingUtils.analyzeFile((JetFile) element.getContainingFile(), ErrorHandler.DO_NOTHING);
DeclarationDescriptor declarationDescriptor = bindingContext.resolveReferenceExpression(ref);
if (declarationDescriptor != null) {
String text = DescriptorUtil.renderPresentableText(declarationDescriptor);