InlineCodegen: find virtual file using findVirtualFileWithHeader

This commit is contained in:
Natalia Ukhorskaya
2015-03-27 11:05:53 +03:00
parent ef6698bd52
commit 785f7e749f
6 changed files with 6 additions and 42 deletions
@@ -179,7 +179,7 @@ public class InlineCodegenUtil {
@Nullable
public static VirtualFile findVirtualFile(@NotNull Project project, @NotNull String internalName) {
VirtualFileFinder fileFinder = VirtualFileFinder.SERVICE.getInstance(project);
return fileFinder.findVirtualFile(internalName);
return fileFinder.findVirtualFileWithHeader(new FqName(internalName.replace('/', '.')));
}
//TODO: navigate to inner classes
@@ -46,17 +46,6 @@ public class CliVirtualFileFinder extends VirtualFileKotlinClassFinder implement
return null;
}
@Override
public VirtualFile findVirtualFile(@NotNull String internalName) {
for (VirtualFile root : classPath) {
VirtualFile fileInRoot = findFileInRoot(internalName, root, '/');
if (fileInRoot != null) {
return fileInRoot;
}
}
return null;
}
//NOTE: copied with some changes from CoreJavaFileManager
@Nullable
private static VirtualFile findFileInRoot(@NotNull String qName, @NotNull VirtualFile root, char separator) {
@@ -34,8 +34,4 @@ public interface VirtualFileFinder extends KotlinClassFinder {
@Nullable
VirtualFile findVirtualFileWithHeader(@NotNull FqName className);
/*Also finds files without kotlin header*/
@Nullable
VirtualFile findVirtualFile(@NotNull String internalName);
}