diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index 22e508835bd..73c1fad8f7e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -159,7 +159,7 @@ public class AnalyzerFacadeForJVM { new ObservableBindingTrace(bindingTraceContext), owner, flowDataTraceFactory); - injector.getTopDownAnalyzer().doAnalyzeFilesWithGivenTrance2(files); + injector.getTopDownAnalyzer().analyzeFiles(files); return bindingTraceContext.getBindingContext(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 41d724eb83c..597d0ffe38e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -254,7 +254,7 @@ public class TopDownAnalyzer { } - public void doAnalyzeFilesWithGivenTrance2(Collection files) { + public void analyzeFiles(Collection files) { final WritableScope scope = new WritableScopeImpl( JetScope.EMPTY, moduleDescriptor, new TraceBasedRedeclarationHandler(trace)).setDebugName("Root scope in analyzeNamespace"); diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 4b21adffec3..a6de4de8e03 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -22,7 +22,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.di.InjectorForTopDownAnalyzerBasic; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJs; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; @@ -73,7 +72,7 @@ public final class AnalyzerFacadeForJS { project, topDownAnalysisParameters, new ObservableBindingTrace(bindingTraceContext), owner, JetControlFlowDataTraceFactory.EMPTY, JsConfiguration.jsLibConfiguration(project)); - injector.getTopDownAnalyzer().doAnalyzeFilesWithGivenTrance2(withJsLibAdded(files, config)); + injector.getTopDownAnalyzer().analyzeFiles(withJsLibAdded(files, config)); return bindingTraceContext.getBindingContext(); } @@ -117,7 +116,7 @@ public final class AnalyzerFacadeForJS { project, topDownAnalysisParameters, new ObservableBindingTrace(bindingTraceContext), owner, JetControlFlowDataTraceFactory.EMPTY, JsConfiguration.jsLibConfiguration(project)); - injector.getTopDownAnalyzer().doAnalyzeFilesWithGivenTrance2(Collections.singletonList(file)); + injector.getTopDownAnalyzer().analyzeFiles(Collections.singletonList(file)); return bindingTraceContext.getBindingContext(); }