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

minor enhancement in JDR

Browse Source
This commit is contained in:
Stepan Koltsov
2012-03-22 03:46:53 +04:00
parent 921b601628
commit 5da984e2cb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
+1 -5
View File
@@ -61,13 +61,9 @@ public class JavaBridgeConfiguration implements ModuleConfiguration {
delegateConfiguration.addDefaultImports(rootScope, directives); delegateConfiguration.addDefaultImports(rootScope, directives);
} }
public static JavaNamespaceDescriptor createNamespaceDescriptor(String name, FqName qualifiedName) {
return new JavaNamespaceDescriptor(null, Collections.<AnnotationDescriptor>emptyList(), name, qualifiedName, true);
}
@Override @Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
namespaceMemberScope.importScope(new JavaPackageScope(DescriptorUtils.getFQName(namespaceDescriptor).toSafe(), namespaceDescriptor, javaSemanticServices)); namespaceMemberScope.importScope(javaSemanticServices.getDescriptorResolver().createJavaPackageScope(DescriptorUtils.getFQName(namespaceDescriptor).toSafe(), namespaceDescriptor));
delegateConfiguration.extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope); delegateConfiguration.extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope);
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+5 -1
View File
@@ -887,13 +887,17 @@ public class JavaDescriptorResolver {
true true
); );
namespaceData.namespaceDescriptor.setMemberScope(new JavaPackageScope(new FqName(psiPackage.getQualifiedName()), namespaceData.namespaceDescriptor, semanticServices)); namespaceData.namespaceDescriptor.setMemberScope(createJavaPackageScope(new FqName(psiPackage.getQualifiedName()), namespaceData.namespaceDescriptor));
semanticServices.getTrace().record(BindingContext.NAMESPACE, psiPackage, namespaceData.namespaceDescriptor); semanticServices.getTrace().record(BindingContext.NAMESPACE, psiPackage, namespaceData.namespaceDescriptor);
// TODO: hack // TODO: hack
namespaceData.kotlin = true; namespaceData.kotlin = true;
return namespaceData; return namespaceData;
} }
public JavaPackageScope createJavaPackageScope(@NotNull FqName fqName, @NotNull NamespaceDescriptor ns) {
return new JavaPackageScope(fqName, ns, semanticServices);
}
@NotNull @NotNull
private DeclarationDescriptor resolveParentDescriptor(@NotNull PsiPackage psiPackage) { private DeclarationDescriptor resolveParentDescriptor(@NotNull PsiPackage psiPackage) {
PsiPackage parentPackage = psiPackage.getParentPackage(); PsiPackage parentPackage = psiPackage.getParentPackage();