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

Removed passing of RedeclarationHandler (in code before refactoring it was always DO_NOTHING).

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-11-28 23:52:19 +04:00
parent fbd398fd8e
commit 0f2d9cfbc3
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/NamespaceFactoryImpl.java
+4 -7
View File
@@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.ArrayList; import java.util.ArrayList;
@@ -59,7 +58,7 @@ public class NamespaceFactoryImpl implements NamespaceFactory {
} }
@NotNull @NotNull
public MutablePackageFragmentDescriptor createPackageFragmentIfNeeded(@NotNull JetFile file, @NotNull RedeclarationHandler handler) { public MutablePackageFragmentDescriptor createPackageFragmentIfNeeded(@NotNull JetFile file) {
JetNamespaceHeader namespaceHeader = file.getNamespaceHeader(); JetNamespaceHeader namespaceHeader = file.getNamespaceHeader();
// TODO 2 make this code neater // TODO 2 make this code neater
@@ -67,13 +66,13 @@ public class NamespaceFactoryImpl implements NamespaceFactory {
ContainerUtil.addIfNotNull(allNamespaceNames, namespaceHeader.getLastPartExpression()); ContainerUtil.addIfNotNull(allNamespaceNames, namespaceHeader.getLastPartExpression());
for (JetSimpleNameExpression nameExpression : allNamespaceNames) { for (JetSimpleNameExpression nameExpression : allNamespaceNames) {
FqName parentFqName = namespaceHeader.getParentFqName(nameExpression); FqName parentFqName = namespaceHeader.getParentFqName(nameExpression);
getOrCreatePackageFragment(parentFqName, nameExpression, handler); getOrCreatePackageFragment(parentFqName, nameExpression);
trace.record(RESOLUTION_SCOPE, nameExpression, module.getPackage(parentFqName).getMemberScope()); trace.record(RESOLUTION_SCOPE, nameExpression, module.getPackage(parentFqName).getMemberScope());
} }
MutablePackageFragmentDescriptor fragment = getOrCreatePackageFragment( MutablePackageFragmentDescriptor fragment = getOrCreatePackageFragment(
namespaceHeader.getFqName(), namespaceHeader.getLastPartExpression(), handler); namespaceHeader.getFqName(), namespaceHeader.getLastPartExpression());
storeBindingForFile(file, fragment); storeBindingForFile(file, fragment);
return fragment; return fragment;
} }
@@ -87,10 +86,8 @@ public class NamespaceFactoryImpl implements NamespaceFactory {
@NotNull @NotNull
private MutablePackageFragmentDescriptor getOrCreatePackageFragment( private MutablePackageFragmentDescriptor getOrCreatePackageFragment(
@NotNull FqName fqName, @NotNull FqName fqName,
@Nullable JetReferenceExpression expression, @Nullable JetReferenceExpression expression
@NotNull RedeclarationHandler handler
) { ) {
// TODO 1 use handler
MutablePackageFragmentDescriptor fragment = packageFragmentProvider.getOrCreateFragment(fqName); MutablePackageFragmentDescriptor fragment = packageFragmentProvider.getOrCreateFragment(fqName);
if (expression != null) { if (expression != null) {
trace.record(REFERENCE_TARGET, expression, packageFragmentProvider.getModule().getPackage(fqName)); trace.record(REFERENCE_TARGET, expression, packageFragmentProvider.getModule().getPackage(fqName));
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+1 -2
View File
@@ -450,8 +450,7 @@ public class TypeHierarchyResolver {
@Override @Override
public void visitJetFile(@NotNull JetFile file) { public void visitJetFile(@NotNull JetFile file) {
MutablePackageFragmentDescriptor packageFragment = MutablePackageFragmentDescriptor packageFragment = namespaceFactory.createPackageFragmentIfNeeded(file);
namespaceFactory.createPackageFragmentIfNeeded(file, RedeclarationHandler.DO_NOTHING);
context.getPackageFragments().put(file, packageFragment); context.getPackageFragments().put(file, packageFragment);
PackageViewDescriptor packageView = packageFragment.getContainingDeclaration().getPackage(packageFragment.getFqName()); PackageViewDescriptor packageView = packageFragment.getContainingDeclaration().getPackage(packageFragment.getFqName());