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

Use VirtualFileFinder in AnnotationDescriptorDeserializer

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-07-26 21:14:42 +04:00
parent 7d50a8c6ea
commit b634792356
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+1
View File
@@ -125,6 +125,7 @@ public class InjectorForJavaDescriptorResolver {
annotationDescriptorDeserializer.setJavaClassResolver(javaClassResolver);
annotationDescriptorDeserializer.setPsiClassFinder(psiClassFinder);
annotationDescriptorDeserializer.setVirtualFileFinder(virtualFileFinder);
javaNamespaceResolver.setDeserializedDescriptorResolver(deserializedDescriptorResolver);
javaNamespaceResolver.setJavaDescriptorResolver(javaDescriptorResolver);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+1
View File
@@ -312,6 +312,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
annotationDescriptorDeserializer.setJavaClassResolver(javaClassResolver);
annotationDescriptorDeserializer.setPsiClassFinder(psiClassFinder);
annotationDescriptorDeserializer.setVirtualFileFinder(virtualFileFinder);
javaNamespaceResolver.setDeserializedDescriptorResolver(deserializedDescriptorResolver);
javaNamespaceResolver.setJavaDescriptorResolver(javaDescriptorResolver);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java
+14 -5
View File
@@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager;
import org.jetbrains.jet.lang.resolve.lazy.storage.MemoizedFunctionToNotNull;
import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager;
@@ -52,6 +53,9 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
private JavaClassResolver javaClassResolver;
private VirtualFileFinder virtualFileFinder;
// TODO: a single instance of StorageManager for all computations in resolve-java
private final LockBasedStorageManager storageManager = new LockBasedStorageManager();
@@ -75,6 +79,11 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
this.psiClassFinder = psiClassFinder;
}
@Inject
public void setVirtualFileFinder(VirtualFileFinder virtualFileFinder) {
this.virtualFileFinder = virtualFileFinder;
}
@Inject
public void setJavaClassResolver(JavaClassResolver javaClassResolver) {
this.javaClassResolver = javaClassResolver;
@@ -108,6 +117,10 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@NotNull
private VirtualFile findVirtualFileByClass(@NotNull ClassDescriptor descriptor) {
FqName fqName = kotlinFqNameToJavaFqName(naiveKotlinFqName(descriptor));
VirtualFile fileForKotlinFile = virtualFileFinder.find(fqName);
if (fileForKotlinFile != null) {
return fileForKotlinFile;
}
PsiClass psiClass = psiClassFinder.findPsiClass(fqName, PsiClassFinder.RuntimeClassesHandleMode.IGNORE /* TODO: ?! */);
if (psiClass == null) {
throw new IllegalStateException("Psi class is not found for class: " + descriptor);
@@ -127,11 +140,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@NotNull
private VirtualFile findVirtualFileByPackage(@NotNull NamespaceDescriptor descriptor) {
FqName fqName = PackageClassUtils.getPackageClassFqName(DescriptorUtils.getFQName(descriptor).toSafe());
PsiClass psiClass = psiClassFinder.findPsiClass(fqName, PsiClassFinder.RuntimeClassesHandleMode.IGNORE /* TODO: ?! */);
if (psiClass == null) {
throw new IllegalStateException("Psi class is not found for package: " + descriptor);
}
VirtualFile virtualFile = psiClass.getContainingFile().getVirtualFile();
VirtualFile virtualFile = virtualFileFinder.find(fqName);
if (virtualFile == null) {
throw new IllegalStateException("Virtual file is not found for package: " + descriptor);
}