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

Use MODULE_NAME configuration key in JS instead of MODULE_ID

Browse Source
This commit is contained in:
Alexander Udalov
2016-05-25 21:10:16 +03:00
parent 05f8836f46
commit 159d88102f
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/config/JSConfigurationKeys.java
-3
View File
@@ -36,7 +36,4 @@ public class JSConfigurationKeys {
public static final CompilerConfigurationKey<Boolean> UNIT_TEST_CONFIG =
CompilerConfigurationKey.create("unit test config");
public static final CompilerConfigurationKey<String> MODULE_ID =
CompilerConfigurationKey.create("module id");
}
js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java
+2 -1
View File
@@ -23,6 +23,7 @@ import kotlin.Unit;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
@@ -68,7 +69,7 @@ public abstract class JsConfig {
@NotNull
public String getModuleId() {
return configuration.getNotNull(JSConfigurationKeys.MODULE_ID);
return configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME);
}
public abstract boolean checkLibFilesAndReportErrors(@NotNull Function1<String, Unit> report);
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
+2 -2
View File
@@ -323,7 +323,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
@NotNull
private JsConfig createConfig(
@NotNull Project project,
@NotNull String moduleId,
@NotNull String moduleName,
@NotNull EcmaVersion ecmaVersion,
@Nullable List<String> libraries,
@NotNull List<KtFile> files
@@ -338,7 +338,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
}
configuration.put(JSConfigurationKeys.LIBRARY_FILES, librariesWithStdlib);
configuration.put(JSConfigurationKeys.MODULE_ID, moduleId);
configuration.put(CommonConfigurationKeys.MODULE_NAME, moduleName);
configuration.put(JSConfigurationKeys.TARGET, ecmaVersion);
configuration.put(JSConfigurationKeys.SOURCE_MAP, shouldGenerateSourceMap());