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

ANNOTATION_CLASS_WITH_BODY reported in DeclarationsChecker

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-26 16:07:32 +04:00
parent 12f06d032b
commit 999c987d6c
2 changed files with 8 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
@@ -137,11 +137,6 @@ public class DeclarationResolver {
JetClassOrObject classOrObject = entry.getKey(); JetClassOrObject classOrObject = entry.getKey();
MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue(); MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
JetClassBody jetClassBody = classOrObject.getBody();
if (classDescriptor.getKind() == ClassKind.ANNOTATION_CLASS && jetClassBody != null) {
trace.report(ANNOTATION_CLASS_WITH_BODY.on(jetClassBody));
}
resolveFunctionAndPropertyHeaders( resolveFunctionAndPropertyHeaders(
c, c,
classOrObject.getDeclarations(), classDescriptor.getScopeForMemberDeclarationResolution(), classOrObject.getDeclarations(), classDescriptor.getScopeForMemberDeclarationResolution(),
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+8
View File
@@ -210,6 +210,9 @@ public class DeclarationsChecker {
checkTraitModifiers(aClass); checkTraitModifiers(aClass);
checkConstructorInTrait(aClass); checkConstructorInTrait(aClass);
} }
else if (aClass.isAnnotation()) {
checkAnnotationClassWithBody(aClass);
}
else if (aClass.isEnum()) { else if (aClass.isEnum()) {
checkEnumModifiers(aClass); checkEnumModifiers(aClass);
} }
@@ -240,6 +243,11 @@ public class DeclarationsChecker {
} }
} }
private void checkAnnotationClassWithBody(JetClassOrObject classOrObject) {
if (classOrObject.getBody() != null) {
trace.report(ANNOTATION_CLASS_WITH_BODY.on(classOrObject.getBody()));
}
}
private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) { private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) {
for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) { for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) {