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

Inject declarations checkers into ModifiersChecker

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-22 15:12:41 +03:00
parent f5878eddd4
commit a75b80c70d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+3
View File
@@ -43,6 +43,9 @@ public fun StorageComponentContainer.configureModule(
useInstance(moduleContext.platformToKotlinClassMap) useInstance(moduleContext.platformToKotlinClassMap)
useInstance(additionalCheckerProvider) useInstance(additionalCheckerProvider)
useInstance(additionalCheckerProvider.symbolUsageValidator) useInstance(additionalCheckerProvider.symbolUsageValidator)
additionalCheckerProvider.declarationCheckers.forEach {
useInstance(it)
}
} }
public fun StorageComponentContainer.configureModule( public fun StorageComponentContainer.configureModule(
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+4 -4
View File
@@ -459,7 +459,7 @@ public class ModifiersChecker {
private void runDeclarationCheckers(@NotNull JetDeclaration declaration, @NotNull DeclarationDescriptor descriptor) { 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()); checker.check(declaration, descriptor, trace, trace.getBindingContext());
} }
} }
@@ -482,10 +482,10 @@ public class ModifiersChecker {
} }
@NotNull @NotNull
private final AdditionalCheckerProvider additionalCheckerProvider; private final Iterable<? extends DeclarationChecker> declarationCheckers;
public ModifiersChecker(@NotNull AdditionalCheckerProvider additionalCheckerProvider) { public ModifiersChecker(@NotNull Iterable<? extends DeclarationChecker> declarationCheckers) {
this.additionalCheckerProvider = additionalCheckerProvider; this.declarationCheckers = declarationCheckers;
} }
@NotNull @NotNull