From 1f95636bdff3b4be80ea0c315564cd456e8980af Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 2 Jul 2012 21:14:49 +0400 Subject: [PATCH] Injectors regenerated --- .../jet/di/InjectorForJetTypeMapper.java | 3 -- .../jet/di/InjectorForBodyResolve.java | 3 -- .../jet/di/InjectorForLazyResolve.java | 3 -- .../jetbrains/jet/di/InjectorForMacros.java | 1 - .../jet/di/InjectorForTopDownAnalyzer.java | 29 +++++++++++++++++++ .../di/InjectorForTopDownAnalyzerBasic.java | 5 ---- .../jetbrains/jet/di/InjectorForTests.java | 1 - .../jet/di/AllInjectorsGenerator.java | 1 + .../di/InjectorForTopDownAnalyzerForJs.java | 5 ---- 9 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJetTypeMapper.java index c50776ed0ac..122bfa6e444 100644 --- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJetTypeMapper.java @@ -24,9 +24,6 @@ import org.jetbrains.jet.codegen.JetTypeMapper; import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping; import org.jetbrains.jet.codegen.ClassBuilderMode; import org.jetbrains.jet.codegen.ClosureAnnotator; -import org.jetbrains.jet.lang.resolve.BindingContext; -import java.util.List; -import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index 1115a0dd0c8..83ecad21737 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -32,9 +32,6 @@ import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; import org.jetbrains.jet.lang.resolve.DeclarationsChecker; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext; -import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 6d527380407..5102afb0ad4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -28,9 +28,6 @@ import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver; -import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index 23020ab2793..24c27ea4719 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver; -import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java new file mode 100644 index 00000000000..9a175ac85a5 --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzer.java @@ -0,0 +1,29 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.di; + +import org.jetbrains.jet.lang.ModuleConfiguration; +import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; + +/** + * @author abreslav + */ +public interface InjectorForTopDownAnalyzer { + ModuleConfiguration getModuleConfiguration(); + + TopDownAnalyzer getTopDownAnalyzer(); +} diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index cb14693915d..e2ea46757c7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -44,11 +44,6 @@ import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 165332e7d03..6a1a6d0436c 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -26,7 +26,6 @@ import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver; -import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index fdea14e34e7..871653d1818 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -91,6 +91,7 @@ public class AllInjectorsGenerator { private static void generateInjectorForTopDownAnalyzerForJvm() throws IOException { DependencyInjectorGenerator generator = new DependencyInjectorGenerator(false); + generator.implementInterface(InjectorForTopDownAnalyzer.class); generateInjectorForTopDownAnalyzerCommon(generator); generator.addParameter(BuiltinsScopeExtensionMode.class); generator.addPublicField(JavaBridgeConfiguration.class); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 8488c0eff8a..8c93376ad77 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -44,11 +44,6 @@ import org.jetbrains.jet.lang.resolve.OverloadResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy;