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

Rename Config -> JsConfig

Browse Source
This commit is contained in:
Alexander Udalov
2016-05-23 18:26:32 +03:00
parent 2bd3211ba8
commit 116e4a5ced
12 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
+4 -4
View File
@@ -38,8 +38,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.idea.KotlinFileType;
import org.jetbrains.kotlin.js.JavaScript;
import org.jetbrains.kotlin.js.config.Config;
import org.jetbrains.kotlin.js.config.EcmaVersion;
import org.jetbrains.kotlin.js.config.JsConfig;
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
import org.jetbrains.kotlin.js.facade.K2JSTranslator;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
@@ -182,7 +182,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
List<String> allFiles = withAdditionalKotlinFiles(files);
List<KtFile> jetFiles = createJetFileList(project, allFiles, null);
Config config = createConfig(getProject(), moduleName, version, libraries, jetFiles);
JsConfig config = createConfig(getProject(), moduleName, version, libraries, jetFiles);
File outputFile = new File(getOutputFilePath(testName, version));
translateFiles(jetFiles, outputFile, mainCallParameters, config);
@@ -196,7 +196,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
@NotNull List<KtFile> jetFiles,
@NotNull File outputFile,
@NotNull MainCallParameters mainCallParameters,
@NotNull Config config
@NotNull JsConfig config
) throws Exception {
K2JSTranslator translator = new K2JSTranslator(config);
TranslationResult translationResult = translator.translate(jetFiles, mainCallParameters);
@@ -321,7 +321,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
}
@NotNull
private Config createConfig(
private JsConfig createConfig(
@NotNull Project project,
@NotNull String moduleId,
@NotNull EcmaVersion ecmaVersion,