From a75b80c70d408214c9c543cc7d0d8334d3c7673d Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 22 Jul 2015 15:12:41 +0300
Subject: [PATCH] Inject declarations checkers into ModifiersChecker

---
 .../src/org/jetbrains/kotlin/frontend/di/injection.kt     | 3 +++
 .../org/jetbrains/kotlin/resolve/ModifiersChecker.java    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
index cfcb39c4022..82b01068a9a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
@@ -43,6 +43,9 @@ public fun StorageComponentContainer.configureModule(
     useInstance(moduleContext.platformToKotlinClassMap)
     useInstance(additionalCheckerProvider)
     useInstance(additionalCheckerProvider.symbolUsageValidator)
+    additionalCheckerProvider.declarationCheckers.forEach {
+        useInstance(it)
+    }
 }
 
 public fun StorageComponentContainer.configureModule(
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
index 0aa8c4c098b..1162496deeb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
@@ -459,7 +459,7 @@ public class ModifiersChecker {
 
 
         private void runDeclarationCheckers(@NotNull JetDeclaration declaration, @NotNull DeclarationDescriptor descriptor) {
-            for (DeclarationChecker checker : additionalCheckerProvider.getDeclarationCheckers()) {
+            for (DeclarationChecker checker : declarationCheckers) {
                 checker.check(declaration, descriptor, trace, trace.getBindingContext());
             }
         }
@@ -482,10 +482,10 @@ public class ModifiersChecker {
     }
 
     @NotNull
-    private final AdditionalCheckerProvider additionalCheckerProvider;
+    private final Iterable<? extends DeclarationChecker> declarationCheckers;
 
-    public ModifiersChecker(@NotNull AdditionalCheckerProvider additionalCheckerProvider) {
-        this.additionalCheckerProvider = additionalCheckerProvider;
+    public ModifiersChecker(@NotNull Iterable<? extends DeclarationChecker> declarationCheckers) {
+        this.declarationCheckers = declarationCheckers;
     }
 
     @NotNull