Add CompilerConfiguration to JsConfig

Will be used to store common compiler options (such as source version, inline
disabled, etc) as well as JS-specific options, to unify the logic of compiler
option initialization between JS and JVM compilers
This commit is contained in:
Alexander Udalov
2016-05-23 18:45:52 +03:00
parent 116e4a5ced
commit 6889bdbef8
7 changed files with 42 additions and 18 deletions
@@ -40,7 +40,9 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
@Override
protected void setUp() throws Exception {
super.setUp();
config = new LibrarySourcesConfig.Builder(getProject(), "module", LibrarySourcesConfig.JS_STDLIB).build();
config = new LibrarySourcesConfig.Builder(
getProject(), getEnvironment().getConfiguration(), "module", LibrarySourcesConfig.JS_STDLIB
).build();
}
@Override
@@ -39,8 +39,8 @@ import org.jetbrains.kotlin.utils.sure
import java.io.File
class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
private final val MODULE_NAME = "module"
private final val BASE_DIR = "compiler/testData/serialization"
private val MODULE_NAME = "module"
private val BASE_DIR = "compiler/testData/serialization"
private fun doTest(fileName: String, metaFileDir: File = tmpdir) {
val source = "$BASE_DIR/$fileName"
@@ -68,7 +68,9 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
try {
val environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
val files = environment.getSourceFiles()
val config = LibrarySourcesConfig.Builder(environment.project, MODULE_NAME, LibrarySourcesConfig.JS_STDLIB).build()
val config = LibrarySourcesConfig.Builder(
environment.project, environment.configuration, MODULE_NAME, LibrarySourcesConfig.JS_STDLIB
).build()
val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config)
FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(MODULE_NAME, analysisResult.moduleDescriptor))
}