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

JetPsiBuilder -> JetImportsFactory rename

Browse Source
This commit is contained in:
Nikolay Krasko
2013-01-15 21:05:18 +04:00
parent a15f1c8946
commit e69acd9198
8 changed files with 75 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+16 -48
View File
@@ -16,52 +16,20 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import org.jetbrains.jet.lang.resolve.TopDownAnalyzer;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
import org.jetbrains.jet.lang.resolve.BodyResolver;
import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
import org.jetbrains.jet.lang.resolve.DescriptorResolver;
import com.intellij.openapi.project.Project; 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.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl;
import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.DeclarationResolver;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.resolve.TypeResolver;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.ImportsResolver;
import org.jetbrains.jet.lang.psi.JetPsiBuilder;
import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver;
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 org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory;
import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassObjectResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetImportsFactory;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory;
import org.jetbrains.jet.lang.resolve.java.resolver.*;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
@@ -90,7 +58,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
private QualifiedExpressionResolver qualifiedExpressionResolver; private QualifiedExpressionResolver qualifiedExpressionResolver;
private CandidateResolver candidateResolver; private CandidateResolver candidateResolver;
private ImportsResolver importsResolver; private ImportsResolver importsResolver;
private JetPsiBuilder jetPsiBuilder; private JetImportsFactory jetImportsFactory;
private ScriptHeaderResolver scriptHeaderResolver; private ScriptHeaderResolver scriptHeaderResolver;
private OverloadResolver overloadResolver; private OverloadResolver overloadResolver;
private OverrideResolver overrideResolver; private OverrideResolver overrideResolver;
@@ -141,7 +109,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
this.candidateResolver = new CandidateResolver(); this.candidateResolver = new CandidateResolver();
this.importsResolver = new ImportsResolver(); this.importsResolver = new ImportsResolver();
this.jetPsiBuilder = new JetPsiBuilder(); this.jetImportsFactory = new JetImportsFactory();
this.scriptHeaderResolver = new ScriptHeaderResolver(); this.scriptHeaderResolver = new ScriptHeaderResolver();
this.overloadResolver = new OverloadResolver(); this.overloadResolver = new OverloadResolver();
this.overrideResolver = new OverrideResolver(); this.overrideResolver = new OverrideResolver();
@@ -242,11 +210,11 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
importsResolver.setConfiguration(moduleConfiguration); importsResolver.setConfiguration(moduleConfiguration);
importsResolver.setContext(topDownAnalysisContext); importsResolver.setContext(topDownAnalysisContext);
importsResolver.setPsiBuilder(jetPsiBuilder); importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
importsResolver.setTrace(bindingTrace); importsResolver.setTrace(bindingTrace);
jetPsiBuilder.setProject(project); jetImportsFactory.setProject(project);
scriptHeaderResolver.setContext(topDownAnalysisContext); scriptHeaderResolver.setContext(topDownAnalysisContext);
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver); scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
+15 -18
View File
@@ -17,20 +17,17 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.resolve.DescriptorResolver;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.resolve.TypeResolver;
import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.psi.JetPsiBuilder;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.psi.JetImportsFactory;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
@@ -46,7 +43,7 @@ public class InjectorForLazyResolve {
private ScopeProvider scopeProvider; private ScopeProvider scopeProvider;
private AnnotationResolver annotationResolver; private AnnotationResolver annotationResolver;
private QualifiedExpressionResolver qualifiedExpressionResolver; private QualifiedExpressionResolver qualifiedExpressionResolver;
private JetPsiBuilder jetPsiBuilder; private JetImportsFactory jetImportsFactory;
private CallResolver callResolver; private CallResolver callResolver;
private ArgumentTypeResolver argumentTypeResolver; private ArgumentTypeResolver argumentTypeResolver;
private CandidateResolver candidateResolver; private CandidateResolver candidateResolver;
@@ -67,7 +64,7 @@ public class InjectorForLazyResolve {
this.scopeProvider = new ScopeProvider(resolveSession); this.scopeProvider = new ScopeProvider(resolveSession);
this.annotationResolver = new AnnotationResolver(); this.annotationResolver = new AnnotationResolver();
this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
this.jetPsiBuilder = new JetPsiBuilder(); this.jetImportsFactory = new JetImportsFactory();
this.callResolver = new CallResolver(); this.callResolver = new CallResolver();
this.argumentTypeResolver = new ArgumentTypeResolver(); this.argumentTypeResolver = new ArgumentTypeResolver();
this.candidateResolver = new CandidateResolver(); this.candidateResolver = new CandidateResolver();
@@ -89,7 +86,7 @@ public class InjectorForLazyResolve {
this.annotationResolver.setCallResolver(callResolver); this.annotationResolver.setCallResolver(callResolver);
this.annotationResolver.setExpressionTypingServices(expressionTypingServices); this.annotationResolver.setExpressionTypingServices(expressionTypingServices);
this.jetPsiBuilder.setProject(project); this.jetImportsFactory.setProject(project);
callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setArgumentTypeResolver(argumentTypeResolver);
callResolver.setCandidateResolver(candidateResolver); callResolver.setCandidateResolver(candidateResolver);
@@ -131,8 +128,8 @@ public class InjectorForLazyResolve {
return this.qualifiedExpressionResolver; return this.qualifiedExpressionResolver;
} }
public JetPsiBuilder getJetPsiBuilder() { public JetImportsFactory getJetImportsFactory() {
return this.jetPsiBuilder; return this.jetImportsFactory;
} }
} }
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+14 -31
View File
@@ -16,35 +16,18 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import org.jetbrains.jet.lang.resolve.TopDownAnalyzer;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
import org.jetbrains.jet.lang.resolve.BodyResolver;
import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
import org.jetbrains.jet.lang.resolve.DescriptorResolver;
import com.intellij.openapi.project.Project; 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.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.DeclarationResolver;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.resolve.TypeResolver;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.ImportsResolver;
import org.jetbrains.jet.lang.psi.JetPsiBuilder;
import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver;
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 org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetImportsFactory;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
@@ -72,7 +55,7 @@ public class InjectorForTopDownAnalyzerBasic {
private QualifiedExpressionResolver qualifiedExpressionResolver; private QualifiedExpressionResolver qualifiedExpressionResolver;
private CandidateResolver candidateResolver; private CandidateResolver candidateResolver;
private ImportsResolver importsResolver; private ImportsResolver importsResolver;
private JetPsiBuilder jetPsiBuilder; private JetImportsFactory jetImportsFactory;
private ScriptHeaderResolver scriptHeaderResolver; private ScriptHeaderResolver scriptHeaderResolver;
private OverloadResolver overloadResolver; private OverloadResolver overloadResolver;
private OverrideResolver overrideResolver; private OverrideResolver overrideResolver;
@@ -108,7 +91,7 @@ public class InjectorForTopDownAnalyzerBasic {
this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
this.candidateResolver = new CandidateResolver(); this.candidateResolver = new CandidateResolver();
this.importsResolver = new ImportsResolver(); this.importsResolver = new ImportsResolver();
this.jetPsiBuilder = new JetPsiBuilder(); this.jetImportsFactory = new JetImportsFactory();
this.scriptHeaderResolver = new ScriptHeaderResolver(); this.scriptHeaderResolver = new ScriptHeaderResolver();
this.overloadResolver = new OverloadResolver(); this.overloadResolver = new OverloadResolver();
this.overrideResolver = new OverrideResolver(); this.overrideResolver = new OverrideResolver();
@@ -183,11 +166,11 @@ public class InjectorForTopDownAnalyzerBasic {
importsResolver.setConfiguration(moduleConfiguration); importsResolver.setConfiguration(moduleConfiguration);
importsResolver.setContext(topDownAnalysisContext); importsResolver.setContext(topDownAnalysisContext);
importsResolver.setPsiBuilder(jetPsiBuilder); importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
importsResolver.setTrace(bindingTrace); importsResolver.setTrace(bindingTrace);
jetPsiBuilder.setProject(project); jetImportsFactory.setProject(project);
scriptHeaderResolver.setContext(topDownAnalysisContext); scriptHeaderResolver.setContext(topDownAnalysisContext);
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiBuilder.java → compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportsFactory.java
+1 -1
View File
@@ -28,7 +28,7 @@ import javax.inject.Inject;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
public class JetPsiBuilder { public class JetImportsFactory {
@NotNull @NotNull
private Project project; private Project project;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+7 -7
View File
@@ -48,7 +48,7 @@ public class ImportsResolver {
@NotNull @NotNull
private BindingTrace trace; private BindingTrace trace;
@NotNull @NotNull
private JetPsiBuilder psiBuilder; private JetImportsFactory importsFactory;
@Inject @Inject
public void setContext(@NotNull TopDownAnalysisContext context) { public void setContext(@NotNull TopDownAnalysisContext context) {
@@ -71,8 +71,8 @@ public class ImportsResolver {
} }
@Inject @Inject
public void setPsiBuilder(@NotNull JetPsiBuilder psiBuilder) { public void setImportsFactory(@NotNull JetImportsFactory importsFactory) {
this.psiBuilder = psiBuilder; this.importsFactory = importsFactory;
} }
public void processTypeImports(@NotNull JetScope rootScope) { public void processTypeImports(@NotNull JetScope rootScope) {
@@ -95,18 +95,18 @@ public class ImportsResolver {
} }
private void processImportsInFile(@NotNull LookupMode lookupMode, WritableScope scope, List<JetImportDirective> directives, JetScope rootScope) { private void processImportsInFile(@NotNull LookupMode lookupMode, WritableScope scope, List<JetImportDirective> directives, JetScope rootScope) {
processImportsInFile(lookupMode, scope, directives, rootScope, configuration, trace, qualifiedExpressionResolver, psiBuilder); processImportsInFile(lookupMode, scope, directives, rootScope, configuration, trace, qualifiedExpressionResolver, importsFactory);
} }
public static void processImportsInFile( public static void processImportsInFile(
@NotNull LookupMode lookupMode, LookupMode lookupMode,
@NotNull WritableScope namespaceScope, @NotNull WritableScope namespaceScope,
@NotNull List<JetImportDirective> importDirectives, @NotNull List<JetImportDirective> importDirectives,
@NotNull JetScope rootScope, @NotNull JetScope rootScope,
@NotNull ModuleConfiguration configuration, @NotNull ModuleConfiguration configuration,
@NotNull BindingTrace trace, @NotNull BindingTrace trace,
@NotNull QualifiedExpressionResolver qualifiedExpressionResolver, @NotNull QualifiedExpressionResolver qualifiedExpressionResolver,
@NotNull JetPsiBuilder psiBuilder @NotNull JetImportsFactory importsFactory
) { ) {
Importer.DelayedImporter delayedImporter = new Importer.DelayedImporter(namespaceScope); Importer.DelayedImporter delayedImporter = new Importer.DelayedImporter(namespaceScope);
@@ -118,7 +118,7 @@ public class ImportsResolver {
TemporaryBindingTrace temporaryTrace = TemporaryBindingTrace.create( TemporaryBindingTrace temporaryTrace = TemporaryBindingTrace.create(
trace, "transient trace to resolve default imports"); //not to trace errors of default imports trace, "transient trace to resolve default imports"); //not to trace errors of default imports
JetImportDirective defaultImportDirective = psiBuilder.createImportDirective(defaultImportPath); JetImportDirective defaultImportDirective = importsFactory.createImportDirective(defaultImportPath);
qualifiedExpressionResolver.processImportReference(defaultImportDirective, rootScope, namespaceScope, delayedImporter, qualifiedExpressionResolver.processImportReference(defaultImportDirective, rootScope, namespaceScope, delayedImporter,
temporaryTrace, configuration, lookupMode); temporaryTrace, configuration, lookupMode);
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+6 -3
View File
@@ -30,7 +30,10 @@ import org.jetbrains.jet.lang.resolve.scopes.ChainedScope;
import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import java.util.*; import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
public class ScopeProvider { public class ScopeProvider {
private final ResolveSession resolveSession; private final ResolveSession resolveSession;
@@ -88,10 +91,10 @@ public class ScopeProvider {
throw new IllegalStateException("Root package not found"); throw new IllegalStateException("Root package not found");
} }
JetPsiBuilder jetPsiBuilder = resolveSession.getInjector().getJetPsiBuilder(); JetImportsFactory importsFactory = resolveSession.getInjector().getJetImportsFactory();
List<ImportPath> defaultImports = resolveSession.getModuleConfiguration().getDefaultImports(); List<ImportPath> defaultImports = resolveSession.getModuleConfiguration().getDefaultImports();
Collection<JetImportDirective> defaultImportDirectives = jetPsiBuilder.createImportDirectives(defaultImports); Collection<JetImportDirective> defaultImportDirectives = importsFactory.createImportDirectives(defaultImports);
return new LazyImportScope( return new LazyImportScope(
resolveSession, resolveSession,
generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.di.*;
import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPsiBuilder; import org.jetbrains.jet.lang.psi.JetImportsFactory;
import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
@@ -72,7 +72,7 @@ public class GenerateInjectors {
generator.addPublicField(ScopeProvider.class); generator.addPublicField(ScopeProvider.class);
generator.addPublicField(AnnotationResolver.class); generator.addPublicField(AnnotationResolver.class);
generator.addPublicField(QualifiedExpressionResolver.class); generator.addPublicField(QualifiedExpressionResolver.class);
generator.addPublicField(JetPsiBuilder.class); generator.addPublicField(JetImportsFactory.class);
generator.generate("compiler/frontend/src", "org.jetbrains.jet.di", "InjectorForLazyResolve", GenerateInjectors.class); generator.generate("compiler/frontend/src", "org.jetbrains.jet.di", "InjectorForLazyResolve", GenerateInjectors.class);
} }
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+14 -31
View File
@@ -16,35 +16,18 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import org.jetbrains.jet.lang.resolve.TopDownAnalyzer;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext;
import org.jetbrains.jet.lang.resolve.BodyResolver;
import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer;
import org.jetbrains.jet.lang.resolve.DeclarationsChecker;
import org.jetbrains.jet.lang.resolve.DescriptorResolver;
import com.intellij.openapi.project.Project; 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.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.DeclarationResolver;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.resolve.TypeResolver;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.ImportsResolver;
import org.jetbrains.jet.lang.psi.JetPsiBuilder;
import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver;
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 org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetImportsFactory;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver;
import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolverDummyImpl;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */
@@ -72,7 +55,7 @@ public class InjectorForTopDownAnalyzerForJs {
private QualifiedExpressionResolver qualifiedExpressionResolver; private QualifiedExpressionResolver qualifiedExpressionResolver;
private CandidateResolver candidateResolver; private CandidateResolver candidateResolver;
private ImportsResolver importsResolver; private ImportsResolver importsResolver;
private JetPsiBuilder jetPsiBuilder; private JetImportsFactory jetImportsFactory;
private ScriptHeaderResolver scriptHeaderResolver; private ScriptHeaderResolver scriptHeaderResolver;
private OverloadResolver overloadResolver; private OverloadResolver overloadResolver;
private OverrideResolver overrideResolver; private OverrideResolver overrideResolver;
@@ -108,7 +91,7 @@ public class InjectorForTopDownAnalyzerForJs {
this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
this.candidateResolver = new CandidateResolver(); this.candidateResolver = new CandidateResolver();
this.importsResolver = new ImportsResolver(); this.importsResolver = new ImportsResolver();
this.jetPsiBuilder = new JetPsiBuilder(); this.jetImportsFactory = new JetImportsFactory();
this.scriptHeaderResolver = new ScriptHeaderResolver(); this.scriptHeaderResolver = new ScriptHeaderResolver();
this.overloadResolver = new OverloadResolver(); this.overloadResolver = new OverloadResolver();
this.overrideResolver = new OverrideResolver(); this.overrideResolver = new OverrideResolver();
@@ -183,11 +166,11 @@ public class InjectorForTopDownAnalyzerForJs {
importsResolver.setConfiguration(moduleConfiguration); importsResolver.setConfiguration(moduleConfiguration);
importsResolver.setContext(topDownAnalysisContext); importsResolver.setContext(topDownAnalysisContext);
importsResolver.setPsiBuilder(jetPsiBuilder); importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
importsResolver.setTrace(bindingTrace); importsResolver.setTrace(bindingTrace);
jetPsiBuilder.setProject(project); jetImportsFactory.setProject(project);
scriptHeaderResolver.setContext(topDownAnalysisContext); scriptHeaderResolver.setContext(topDownAnalysisContext);
scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); scriptHeaderResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy);