From 23527c927ba84e7eab3f641b0dd7368e311e6478 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Sun, 23 Feb 2014 12:59:45 +0400 Subject: [PATCH] Unused parameter removed --- .../jet/lang/resolve/java/AnalyzerFacadeForJVM.java | 2 +- .../org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java | 8 +++----- .../jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../jet/lang/resolve/lazy/LazyResolveTestUtil.java | 2 +- .../jet/plugin/references/BuiltInsReferenceResolver.java | 2 +- .../org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) 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 e2998a7a461..bfc8a16ea7d 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 @@ -229,7 +229,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module); try { module.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider()); - TopDownAnalysisContext topDownAnalysisContext = injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, files, scriptParameters); + TopDownAnalysisContext topDownAnalysisContext = injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, files); BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? new CachedBodiesResolveContext(topDownAnalysisContext) : null; 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 da3213ca71d..80781edcd7b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -39,7 +39,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import javax.inject.Inject; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.Set; public class TopDownAnalyzer { @@ -212,8 +211,8 @@ public class TopDownAnalyzer { @NotNull public TopDownAnalysisContext analyzeFiles( @NotNull TopDownAnalysisParameters topDownAnalysisParameters, - @NotNull Collection files, - @NotNull List scriptParameters) { + @NotNull Collection files + ) { ((ModuleDescriptorImpl) moduleDescriptor).addFragmentProvider(DependencyKind.SOURCES, packageFragmentProvider); // "depend on" builtins module @@ -223,8 +222,7 @@ public class TopDownAnalyzer { // packages added to module explicitly in TopDownAnalysisContext c = new TopDownAnalysisContext(topDownAnalysisParameters); - doProcess(c, JetModuleUtil.getSubpackagesOfRootScope(moduleDescriptor), - new PackageLikeBuilderDummy(), files); + doProcess(c, JetModuleUtil.getSubpackagesOfRootScope(moduleDescriptor), new PackageLikeBuilderDummy(), files); return c; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 2e64cdf9484..7ac7d8851f1 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -156,7 +156,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { module.addFragmentProvider(DependencyKind.BINARIES, injectorForAnalyzer.getJavaDescriptorResolver().getPackageFragmentProvider()); - injectorForAnalyzer.getTopDownAnalyzer().analyzeFiles(parameters, environment.getSourceFiles(), Collections.emptyList()); + injectorForAnalyzer.getTopDownAnalyzer().analyzeFiles(parameters, environment.getSourceFiles()); PackageViewDescriptor packageView = module.getPackage(TEST_PACKAGE_FQNAME); assert packageView != null : "Test package not found"; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 0e9e4c89861..2451cd9e629 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -61,7 +61,7 @@ public class LazyResolveTestUtil { InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, sharedTrace, sharedModule); sharedModule.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider()); - injector.getTopDownAnalyzer().analyzeFiles(params, files, Collections.emptyList()); + injector.getTopDownAnalyzer().analyzeFiles(params, files); return injector.getModuleDescriptor(); } diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index 372134f11d3..c0c2541dccd 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -97,7 +97,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { myProject, topDownAnalysisParameters, trace, module); TopDownAnalyzer analyzer = injector.getTopDownAnalyzer(); - analyzer.analyzeFiles(topDownAnalysisParameters, jetBuiltInsFiles, Collections.emptyList()); + analyzer.analyzeFiles(topDownAnalysisParameters, jetBuiltInsFiles); builtinsPackageFragment = analyzer.getPackageFragmentProvider().getOrCreateFragment(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME); builtInsSources = Sets.newHashSet(jetBuiltInsFiles); 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 8d5d860eb3b..4d59c956f45 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -109,7 +109,7 @@ public final class AnalyzerFacadeForJS { files : Config.withJsLibAdded(files, config); TopDownAnalysisContext topDownAnalysisContext = - injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, allFiles, Collections.emptyList()); + injector.getTopDownAnalyzer().analyzeFiles(topDownAnalysisParameters, allFiles); BodiesResolveContext bodiesResolveContext = storeContextForBodiesResolve ? new CachedBodiesResolveContext(topDownAnalysisContext) : null;