diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java index b171f67e550..f8cdea04daa 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java @@ -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 diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index c342b59cb48..d5bcbf3f139 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -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);