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

Build fix (AdditionalResolveDescriptorRendererTestGenerated)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-10-07 16:41:14 +03:00
parent 34efaea6ea
commit 375a2cc6ab
2 changed files with 5 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
+4 -1
View File
@@ -142,7 +142,10 @@ public class KtDestructuringDeclarationEntry extends KtNamedDeclarationNotStubbe
@NotNull
@Override
public SearchScope getUseScope() {
KtElement enclosingBlock = KtPsiUtil.getEnclosingElementForLocalDeclaration(this, true);
KtElement enclosingBlock = KtPsiUtil.getEnclosingElementForLocalDeclaration(this, false);
if (enclosingBlock instanceof KtParameter) {
enclosingBlock = KtPsiUtil.getEnclosingElementForLocalDeclaration((KtParameter) enclosingBlock, false);
}
if (enclosingBlock != null) return new LocalSearchScope(enclosingBlock);
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;
}
}
if (current instanceof KtBlockExpression || (current instanceof KtParameter && !skipParameters)) {
if (current instanceof KtBlockExpression || current instanceof KtParameter) {
return (KtElement) current;
}
if (current instanceof KtValueArgument) {