From bafb6cc2f73a387c104d113c6505e3fc38770652 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 18 Sep 2015 12:34:20 +0300
Subject: [PATCH] Minor. Extract common code in ModifierChecker

---
 .../jetbrains/kotlin/resolve/ModifiersChecker.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
index 512dbd45b2a..b026cc13936 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
@@ -175,23 +175,23 @@ public class ModifiersChecker {
 
         public void checkModifiersForDeclaration(@NotNull JetDeclaration modifierListOwner, @NotNull MemberDescriptor descriptor) {
             checkNestedClassAllowed(modifierListOwner, descriptor);
-            ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
             checkTypeParametersModifiers(modifierListOwner);
+            checkModifierListCommon(modifierListOwner, descriptor);
+        }
+
+        private void checkModifierListCommon(@NotNull JetDeclaration modifierListOwner, @NotNull DeclarationDescriptor descriptor) {
             AnnotationUseSiteTargetChecker.INSTANCE$.check(modifierListOwner, descriptor, trace);
             runDeclarationCheckers(modifierListOwner, descriptor);
             ClassDescriptor classDescriptor = descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null;
             annotationChecker.check(modifierListOwner, trace, classDescriptor);
+            ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
         }
 
         public void checkModifiersForLocalDeclaration(
                 @NotNull JetDeclaration modifierListOwner,
                 @NotNull DeclarationDescriptor descriptor
         ) {
-            AnnotationUseSiteTargetChecker.INSTANCE$.check(modifierListOwner, descriptor, trace);
-            runDeclarationCheckers(modifierListOwner, descriptor);
-            annotationChecker.check(modifierListOwner, trace,
-                                              descriptor instanceof ClassDescriptor ? (ClassDescriptor) descriptor : null);
-            ModifierCheckerCore.INSTANCE$.check(modifierListOwner, trace, descriptor);
+            checkModifierListCommon(modifierListOwner, descriptor);
         }
 
         public void checkModifiersForMultiDeclaration(@NotNull JetMultiDeclaration multiDeclaration) {