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

JavaDescriptorResolver: kill namespace cache by psi

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-07 23:16:47 +04:00
parent c653622033
commit 92ae9698e3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+6 -7
View File
@@ -200,7 +200,6 @@ public class JavaDescriptorResolver {
protected final Map<FqName, ResolverBinaryClassData> classDescriptorCache = Maps.newHashMap();
protected final Map<FqName, ResolverNamespaceData> namespaceDescriptorCacheByFqn = Maps.newHashMap();
protected final Map<PsiElement, ResolverNamespaceData> namespaceDescriptorCache = Maps.newHashMap();
protected Project project;
protected JavaSemanticServices semanticServices;
@@ -803,21 +802,21 @@ public class JavaDescriptorResolver {
}
private NamespaceDescriptor resolveNamespace(@NotNull PsiPackage psiPackage) {
ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiPackage);
FqName fqName = new FqName(psiPackage.getQualifiedName());
ResolverNamespaceData namespaceData = namespaceDescriptorCacheByFqn.get(fqName);
if (namespaceData == null) {
namespaceData = createJavaNamespaceDescriptor(psiPackage);
namespaceDescriptorCache.put(psiPackage, namespaceData);
namespaceDescriptorCacheByFqn.put(new FqName(psiPackage.getQualifiedName()), namespaceData);
namespaceDescriptorCacheByFqn.put(fqName, namespaceData);
}
return namespaceData.namespaceDescriptor;
}
private NamespaceDescriptor resolveNamespace(@NotNull PsiClass psiClass) {
ResolverNamespaceData namespaceData = namespaceDescriptorCache.get(psiClass);
FqName fqName = new FqName(psiClass.getQualifiedName());
ResolverNamespaceData namespaceData = namespaceDescriptorCacheByFqn.get(fqName);
if (namespaceData == null) {
namespaceData = createJavaNamespaceDescriptor(psiClass);
namespaceDescriptorCache.put(psiClass, namespaceData);
namespaceDescriptorCacheByFqn.put(new FqName(psiClass.getQualifiedName()), namespaceData);
namespaceDescriptorCacheByFqn.put(fqName, namespaceData);
}
return namespaceData.namespaceDescriptor;
}