Fix version requirement serialization for nested classes

Use the version requierement table of the outer DescriptorSerializer instance when serializing metadata for a class. Pass parent serializer to DescriptorSerializer.create to make sure the correct table is used. Serialize nested classes before the outer class in JS and common code, to make sure requirements are not lost. Also, split VersionRequirementTest to JVM and JS #KT-25120 In Progress
2018-07-09 20:23:21 +02:00
parent a61de052c7
commit 1e9694f1db
13 changed files with 312 additions and 134 deletions
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.serialization.js
+
+import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo
+import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
+import org.jetbrains.kotlin.config.ApiVersion
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
+import org.jetbrains.kotlin.config.languageVersionSettings
+import org.jetbrains.kotlin.context.ContextForNewModule
+import org.jetbrains.kotlin.context.MutableModuleContext
+import org.jetbrains.kotlin.context.ProjectContext
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
+import org.jetbrains.kotlin.js.config.JSConfigurationKeys
+import org.jetbrains.kotlin.js.config.JsConfig
+import org.jetbrains.kotlin.js.facade.K2JSTranslator
+import org.jetbrains.kotlin.js.facade.MainCallParameters
+import org.jetbrains.kotlin.js.facade.TranslationResult
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.BindingTraceContext
+import org.jetbrains.kotlin.serialization.AbstractVersionRequirementTest
+import org.jetbrains.kotlin.test.ConfigurationKind
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.TestJdkKind
+import java.io.File
+
+class JsVersionRequirementTest : AbstractVersionRequirementTest() {
+    override fun compileFiles(files: List<File>, outputDirectory: File, languageVersion: LanguageVersion) {
+        val environment = createEnvironment(languageVersion)
+        val ktFiles = files.map { file -> KotlinTestUtils.createFile(file.name, file.readText(), environment.project) }
+        val trace = BindingTraceContext()
+        val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFilesWithGivenTrace(
+            ktFiles, trace, createModule(environment), environment.configuration
+        )
+
+        // There are INVISIBLE_REFERENCE errors on RequireKotlin and K2JSTranslator refuses to translate the code otherwise
+        trace.clearDiagnostics()
+
+        val result = K2JSTranslator(JsConfig(environment.project, environment.configuration)).translate(
+            object : JsConfig.Reporter() {}, ktFiles, MainCallParameters.noCall(), analysisResult
+        ) as TranslationResult.Success
+        result.getOutputFiles(File(outputDirectory, "lib.js"), null, null).writeAllTo(outputDirectory)
+    }
+
+    override fun loadModule(directory: File): ModuleDescriptor {
+        val environment = createEnvironment(extraDependencies = listOf(File(directory, "lib.meta.js")))
+        return TopDownAnalyzerFacadeForJS.analyzeFilesWithGivenTrace(
+            emptyList(), BindingTraceContext(), createModule(environment), environment.configuration
+        ).moduleDescriptor
+    }
+
+    private fun createEnvironment(
+        languageVersion: LanguageVersion? = null,
+        extraDependencies: List<File> = emptyList()
+    ): KotlinCoreEnvironment =
+        KotlinCoreEnvironment.createForTests(
+            testRootDisposable,
+            KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK).apply {
+                put(JSConfigurationKeys.LIBRARIES, extraDependencies.map(File::getPath) + JsConfig.JS_STDLIB)
+                put(JSConfigurationKeys.META_INFO, true)
+
+                if (languageVersion != null) {
+                    languageVersionSettings =
+                            LanguageVersionSettingsImpl(languageVersion, ApiVersion.createByLanguageVersion(languageVersion))
+                }
+            },
+            EnvironmentConfigFiles.JS_CONFIG_FILES
+        )
+
+    private fun createModule(environment: KotlinCoreEnvironment): MutableModuleContext {
+        val config = JsConfig(environment.project, environment.configuration)
+        return ContextForNewModule(ProjectContext(environment.project), Name.special("<test>"), JsPlatform.builtIns, null).apply {
+            setDependencies(listOf(module) + config.moduleDescriptors + module.builtIns.builtInsModule)
+        }
+    }
+}