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

Minor. Extract common code in ModifierChecker

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-18 12:34:20 +03:00
parent 4d9eaf19c3
commit bafb6cc2f7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+6 -6
View File
@@ -175,23 +175,23 @@ public class ModifiersChecker {
public void checkModifiersForDeclaration(@NotNull JetDeclaration modifierListOwner, @NotNull MemberDescriptor descriptor) { public void checkModifiersForDeclaration(@NotNull JetDeclaration modifierListOwner, @NotNull MemberDescriptor descriptor) {
checkNestedClassAllowed(modifierListOwner, descriptor); checkNestedClassAllowed(modifierListOwner, descriptor);
ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
checkTypeParametersModifiers(modifierListOwner); checkTypeParametersModifiers(modifierListOwner);
checkModifierListCommon(modifierListOwner, descriptor);
}
private void checkModifierListCommon(@NotNull JetDeclaration modifierListOwner, @NotNull DeclarationDescriptor descriptor) {
AnnotationUseSiteTargetChecker.INSTANCE$.check(modifierListOwner, descriptor, trace); AnnotationUseSiteTargetChecker.INSTANCE$.check(modifierListOwner, descriptor, trace);
runDeclarationCheckers(modifierListOwner, descriptor); runDeclarationCheckers(modifierListOwner, descriptor);
ClassDescriptor classDescriptor = descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null; ClassDescriptor classDescriptor = descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null;
annotationChecker.check(modifierListOwner, trace, classDescriptor); annotationChecker.check(modifierListOwner, trace, classDescriptor);
ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
} }
public void checkModifiersForLocalDeclaration( public void checkModifiersForLocalDeclaration(
@NotNull JetDeclaration modifierListOwner, @NotNull JetDeclaration modifierListOwner,
@NotNull DeclarationDescriptor descriptor @NotNull DeclarationDescriptor descriptor
) { ) {
AnnotationUseSiteTargetChecker.INSTANCE$.check(modifierListOwner, descriptor, trace); checkModifierListCommon(modifierListOwner, descriptor);
runDeclarationCheckers(modifierListOwner, descriptor);
annotationChecker.check(modifierListOwner, trace,
descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null);
ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
} }
public void checkModifiersForMultiDeclaration(@NotNull JetMultiDeclaration multiDeclaration) { public void checkModifiersForMultiDeclaration(@NotNull JetMultiDeclaration multiDeclaration) {