azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get parent by stub in ScopeProvider

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-09 19:32:28 +04:00
parent 2f72731d85
commit 977f4ac070
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+3 -2
View File
@@ -120,12 +120,13 @@ public class ScopeProvider {
@NotNull @NotNull
public JetScope getResolutionScopeForDeclaration(@NotNull PsiElement elementOfDeclaration) { public JetScope getResolutionScopeForDeclaration(@NotNull PsiElement elementOfDeclaration) {
JetDeclaration jetDeclaration = PsiTreeUtil.getParentOfType(elementOfDeclaration, JetDeclaration.class, false); JetDeclaration jetDeclaration = JetStubbedPsiUtil.getContainingDeclaration(elementOfDeclaration, JetDeclaration.class, false);
assert !(elementOfDeclaration instanceof JetDeclaration) || jetDeclaration == elementOfDeclaration : assert !(elementOfDeclaration instanceof JetDeclaration) || jetDeclaration == elementOfDeclaration :
"For JetDeclaration element getParentOfType() should return itself."; "For JetDeclaration element getParentOfType() should return itself.";
assert jetDeclaration != null : "Should be contained inside declaration.";
JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(jetDeclaration, JetDeclaration.class); JetDeclaration parentDeclaration = JetStubbedPsiUtil.getContainingDeclaration(jetDeclaration);
if (jetDeclaration instanceof JetPropertyAccessor) { if (jetDeclaration instanceof JetPropertyAccessor) {
parentDeclaration = PsiTreeUtil.getParentOfType(parentDeclaration, JetDeclaration.class); parentDeclaration = PsiTreeUtil.getParentOfType(parentDeclaration, JetDeclaration.class);