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

Unused slice removed

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-23 21:19:00 +04:00
parent e5fdebd031
commit 37a79e8299
5 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java
-3
View File
@@ -146,8 +146,6 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen
FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(fqName);
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(packageClassFqName);
cache.recordProperPackage(packageFragment);
if (kotlinClass != null) {
JetScope kotlinPackageScope = deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinClass);
if (kotlinPackageScope != null) {
@@ -163,7 +161,6 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen
JavaClass javaClass = javaClassFinder.findClass(fqName);
if (javaClass != null && DescriptorResolverUtils.isJavaClassVisibleAsPackage(javaClass)) {
cache.recordClassStaticMembersNamespace(packageFragment);
return new JavaClassStaticMembersScope(packageFragment, javaClass, memberResolver);
}
return null;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java
-4
View File
@@ -45,8 +45,4 @@ public interface JavaResolverCache {
void recordField(@NotNull JavaField field, @NotNull PropertyDescriptor descriptor);
void recordClass(@NotNull JavaClass javaClass, @NotNull ClassDescriptor descriptor);
void recordProperPackage(@NotNull PackageFragmentDescriptor descriptor);
void recordClassStaticMembersNamespace(@NotNull PackageFragmentDescriptor descriptor);
}