From 0f2d9cfbc34b80493bc77841723830d5611524c1 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 28 Nov 2013 23:52:19 +0400 Subject: [PATCH] Removed passing of RedeclarationHandler (in code before refactoring it was always DO_NOTHING). --- .../jet/lang/resolve/NamespaceFactoryImpl.java | 11 ++++------- .../jet/lang/resolve/TypeHierarchyResolver.java | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) 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 23c318c0e9e..7f55500c19f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java @@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.psi.JetNamespaceHeader; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import javax.inject.Inject; import java.util.ArrayList; @@ -59,7 +58,7 @@ public class NamespaceFactoryImpl implements NamespaceFactory { } @NotNull - public MutablePackageFragmentDescriptor createPackageFragmentIfNeeded(@NotNull JetFile file, @NotNull RedeclarationHandler handler) { + public MutablePackageFragmentDescriptor createPackageFragmentIfNeeded(@NotNull JetFile file) { JetNamespaceHeader namespaceHeader = file.getNamespaceHeader(); // TODO 2 make this code neater @@ -67,13 +66,13 @@ public class NamespaceFactoryImpl implements NamespaceFactory { ContainerUtil.addIfNotNull(allNamespaceNames, namespaceHeader.getLastPartExpression()); for (JetSimpleNameExpression nameExpression : allNamespaceNames) { FqName parentFqName = namespaceHeader.getParentFqName(nameExpression); - getOrCreatePackageFragment(parentFqName, nameExpression, handler); + getOrCreatePackageFragment(parentFqName, nameExpression); trace.record(RESOLUTION_SCOPE, nameExpression, module.getPackage(parentFqName).getMemberScope()); } MutablePackageFragmentDescriptor fragment = getOrCreatePackageFragment( - namespaceHeader.getFqName(), namespaceHeader.getLastPartExpression(), handler); + namespaceHeader.getFqName(), namespaceHeader.getLastPartExpression()); storeBindingForFile(file, fragment); return fragment; } @@ -87,10 +86,8 @@ public class NamespaceFactoryImpl implements NamespaceFactory { @NotNull private MutablePackageFragmentDescriptor getOrCreatePackageFragment( @NotNull FqName fqName, - @Nullable JetReferenceExpression expression, - @NotNull RedeclarationHandler handler + @Nullable JetReferenceExpression expression ) { - // TODO 1 use handler MutablePackageFragmentDescriptor fragment = packageFragmentProvider.getOrCreateFragment(fqName); if (expression != null) { trace.record(REFERENCE_TARGET, expression, packageFragmentProvider.getModule().getPackage(fqName)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index ef280f817b3..3f8720e4996 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -450,8 +450,7 @@ public class TypeHierarchyResolver { @Override public void visitJetFile(@NotNull JetFile file) { - MutablePackageFragmentDescriptor packageFragment = - namespaceFactory.createPackageFragmentIfNeeded(file, RedeclarationHandler.DO_NOTHING); + MutablePackageFragmentDescriptor packageFragment = namespaceFactory.createPackageFragmentIfNeeded(file); context.getPackageFragments().put(file, packageFragment); PackageViewDescriptor packageView = packageFragment.getContainingDeclaration().getPackage(packageFragment.getFqName());