JS: merge KotlinJavascriptSerializer into KotlinJavascriptSerializationUtil

This commit is contained in:
Michael Nedzelsky
2015-03-27 20:25:18 +03:00
parent 1c7e1ddf26
commit 61726fdcb7
6 changed files with 67 additions and 103 deletions
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.config.addKotlinSourceRoots
import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
import org.jetbrains.kotlin.js.config.EcmaVersion
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
@@ -36,7 +35,6 @@ import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import org.jetbrains.kotlin.utils.serializer.KotlinJavaScriptSerializer
import java.io.File
public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
@@ -71,7 +69,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
val files = environment.getSourceFiles()
val config = LibrarySourcesConfig.Builder(environment.project, MODULE_NAME, LibrarySourcesConfig.JS_STDLIB).build()
val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config)
KotlinJavaScriptSerializer().serialize(MODULE_NAME, analysisResult.moduleDescriptor, metaFile)
FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(MODULE_NAME, analysisResult.moduleDescriptor))
}
finally {
Disposer.dispose(rootDisposable)