Don't fall when there's no parent descriptor for expression
(Example "class MaxInfo(val a = Int.<caret>)")
This commit is contained in:
@@ -171,7 +171,7 @@ public class ResolveSession {
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public JetScope getResolutionScope(PsiElement element) {
|
||||
public JetScope getResolutionScope(@NotNull PsiElement element) {
|
||||
PsiElement parent = element.getParent();
|
||||
if (parent instanceof JetFile) {
|
||||
JetFile file = (JetFile) parent;
|
||||
|
||||
@@ -217,7 +217,9 @@ public class ResolveSessionUtils {
|
||||
|
||||
private static JetScope getExpressionResolutionScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
|
||||
JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(expression, JetDeclaration.class);
|
||||
// DeclarationDescriptor descriptor = resolveToDescriptor(parentDeclaration);
|
||||
if (parentDeclaration == null) {
|
||||
return resolveSession.getResolutionScope(expression.getContainingFile().getFirstChild());
|
||||
}
|
||||
return resolveSession.getResolutionScope(parentDeclaration);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user