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

A method to find local VirtualFile for Kotlin runtime library

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-25 16:37:19 +04:00
parent e15953b9fc
commit c662f51a0a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/KotlinRuntimeLibraryUtil.java
+13 -5
View File
@@ -232,12 +232,8 @@ public class KotlinRuntimeLibraryUtil {
jarNotFoundHandler.run(); jarNotFoundHandler.run();
return; return;
} }
VirtualFile runtimeJar = getKotlinRuntimeJar(project); VirtualFile runtimeJar = getLocalKotlinRuntimeJar(project);
assert runtimeJar != null; assert runtimeJar != null;
VirtualFile jarFile = JarFileSystem.getInstance().getVirtualFileForJar(runtimeJar);
if (jarFile != null) {
runtimeJar = jarFile;
}
try { try {
FileUtil.copy(runtimePath, new File(runtimeJar.getPath())); FileUtil.copy(runtimePath, new File(runtimeJar.getPath()));
@@ -278,6 +274,18 @@ public class KotlinRuntimeLibraryUtil {
return null; return null;
} }
@Nullable
public static VirtualFile getLocalKotlinRuntimeJar(@NotNull Project project) {
VirtualFile kotlinRuntimeJar = getKotlinRuntimeJar(project);
if (kotlinRuntimeJar == null) return null;
VirtualFile localJarFile = JarFileSystem.getInstance().getVirtualFileForJar(kotlinRuntimeJar);
if (localJarFile != null) {
return localJarFile;
}
return kotlinRuntimeJar;
}
public static abstract class FindRuntimeLibraryHandler { public static abstract class FindRuntimeLibraryHandler {
@Nullable @Nullable
public abstract File getRuntimeJarPath(); public abstract File getRuntimeJarPath();