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

getUseScope() fixed for destructuring declarations #KT-14181 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-10-04 15:36:42 +03:00
parent e7d290f726
commit de865c6d46
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtDestructuringDeclarationEntry.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class KtDestructuringDeclarationEntry extends KtNamedDeclarationNotStubbe
@NotNull @NotNull
@Override @Override
public SearchScope getUseScope() { public SearchScope getUseScope() {
KtElement enclosingBlock = KtPsiUtil.getEnclosingElementForLocalDeclaration(this, false); KtElement enclosingBlock = KtPsiUtil.getEnclosingElementForLocalDeclaration(this, true);
if (enclosingBlock != null) return new LocalSearchScope(enclosingBlock); if (enclosingBlock != null) return new LocalSearchScope(enclosingBlock);
return super.getUseScope(); return super.getUseScope();
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+1 -1
View File
@@ -796,7 +796,7 @@ public class KtPsiUtil {
return (KtElement) parent; return (KtElement) parent;
} }
} }
if (current instanceof KtBlockExpression || current instanceof KtParameter) { if (current instanceof KtBlockExpression || (current instanceof KtParameter && !skipParameters)) {
return (KtElement) current; return (KtElement) current;
} }
if (current instanceof KtValueArgument) { if (current instanceof KtValueArgument) {