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

JavaDescriptorResolver is accessible through JavaPackageFragmentDescriptor

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-23 18:59:05 +04:00
parent 1d8547a789
commit da4245b712
5 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.java
+4
View File
@@ -16,7 +16,11 @@
package org.jetbrains.jet.lang.resolve.java.descriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
public interface JavaPackageFragmentDescriptor extends PackageFragmentDescriptor {
@NotNull
JavaDescriptorResolver getJavaDescriptorResolver();
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptorImpl.java
+8
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaPackageFragmentProvider;
import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageFragmentScope;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -58,6 +59,13 @@ public class JavaPackageFragmentDescriptorImpl extends DeclarationDescriptorImpl
this.memberScope = scopeFactory.fun(this);
}
@NotNull
@Override
public JavaDescriptorResolver getJavaDescriptorResolver() {
return provider.getJavaDescriptorResolver();
}
@NotNull
@Override
public ModuleDescriptor getContainingDeclaration() {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java
+12
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider;
import org.jetbrains.jet.lang.resolve.java.JavaClassFinder;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptorImpl;
@@ -48,6 +49,7 @@ public final class JavaPackageFragmentProvider implements PackageFragmentProvide
@NotNull
private final Map<FqName, JavaPackageFragmentDescriptorImpl> packageFragments = Maps.newHashMap();
private JavaDescriptorResolver javaDescriptorResolver;
private JavaClassFinder javaClassFinder;
private JavaResolverCache cache;
private JavaMemberResolver memberResolver;
@@ -57,6 +59,11 @@ public final class JavaPackageFragmentProvider implements PackageFragmentProvide
private ModuleDescriptor module;
@Inject
public void setJavaDescriptorResolver(@NotNull JavaDescriptorResolver javaDescriptorResolver) {
this.javaDescriptorResolver = javaDescriptorResolver;
}
@Inject
public void setKotlinClassFinder(KotlinClassFinder kotlinClassFinder) {
this.kotlinClassFinder = kotlinClassFinder;
@@ -87,6 +94,11 @@ public final class JavaPackageFragmentProvider implements PackageFragmentProvide
this.module = module;
}
@NotNull
public JavaDescriptorResolver getJavaDescriptorResolver() {
return javaDescriptorResolver;
}
@NotNull
@Override
public List<PackageFragmentDescriptor> getPackageFragments(@NotNull FqName fqName) {