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

Navigation: Use local search scope for top-level properties in script

Browse Source 
#KT-20465 Fixed
This commit is contained in:
Alexey Sedunov
2018-05-31 15:20:42 +03:00
parent 0110f66529
commit 0f80dd4ecf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java
+6
View File
@@ -141,6 +141,12 @@ abstract class KtNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extends
return new LocalSearchScope(enclosingBlock); return new LocalSearchScope(enclosingBlock);
} }
PsiElement parent = getParent();
PsiElement grandParent = parent != null ? parent.getParent() : null;
if (parent instanceof KtBlockExpression && grandParent instanceof KtScript) {
return new LocalSearchScope(getContainingFile());
}
if (hasModifier(KtTokens.PRIVATE_KEYWORD)) { if (hasModifier(KtTokens.PRIVATE_KEYWORD)) {
KtElement containingClass = PsiTreeUtil.getParentOfType(this, KtClassOrObject.class); KtElement containingClass = PsiTreeUtil.getParentOfType(this, KtClassOrObject.class);
if (containingClass instanceof KtObjectDeclaration && ((KtObjectDeclaration) containingClass).isCompanion()) { if (containingClass instanceof KtObjectDeclaration && ((KtObjectDeclaration) containingClass).isCompanion()) {