update kotlin javascript stdlib if needed
This commit is contained in:
@@ -40,5 +40,8 @@ public interface KotlinPaths {
|
||||
File getAndroidSdkAnnotationsPath();
|
||||
|
||||
@NotNull
|
||||
File getJsLibJarPath();
|
||||
File getJsStdLibJarPath();
|
||||
|
||||
@NotNull
|
||||
File getJsStdLibSrcJarPath();
|
||||
}
|
||||
|
||||
@@ -66,10 +66,16 @@ public class KotlinPathsFromHomeDir implements KotlinPaths {
|
||||
|
||||
@Override
|
||||
@NotNull
|
||||
public File getJsLibJarPath() {
|
||||
public File getJsStdLibJarPath() {
|
||||
return getLibraryFile(PathUtil.JS_LIB_JAR_NAME);
|
||||
}
|
||||
|
||||
@Override
|
||||
@NotNull
|
||||
public File getJsStdLibSrcJarPath() {
|
||||
return getLibraryFile(PathUtil.JS_LIB_SRC_JAR_NAME);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private File getLibraryFile(@NotNull String fileName) {
|
||||
return new File(getLibPath(), fileName);
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
package org.jetbrains.jet.utils;
|
||||
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -24,6 +25,7 @@ import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.jar.Attributes;
|
||||
import java.util.jar.JarFile;
|
||||
@@ -147,4 +149,14 @@ public class LibraryUtils {
|
||||
public static boolean isJvmRuntimeLibrary(@NotNull File library) {
|
||||
return checkImplTitle(library, TITLE_KOTLIN_JVM_RUNTIME_AND_STDLIB);
|
||||
}
|
||||
|
||||
public static VirtualFile getJarFile(@NotNull List<VirtualFile> classesRoots, @NotNull String jarName) {
|
||||
for (VirtualFile root : classesRoots) {
|
||||
if (root.getName().equals(jarName)) {
|
||||
return root;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user