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

Don't fall when there's no parent descriptor for expression

Browse Source 
(Example "class MaxInfo(val a = Int.<caret>)")
This commit is contained in:
Nikolay Krasko
2012-09-17 15:54:41 +04:00
parent ab1095a84e
commit f7da4f681c
2 changed files with 4 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/ResolveSession.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class ResolveSession {
} }
@NotNull @NotNull
public JetScope getResolutionScope(PsiElement element) { public JetScope getResolutionScope(@NotNull PsiElement element) {
PsiElement parent = element.getParent(); PsiElement parent = element.getParent();
if (parent instanceof JetFile) { if (parent instanceof JetFile) {
JetFile file = (JetFile) parent; JetFile file = (JetFile) parent;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+3 -1
View File
@@ -217,7 +217,9 @@ public class ResolveSessionUtils {
private static JetScope getExpressionResolutionScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) { private static JetScope getExpressionResolutionScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(expression, JetDeclaration.class); JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(expression, JetDeclaration.class);
// DeclarationDescriptor descriptor = resolveToDescriptor(parentDeclaration); if (parentDeclaration == null) {
return resolveSession.getResolutionScope(expression.getContainingFile().getFirstChild());
}
return resolveSession.getResolutionScope(parentDeclaration); return resolveSession.getResolutionScope(parentDeclaration);
} }