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

JS backend: isJsRuntimeLibrary -> isKotlinJavascriptStdLibrary

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-24 12:52:27 +04:00
parent b42d00f095
commit 83ec20508a
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class LibraryUtils {
return checkSpecTitle(library, TITLE_KOTLIN_JAVASCRIPT_LIB); return checkSpecTitle(library, TITLE_KOTLIN_JAVASCRIPT_LIB);
} }
public static boolean isJsRuntimeLibrary(@NotNull File library) { public static boolean isKotlinJavascriptStdLibrary(@NotNull File library) {
return checkImplTitle(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB); return checkImplTitle(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB);
} }
idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jet.utils.LibraryUtils;
import org.jetbrains.jet.utils.PathUtil;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
@@ -41,7 +40,7 @@ public class JsLibraryStdDetectionUtil {
VirtualFile jar = VfsUtilCore.getVirtualFileForJar(root); VirtualFile jar = VfsUtilCore.getVirtualFileForJar(root);
assert jar != null; assert jar != null;
if (LibraryUtils.isJsRuntimeLibrary(new File(jar.getPath()))) { if (LibraryUtils.isKotlinJavascriptStdLibrary(new File(jar.getPath()))) {
assert JsHeaderLibraryDetectionUtil.isJsHeaderLibraryDetected(classesRoots) : "StdLib should also be detected as headers library"; assert JsHeaderLibraryDetectionUtil.isJsHeaderLibraryDetected(classesRoots) : "StdLib should also be detected as headers library";
return JarUtil.getJarAttribute(VfsUtilCore.virtualToIoFile(root), Attributes.Name.IMPLEMENTATION_VERSION); return JarUtil.getJarAttribute(VfsUtilCore.virtualToIoFile(root), Attributes.Name.IMPLEMENTATION_VERSION);
jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
+1 -1
View File
@@ -42,7 +42,7 @@ class JpsUtils {
Set<JpsLibrary> libraries = getAllDependencies(target).getLibraries(); Set<JpsLibrary> libraries = getAllDependencies(target).getLibraries();
for (JpsLibrary library : libraries) { for (JpsLibrary library : libraries) {
for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) {
if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl()))) if (LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(root.getUrl())))
return true; return true;
} }
} }
js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java
+2 -2
View File
@@ -34,7 +34,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static org.jetbrains.jet.utils.LibraryUtils.isJsRuntimeLibrary; import static org.jetbrains.jet.utils.LibraryUtils.isKotlinJavascriptStdLibrary;
public class LibrarySourcesConfig extends Config { public class LibrarySourcesConfig extends Config {
@NotNull @NotNull
@@ -90,7 +90,7 @@ public class LibrarySourcesConfig extends Config {
if (path.endsWith(".jar") || path.endsWith(".zip")) { if (path.endsWith(".jar") || path.endsWith(".zip")) {
file = jarFileSystem.findFileByPath(path + URLUtil.JAR_SEPARATOR); file = jarFileSystem.findFileByPath(path + URLUtil.JAR_SEPARATOR);
if (isJsRuntimeLibrary(new File(path))) { if (isKotlinJavascriptStdLibrary(new File(path))) {
actualModuleName = STDLIB_JS_MODULE_NAME; actualModuleName = STDLIB_JS_MODULE_NAME;
} }
} }