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

More correct fix of getEnclosingElementForLocalDeclaration(

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-13 14:23:00 +03:00
parent d67b678a65
commit 841d07f1aa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+7 -1
View File
@@ -800,7 +800,13 @@ public class JetPsiUtil {
} }
else if (declaration instanceof JetParameter) { else if (declaration instanceof JetParameter) {
PsiElement parent = declaration.getParent(); PsiElement parent = declaration.getParent();
if (skipParameters && parent != null && parent.getParent() instanceof JetNamedFunction) {
// val/var parameter of primary constructor should not be considered as local
if (((JetParameter) declaration).getValOrVarNode() != null && parent != null && parent.getParent() instanceof JetPrimaryConstructor) {
return null;
}
else if (skipParameters && parent != null && parent.getParent() instanceof JetNamedFunction) {
declaration = (JetNamedFunction) parent.getParent(); declaration = (JetNamedFunction) parent.getParent();
} }
} }