From 0a535432e46ae2925757bb47f6d88675633789c7 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 16 Dec 2014 16:44:01 +0300 Subject: [PATCH] JS backend: fix using old Kotlin Javascript stdlib --- .../src/org/jetbrains/k2js/config/LibrarySourcesConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java index 95f3033c846..e1bfb32de02 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java @@ -39,6 +39,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.utils.LibraryUtils.isKotlinJavascriptLibrary; +import static org.jetbrains.jet.utils.LibraryUtils.isKotlinJavascriptStdLibrary; public class LibrarySourcesConfig extends Config { @NotNull @@ -139,7 +140,10 @@ public class LibrarySourcesConfig extends Config { return true; } else { - if (isKotlinJavascriptLibrary(filePath)) { + if (isKotlinJavascriptStdLibrary(filePath)) { + actualModuleName = STDLIB_JS_MODULE_NAME; + } + else if (isKotlinJavascriptLibrary(filePath)) { actualModuleName = LibraryUtils.getKotlinJsModuleName(filePath); } else if (actualModuleName == null) {