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

Do not inject TopDownAnalysisContext into ImportsResolver

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-23 11:21:22 +04:00
parent 72a62626df
commit 7e43f2e61e
6 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
-1
View File
@@ -272,7 +272,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
declarationResolver.setScriptHeaderResolver(scriptHeaderResolver);
declarationResolver.setTrace(bindingTrace);
importsResolver.setContext(topDownAnalysisContext);
importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setModuleDescriptor(moduleDescriptor);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
-1
View File
@@ -227,7 +227,6 @@ public class InjectorForTopDownAnalyzerBasic {
declarationResolver.setScriptHeaderResolver(scriptHeaderResolver);
declarationResolver.setTrace(bindingTrace);
importsResolver.setContext(topDownAnalysisContext);
importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setModuleDescriptor(moduleDescriptor);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class DeclarationResolver {
resolveAnnotationStubsOnClassesAndConstructors(c);
resolveFunctionAndPropertyHeaders(c);
createFunctionsForDataClasses(c);
importsResolver.processMembersImports();
importsResolver.processMembersImports(c);
checkRedeclarationsInPackages(c);
checkRedeclarationsInInnerClassNames(c);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+9 -16
View File
@@ -35,8 +35,6 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode;
public class ImportsResolver {
@NotNull
private TopDownAnalysisContext context;
@NotNull
private ModuleDescriptor moduleDescriptor;
@NotNull
@@ -46,11 +44,6 @@ public class ImportsResolver {
@NotNull
private JetImportsFactory importsFactory;
@Inject
public void setContext(@NotNull TopDownAnalysisContext context) {
this.context = context;
}
@Inject
public void setModuleDescriptor(@NotNull ModuleDescriptor moduleDescriptor) {
this.moduleDescriptor = moduleDescriptor;
@@ -71,21 +64,21 @@ public class ImportsResolver {
this.importsFactory = importsFactory;
}
public void processTypeImports() {
processImports(LookupMode.ONLY_CLASSES);
public void processTypeImports(@NotNull TopDownAnalysisContext c) {
processImports(c, LookupMode.ONLY_CLASSES);
}
public void processMembersImports() {
processImports(LookupMode.EVERYTHING);
public void processMembersImports(@NotNull TopDownAnalysisContext c) {
processImports(c, LookupMode.EVERYTHING);
}
private void processImports(@NotNull LookupMode lookupMode) {
for (JetFile file : context.getPackageFragments().keySet()) {
WritableScope fileScope = context.getFileScopes().get(file);
private void processImports(@NotNull TopDownAnalysisContext c, @NotNull LookupMode lookupMode) {
for (JetFile file : c.getPackageFragments().keySet()) {
WritableScope fileScope = c.getFileScopes().get(file);
processImportsInFile(lookupMode, fileScope, Lists.newArrayList(file.getImportDirectives()), JetPsiUtil.getFQName(file).isRoot());
}
for (JetScript script : context.getScripts().keySet()) {
WritableScope scriptScope = context.getScriptScopes().get(script);
for (JetScript script : c.getScripts().keySet()) {
WritableScope scriptScope = c.getScriptScopes().get(script);
processImportsInFile(lookupMode, scriptScope, script.getImportDirectives(), true);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class TypeHierarchyResolver {
}
}
importsResolver.processTypeImports();
importsResolver.processTypeImports(context);
createTypeConstructors(); // create type constructors for classes and generic parameters, supertypes are not filled in
resolveTypesInClassHeaders(); // Generic bounds and types in supertype lists (no expressions or constructor resolution)
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
-1
View File
@@ -227,7 +227,6 @@ public class InjectorForTopDownAnalyzerForJs {
declarationResolver.setScriptHeaderResolver(scriptHeaderResolver);
declarationResolver.setTrace(bindingTrace);
importsResolver.setContext(topDownAnalysisContext);
importsResolver.setImportsFactory(jetImportsFactory);
importsResolver.setModuleDescriptor(moduleDescriptor);
importsResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver);