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

Fix script properties kind in modifier checker #KT-18234 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-06-01 11:11:07 +03:00
committed by Mikhail Glukhikh
parent 29f25ebeb9
commit ecfc2236a6
7 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtProperty.java
+6 -1
View File
@@ -68,8 +68,13 @@ public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
}
public boolean isLocal() {
return !isTopLevel() && !isMember();
}
public boolean isMember() {
PsiElement parent = getParent();
return !(parent instanceof KtFile || parent instanceof KtClassBody);
return parent instanceof KtClassOrObject || parent instanceof KtClassBody ||
parent instanceof KtBlockExpression && parent.getParent() instanceof KtScript;
}
public boolean isTopLevel() {
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+1 -1
View File
@@ -204,7 +204,7 @@ class AnnotationChecker(private val additionalCheckers: Iterable<AdditionalAnnot
is KtProperty -> {
if (annotated.isLocal)
TargetLists.T_LOCAL_VARIABLE
else if (annotated.parent is KtClassOrObject || annotated.parent is KtClassBody)
else if (annotated.isMember)
TargetLists.T_MEMBER_PROPERTY(descriptor.hasBackingField(trace), annotated.hasDelegate())
else
TargetLists.T_TOP_LEVEL_PROPERTY(descriptor.hasBackingField(trace), annotated.hasDelegate())