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

Methods renamed to avoid ambiguity

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-07 00:42:34 +04:00
parent 5fcf9ca448
commit 8fcaf511dc
9 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class CliVirtualFileFinder implements VirtualFileFinder {
@Nullable @Nullable
@Override @Override
public VirtualFile find(@NotNull FqName className) { public VirtualFile findVirtualFile(@NotNull FqName className) {
for (VirtualFile root : classPath) { for (VirtualFile root : classPath) {
VirtualFile fileInRoot = findFileInRoot(className.asString(), root); VirtualFile fileInRoot = findFileInRoot(className.asString(), root);
if (fileInRoot != null) { if (fileInRoot != null) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java
+1 -1
View File
@@ -24,5 +24,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public interface VirtualFileFinder { public interface VirtualFileFinder {
// TODO: support scope // TODO: support scope
@Nullable @Nullable
VirtualFile find(@NotNull FqName className); VirtualFile findVirtualFile(@NotNull FqName className);
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java
+2 -2
View File
@@ -33,8 +33,8 @@ public class VirtualFileKotlinClassFinder implements KotlinClassFinder {
@Nullable @Nullable
@Override @Override
public KotlinJvmBinaryClass find(@NotNull FqName fqName) { public KotlinJvmBinaryClass findKotlinClass(@NotNull FqName fqName) {
VirtualFile file = virtualFileFinder.find(fqName); VirtualFile file = virtualFileFinder.findVirtualFile(fqName);
return file == null ? null : new VirtualFileKotlinClass(file); return file == null ? null : new VirtualFileKotlinClass(file);
} }
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+1 -1
View File
@@ -187,7 +187,7 @@ public final class JavaClassResolver {
private ClassDescriptor doResolveClass(@NotNull FqName qualifiedName, @NotNull PostponedTasks tasks) { private ClassDescriptor doResolveClass(@NotNull FqName qualifiedName, @NotNull PostponedTasks tasks) {
//TODO: correct scope //TODO: correct scope
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(qualifiedName); KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.findKotlinClass(qualifiedName);
if (kotlinClass != null) { if (kotlinClass != null) {
ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(kotlinClass); ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(kotlinClass);
if (deserializedDescriptor != null) { if (deserializedDescriptor != null) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java
+1 -1
View File
@@ -144,7 +144,7 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen
JavaPackage javaPackage = javaClassFinder.findPackage(fqName); JavaPackage javaPackage = javaClassFinder.findPackage(fqName);
if (javaPackage != null) { if (javaPackage != null) {
FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(fqName); FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(fqName);
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(packageClassFqName); KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.findKotlinClass(packageClassFqName);
if (kotlinClass != null) { if (kotlinClass != null) {
JetScope kotlinPackageScope = deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinClass); JetScope kotlinPackageScope = deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinClass);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+5 -4
View File
@@ -112,10 +112,11 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@Nullable @Nullable
private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrNamespaceDescriptor descriptor) { private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrNamespaceDescriptor descriptor) {
if (descriptor instanceof ClassDescriptor) { if (descriptor instanceof ClassDescriptor) {
return kotlinClassFinder.find(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor))); return kotlinClassFinder.findKotlinClass(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor)));
} }
else if (descriptor instanceof PackageFragmentDescriptor) { else if (descriptor instanceof PackageFragmentDescriptor) {
return kotlinClassFinder.find(PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) descriptor).getFqName())); return kotlinClassFinder.findKotlinClass(
PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) descriptor).getFqName()));
} }
else { else {
throw new IllegalStateException("Unrecognized descriptor: " + descriptor); throw new IllegalStateException("Unrecognized descriptor: " + descriptor);
@@ -266,7 +267,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
if (proto.hasExtension(JavaProtoBuf.implClassName)) { if (proto.hasExtension(JavaProtoBuf.implClassName)) {
Name tImplName = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName)); Name tImplName = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName));
return kotlinClassFinder.find(containingPackage.getFqName().child(tImplName)); return kotlinClassFinder.findKotlinClass(containingPackage.getFqName().child(tImplName));
} }
return null; return null;
} }
@@ -283,7 +284,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
if (proto.hasExtension(JavaProtoBuf.implClassName)) { if (proto.hasExtension(JavaProtoBuf.implClassName)) {
Name name = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName)); Name name = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName));
FqName fqName = PackageClassUtils.getPackageClassFqName(container.getFqName()).parent().child(name); FqName fqName = PackageClassUtils.getPackageClassFqName(container.getFqName()).parent().child(name);
return kotlinClassFinder.find(fqName); return kotlinClassFinder.findKotlinClass(fqName);
} }
return null; return null;
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java
+1 -1
View File
@@ -22,5 +22,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public interface KotlinClassFinder { public interface KotlinClassFinder {
@Nullable @Nullable
KotlinJvmBinaryClass find(@NotNull FqName fqName); KotlinJvmBinaryClass findKotlinClass(@NotNull FqName fqName);
} }
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
+1 -1
View File
@@ -101,7 +101,7 @@ public final class DecompiledNavigationUtils {
return null; return null;
} }
VirtualFileFinder fileFinder = ServiceManager.getService(project, VirtualFileFinder.class); VirtualFileFinder fileFinder = ServiceManager.getService(project, VirtualFileFinder.class);
VirtualFile virtualFile = fileFinder.find(containerFqName); VirtualFile virtualFile = fileFinder.findVirtualFile(containerFqName);
if (virtualFile == null) { if (virtualFile == null) {
return null; return null;
} }
idea/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java
+1 -1
View File
@@ -40,7 +40,7 @@ public final class IDEVirtualFileFinder implements VirtualFileFinder {
@Nullable @Nullable
@Override @Override
public VirtualFile find(@NotNull FqName className) { public VirtualFile findVirtualFile(@NotNull FqName className) {
Collection<VirtualFile> files = Collection<VirtualFile> files =
FileBasedIndex.getInstance().getContainingFiles(KotlinClassFileIndex.KEY, className, GlobalSearchScope.allScope(project)); FileBasedIndex.getInstance().getContainingFiles(KotlinClassFileIndex.KEY, className, GlobalSearchScope.allScope(project));
if (files.isEmpty()) { if (files.isEmpty()) {