From 7e72494ddb97fa9ec7b0abeefdad86f75cb39988 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 11 Sep 2013 18:28:29 +0200 Subject: [PATCH] Remove unused 'trace' parameter in ModuleConfiguration --- .../jet/lang/resolve/java/AnalyzerFacadeForJVM.java | 5 ++--- .../jetbrains/jet/lang/DefaultModuleConfiguration.java | 3 +-- .../src/org/jetbrains/jet/lang/ModuleConfiguration.java | 6 ++---- .../jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java | 2 +- .../resolve/lazy/descriptors/LazyPackageDescriptor.java | 2 +- .../jet/lang/resolve/lazy/LazyResolveTestUtil.java | 2 -- .../jet/lang/resolve/java/JavaBridgeConfiguration.java | 9 ++------- .../src/org/jetbrains/k2js/analyze/JsConfiguration.java | 7 ++----- 8 files changed, 11 insertions(+), 25 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 6b9e19eefc9..f612fc217c0 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 @@ -99,7 +99,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { @Override public void extendNamespaceScope( - @NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope ) { @@ -145,9 +144,9 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Predicate filesToAnalyzeCompletely ) { for (JetFile file : files) { - AnalyzingUtils.checkForSyntacticErrors(file); + AnalyzingUtils.checkForSyntacticErrors(file); } - + AnalyzeExhaust analyzeExhaust = analyzeFilesWithJavaIntegration( project, files, scriptParameters, filesToAnalyzeCompletely, false); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java index 7d0eaa6ef65..705d1dd2f9c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.lang; import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; @@ -39,7 +38,7 @@ public class DefaultModuleConfiguration implements ModuleConfiguration { } @Override - public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { + public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { if (DescriptorUtils.getFQName(namespaceDescriptor).equalsTo(KotlinBuiltIns.getInstance().getBuiltInsPackageFqName())) { namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java index 6df0bd6b8e4..aab0595ecbd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java @@ -18,14 +18,12 @@ package org.jetbrains.jet.lang; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; public interface ModuleConfiguration { ModuleConfiguration EMPTY = new ModuleConfiguration() { - @Override - public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { + public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { } @Override @@ -38,5 +36,5 @@ public interface ModuleConfiguration { * This method is called every time a namespace descriptor is created. Use it to add extra descriptors to the namespace, e.g. merge a * Java package with a Kotlin one */ - void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope); + void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java index d3a6382d9ef..ac73605a5ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java @@ -186,7 +186,7 @@ public class NamespaceFactoryImpl implements NamespaceFactory { namespaceDescriptor.initialize(scope); scope.changeLockLevel(WritableScope.LockLevel.BOTH); // - moduleDescriptor.getModuleConfiguration().extendNamespaceScope(trace, namespaceDescriptor, scope); + moduleDescriptor.getModuleConfiguration().extendNamespaceScope(namespaceDescriptor, scope); owner.addNamespace(namespaceDescriptor); if (expression != null) { trace.record(BindingContext.NAMESPACE, expression, namespaceDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java index 71b2e8941ec..1c1bd48e723 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -48,7 +48,7 @@ public class LazyPackageDescriptor extends AbstractNamespaceDescriptorImpl imple super(containingDeclaration, Collections.emptyList(), name); WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Package scope"); - resolveSession.getRootModuleDescriptor().getModuleConfiguration().extendNamespaceScope(resolveSession.getTrace(), this, scope); + resolveSession.getRootModuleDescriptor().getModuleConfiguration().extendNamespaceScope(this, scope); scope.changeLockLevel(WritableScope.LockLevel.READING); this.lazyScope = new LazyPackageMemberScope(resolveSession, declarationProvider, this); 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 73beb9b9f4b..3f828f5ee42 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -105,10 +105,8 @@ public class LazyResolveTestUtil { }); ModuleConfiguration moduleConfiguration = new ModuleConfiguration() { - @Override public void extendNamespaceScope( - @NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope ) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java index 54e901b32c0..6df51f06241 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; @@ -45,15 +44,11 @@ public class JavaBridgeConfiguration implements ModuleConfiguration { } @Override - public void extendNamespaceScope( - @NotNull BindingTrace trace, - @NotNull NamespaceDescriptor namespaceDescriptor, - @NotNull WritableScope namespaceMemberScope - ) { + public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { JetScope javaPackageScope = javaDescriptorResolver.getJavaPackageScope(namespaceDescriptor); if (javaPackageScope != null) { namespaceMemberScope.importScope(javaPackageScope); } - DefaultModuleConfiguration.INSTANCE.extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope); + DefaultModuleConfiguration.INSTANCE.extendNamespaceScope(namespaceDescriptor, namespaceMemberScope); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java index 4a81fbee89e..231bc12fa16 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java @@ -23,7 +23,6 @@ import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -55,10 +54,8 @@ public class JsConfiguration implements ModuleConfiguration { } @Override - public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, - @NotNull WritableScope namespaceMemberScope) { - DefaultModuleConfiguration.INSTANCE - .extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope); + public void extendNamespaceScope(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { + DefaultModuleConfiguration.INSTANCE.extendNamespaceScope(namespaceDescriptor, namespaceMemberScope); // Extend root namespace with standard classes if (namespaceDescriptor.getFqName().shortNameOrSpecial().equals(FqNameUnsafe.ROOT_NAME)) {