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

MISSING_VAL_ON_ANNOTATION_PARAMETER reported in DeclarationsChecker

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-26 16:19:08 +04:00
parent 999c987d6c
commit 8bf252f98c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
-5
View File
@@ -239,8 +239,6 @@ public class DeclarationResolver {
@NotNull MutableClassDescriptor classDescriptor, @NotNull MutableClassDescriptor classDescriptor,
@NotNull JetClass klass @NotNull JetClass klass
) { ) {
boolean isAnnotationClass = DescriptorUtils.isAnnotationClass(classDescriptor);
// TODO : not all the parameters are real properties // TODO : not all the parameters are real properties
JetScope memberScope = classDescriptor.getScopeForClassHeaderResolution(); JetScope memberScope = classDescriptor.getScopeForClassHeaderResolution();
ConstructorDescriptor constructorDescriptor = descriptorResolver.resolvePrimaryConstructorDescriptor(memberScope, classDescriptor, klass, trace); ConstructorDescriptor constructorDescriptor = descriptorResolver.resolvePrimaryConstructorDescriptor(memberScope, classDescriptor, klass, trace);
@@ -262,9 +260,6 @@ public class DeclarationResolver {
c.getPrimaryConstructorParameterProperties().put(parameter, propertyDescriptor); c.getPrimaryConstructorParameterProperties().put(parameter, propertyDescriptor);
} }
else { else {
if (isAnnotationClass) {
trace.report(MISSING_VAL_ON_ANNOTATION_PARAMETER.on(parameter));
}
notProperties.add(valueParameterDescriptor); notProperties.add(valueParameterDescriptor);
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+9
View File
@@ -212,6 +212,7 @@ public class DeclarationsChecker {
} }
else if (aClass.isAnnotation()) { else if (aClass.isAnnotation()) {
checkAnnotationClassWithBody(aClass); checkAnnotationClassWithBody(aClass);
checkValOnAnnotationParameter(aClass);
} }
else if (aClass.isEnum()) { else if (aClass.isEnum()) {
checkEnumModifiers(aClass); checkEnumModifiers(aClass);
@@ -249,6 +250,14 @@ public class DeclarationsChecker {
} }
} }
private void checkValOnAnnotationParameter(JetClass aClass) {
for (JetParameter parameter : aClass.getPrimaryConstructorParameters()) {
if (parameter.getValOrVarNode() == null) {
trace.report(MISSING_VAL_ON_ANNOTATION_PARAMETER.on(parameter));
}
}
}
private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) { private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) {
for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) { for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) {
if (memberDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) continue; if (memberDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) continue;