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

Use JetScope as the base interface in JavaNamespaceResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-07-03 18:39:29 +04:00
committed by Alexander Udalov
parent 011f733aad
commit 71060e0086
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
+15 -11
View File
@@ -42,6 +42,7 @@ import org.jetbrains.jet.lang.resolve.java.scope.JavaClassStaticMembersScope;
import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScopeWithoutMembers; import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScopeWithoutMembers;
import org.jetbrains.jet.lang.resolve.java.scope.JavaScopeForKotlinNamespace; import org.jetbrains.jet.lang.resolve.java.scope.JavaScopeForKotlinNamespace;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.Collections; import java.util.Collections;
@@ -55,7 +56,7 @@ public final class JavaNamespaceResolver {
JavaBridgeConfiguration.ALL_JAVA_IMPORTS, JavaBridgeConfiguration.ALL_JAVA_IMPORTS,
JavaToKotlinClassMap.getInstance()); JavaToKotlinClassMap.getInstance());
@NotNull @NotNull
private final Map<FqName, JavaBaseScope> resolvedNamespaceCache = Maps.newHashMap(); private final Map<FqName, JetScope> resolvedNamespaceCache = Maps.newHashMap();
@NotNull @NotNull
private final Set<FqName> unresolvedCache = Sets.newHashSet(); private final Set<FqName> unresolvedCache = Sets.newHashSet();
@@ -92,7 +93,7 @@ public final class JavaNamespaceResolver {
if (unresolvedCache.contains(qualifiedName)) { if (unresolvedCache.contains(qualifiedName)) {
return null; return null;
} }
JavaBaseScope scope = resolvedNamespaceCache.get(qualifiedName); JetScope scope = resolvedNamespaceCache.get(qualifiedName);
if (scope != null) { if (scope != null) {
return (NamespaceDescriptor) scope.getContainingDeclaration(); return (NamespaceDescriptor) scope.getContainingDeclaration();
} }
@@ -108,12 +109,15 @@ public final class JavaNamespaceResolver {
qualifiedName qualifiedName
); );
JavaBaseScope newScope = createNamespaceScope(qualifiedName, javaNamespaceDescriptor); JetScope newScope = createNamespaceScope(qualifiedName, javaNamespaceDescriptor);
if (newScope == null) { if (newScope == null) {
return null; return null;
} }
trace.record(BindingContext.NAMESPACE, newScope.getPsiElement(), javaNamespaceDescriptor); if (newScope instanceof JavaBaseScope) {
trace.record(BindingContext.NAMESPACE, ((JavaBaseScope) newScope).getPsiElement(), javaNamespaceDescriptor);
}
javaNamespaceDescriptor.setMemberScope(newScope); javaNamespaceDescriptor.setMemberScope(newScope);
@@ -136,17 +140,17 @@ public final class JavaNamespaceResolver {
} }
@Nullable @Nullable
private JavaBaseScope createNamespaceScope( private JetScope createNamespaceScope(
@NotNull FqName fqName, @NotNull FqName fqName,
@NotNull NamespaceDescriptor namespaceDescriptor @NotNull NamespaceDescriptor namespaceDescriptor
) { ) {
JavaBaseScope namespaceScope = doCreateNamespaceScope(fqName, namespaceDescriptor); JetScope namespaceScope = doCreateNamespaceScope(fqName, namespaceDescriptor);
cache(fqName, namespaceScope); cache(fqName, namespaceScope);
return namespaceScope; return namespaceScope;
} }
@Nullable @Nullable
private JavaBaseScope doCreateNamespaceScope( private JetScope doCreateNamespaceScope(
@NotNull FqName fqName, @NotNull FqName fqName,
@NotNull NamespaceDescriptor namespaceDescriptor @NotNull NamespaceDescriptor namespaceDescriptor
) { ) {
@@ -185,26 +189,26 @@ public final class JavaNamespaceResolver {
fqName, javaSemanticServices); fqName, javaSemanticServices);
} }
private void cache(@NotNull FqName fqName, @Nullable JavaBaseScope packageScope) { private void cache(@NotNull FqName fqName, @Nullable JetScope packageScope) {
if (packageScope == null) { if (packageScope == null) {
unresolvedCache.add(fqName); unresolvedCache.add(fqName);
return; return;
} }
JavaBaseScope oldValue = resolvedNamespaceCache.put(fqName, packageScope); JetScope oldValue = resolvedNamespaceCache.put(fqName, packageScope);
if (oldValue != null) { if (oldValue != null) {
throw new IllegalStateException("rewrite at " + fqName); throw new IllegalStateException("rewrite at " + fqName);
} }
} }
@Nullable @Nullable
public JavaBaseScope getJavaPackageScopeForExistingNamespaceDescriptor(@NotNull NamespaceDescriptor namespaceDescriptor) { public JetScope getJavaPackageScopeForExistingNamespaceDescriptor(@NotNull NamespaceDescriptor namespaceDescriptor) {
FqName fqName = DescriptorUtils.getFQName(namespaceDescriptor).toSafe(); FqName fqName = DescriptorUtils.getFQName(namespaceDescriptor).toSafe();
if (unresolvedCache.contains(fqName)) { if (unresolvedCache.contains(fqName)) {
throw new IllegalStateException( throw new IllegalStateException(
"This means that we are trying to create a Java package, but have a package with the same FQN defined in Kotlin: " + "This means that we are trying to create a Java package, but have a package with the same FQN defined in Kotlin: " +
fqName); fqName);
} }
JavaBaseScope alreadyResolvedScope = resolvedNamespaceCache.get(fqName); JetScope alreadyResolvedScope = resolvedNamespaceCache.get(fqName);
if (alreadyResolvedScope != null) { if (alreadyResolvedScope != null) {
return alreadyResolvedScope; return alreadyResolvedScope;
} }