From 736519c5062546a142c8588512a975fa44588677 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Fri, 19 May 2023 17:25:41 +0200 Subject: [PATCH] [JS] Rename JsLibraryProvider to LibraryProvider This class is not JS-specific and can be used in Wasm test services --- .../services/{JsLibraryProvider.kt => LibraryProvider.kt} | 4 ++-- .../test/frontend/classic/ClassicFrontend2IrConverter.kt | 4 ++-- .../kotlin/test/frontend/classic/ClassicFrontendFacade.kt | 2 +- .../kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt | 4 ++-- .../kotlin/test/runners/AbstractFirDiagnosticTest.kt | 4 ++-- .../services/configuration/JsEnvironmentConfigurator.kt | 2 +- .../services/configuration/WasmEnvironmentConfigurator.kt | 2 -- .../kotlin/js/test/converters/FirJsKlibBackendFacade.kt | 2 +- .../kotlin/js/test/converters/JsIrBackendFacade.kt | 8 ++++---- .../kotlin/js/test/converters/JsKlibBackendFacade.kt | 4 ++-- .../incremental/RecompileModuleJsIrBackendFacade.kt | 2 +- .../kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt | 4 ++-- .../kotlin/js/test/handlers/JsSourceMapPathRewriter.kt | 4 ++-- .../js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt | 4 ++-- .../kotlin/js/test/ir/AbstractJsIrTextTestBase.kt | 4 ++-- .../kotlin/js/test/utils/JsIrIncrementalDataProvider.kt | 4 ++-- .../wasm/test/diagnostics/AbstractDiagnosticsWasmTest.kt | 5 ++--- 17 files changed, 30 insertions(+), 33 deletions(-) rename compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/{JsLibraryProvider.kt => LibraryProvider.kt} (91%) diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/JsLibraryProvider.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/LibraryProvider.kt similarity index 91% rename from compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/JsLibraryProvider.kt rename to compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/LibraryProvider.kt index 16377c457d1..ad4641751ac 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/JsLibraryProvider.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/LibraryProvider.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.test.services import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.library.KotlinLibrary -class JsLibraryProvider(private val testServices: TestServices) : TestService { +class LibraryProvider(private val testServices: TestServices) : TestService { private val descriptorToLibrary = mutableMapOf() private val stdlibPathToDescriptor = mutableMapOf() @@ -49,4 +49,4 @@ class JsLibraryProvider(private val testServices: TestServices) : TestService { } } -val TestServices.jsLibraryProvider: JsLibraryProvider by TestServices.testServiceAccessor() +val TestServices.libraryProvider: LibraryProvider by TestServices.testServiceAccessor() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt index e2847b68615..c1b8129b915 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt @@ -42,7 +42,7 @@ class ClassicFrontend2IrConverter( BackendKinds.IrBackend ) { override val additionalServices: List - get() = listOf(service(::JsLibraryProvider)) + get() = listOf(service(::LibraryProvider)) override fun transform(module: TestModule, inputArtifact: ClassicFrontendOutputArtifact): IrBackendInput { return when (module.targetBackend) { @@ -102,7 +102,7 @@ class ClassicFrontend2IrConverter( IrFactoryImpl, verifySignatures ) { - testServices.jsLibraryProvider.getDescriptorByCompiledLibrary(it) + testServices.libraryProvider.getDescriptorByCompiledLibrary(it) } val errorPolicy = configuration.get(JSConfigurationKeys.ERROR_TOLERANCE_POLICY) ?: ErrorTolerancePolicy.DEFAULT diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt index 615982c1990..771ab9dc950 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt @@ -282,7 +282,7 @@ class ClassicFrontendFacade( val dependencies = mutableListOf() return resolvedLibraries.map { resolvedLibrary -> - testServices.jsLibraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { val storageManager = LockBasedStorageManager("ModulesStructure") val isBuiltIns = resolvedLibrary.library.unresolvedDependencies.isEmpty() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt index 0ab04ef4ca6..622b898742f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.compilerConfigurationProvider -import org.jetbrains.kotlin.test.services.jsLibraryProvider +import org.jetbrains.kotlin.test.services.libraryProvider import org.jetbrains.kotlin.utils.metadataVersion class Fir2IrJsResultsConverter( @@ -204,7 +204,7 @@ private fun loadResolvedLibraries( return resolvedLibraries.map { resolvedLibrary -> // resolvedLibrary.library.libraryName in fact resolves to (modified) file path, which is confising and maybe should be refactored - testServices.jsLibraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { // TODO: check safety of the approach of creating a separate storage manager per library val storageManager = LockBasedStorageManager("ModulesStructure") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt index c162d8db77d..2908372e35c 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.test.frontend.fir.handlers.* import org.jetbrains.kotlin.test.model.DependencyKind import org.jetbrains.kotlin.test.model.FrontendFacade import org.jetbrains.kotlin.test.model.FrontendKinds -import org.jetbrains.kotlin.test.services.JsLibraryProvider +import org.jetbrains.kotlin.test.services.LibraryProvider import org.jetbrains.kotlin.test.services.TestService import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator @@ -106,7 +106,7 @@ abstract class AbstractFirWithActualizerDiagnosticsTest(val parser: FirParser) : ) } - useAdditionalService(::JsLibraryProvider) + useAdditionalService(::LibraryProvider) } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt index e33dc4784d5..876f363ad77 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt @@ -196,7 +196,7 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu fun getAllRecursiveLibrariesFor(module: TestModule, testServices: TestServices): Map { val dependencies = getAllRecursiveDependenciesFor(module, testServices) - return dependencies.associateBy { testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(it) } + return dependencies.associateBy { testServices.libraryProvider.getCompiledLibraryByDescriptor(it) } } fun getAllDependenciesMappingFor(module: TestModule, testServices: TestServices): Map> { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt index 9ca3a40567f..67ceea0e37e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.test.services.configuration import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.AnalysisFlags.allowFullyQualifiedNameInKClass -import org.jetbrains.kotlin.config.AnalysisFlags.skipPrereleaseCheck import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.LanguageVersion @@ -17,7 +16,6 @@ import org.jetbrains.kotlin.js.config.SourceMapSourceEmbedding import org.jetbrains.kotlin.serialization.js.ModuleKind import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.EXPECT_ACTUAL_LINKER -import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.GENERATE_INLINE_ANONYMOUS_FUNCTIONS import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.NO_INLINE import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.PROPERTY_LAZY_INITIALIZATION import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.SOURCE_MAP_EMBED_SOURCES diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt index 1dbfaaf428e..6a5fc387fbf 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt @@ -122,7 +122,7 @@ class FirJsKlibBackendFacade( if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) { testServices.jsIrIncrementalDataProvider.recordIncrementalData(module, lib) } - testServices.jsLibraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib) + testServices.libraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib) return BinaryArtifacts.KLib(File(outputFile)) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt index 149612cb351..26313387187 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.test.services.compilerConfigurationProvider import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator.Companion.getJsArtifactSimpleName import org.jetbrains.kotlin.test.services.configuration.getDependencies -import org.jetbrains.kotlin.test.services.jsLibraryProvider +import org.jetbrains.kotlin.test.services.libraryProvider import org.jetbrains.kotlin.utils.addToStdlib.ifTrue import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.fileUtils.withReplacedExtensionOrNull @@ -215,9 +215,9 @@ class JsIrBackendFacade( val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), IrFactoryImplForJsIC(WholeWorldStageController())) val moduleDescriptor = testServices.moduleDescriptorProvider.getModuleDescriptor(module) - val mainModuleLib = testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(moduleDescriptor) + val mainModuleLib = testServices.libraryProvider.getCompiledLibraryByDescriptor(moduleDescriptor) val friendLibraries = getDependencies(module, testServices, DependencyRelation.FriendDependency) - .map { testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(it) } + .map { testServices.libraryProvider.getCompiledLibraryByDescriptor(it) } val friendModules = mapOf(mainModuleLib.uniqueName to friendLibraries.map { it.uniqueName }) return getIrModuleInfoForKlib( @@ -229,7 +229,7 @@ class JsIrBackendFacade( symbolTable, messageLogger, loadFunctionInterfacesIntoStdlib = true, - ) { if (it == mainModuleLib) moduleDescriptor else testServices.jsLibraryProvider.getDescriptorByCompiledLibrary(it) } + ) { if (it == mainModuleLib) moduleDescriptor else testServices.libraryProvider.getDescriptorByCompiledLibrary(it) } } private fun BinaryArtifacts.Js.JsIrArtifact.dump( diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt index e1ede0038f6..ce14c0c3ea6 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt @@ -69,7 +69,7 @@ class JsKlibBackendFacade( val dependencies = JsEnvironmentConfigurator.getAllRecursiveDependenciesFor(module, testServices).toList() val lib = CommonKLibResolver.resolve( - dependencies.map { testServices.jsLibraryProvider.getPathByDescriptor(it) } + listOf(outputFile), + dependencies.map { testServices.libraryProvider.getPathByDescriptor(it) } + listOf(outputFile), configuration.resolverLogger ).getFullResolvedList().last().library @@ -87,7 +87,7 @@ class JsKlibBackendFacade( if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) { testServices.jsIrIncrementalDataProvider.recordIncrementalData(module, lib) } - testServices.jsLibraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib) + testServices.libraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib) return BinaryArtifacts.KLib(File(outputFile)) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt index 51a1e476113..fa300c11778 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt @@ -31,7 +31,7 @@ class RecompileModuleJsIrBackendFacade( override fun TestServices.register(module: TestModule) { register(ModuleDescriptorProvider::class, testServices.moduleDescriptorProvider) - register(JsLibraryProvider::class, testServices.jsLibraryProvider) + register(LibraryProvider::class, testServices.libraryProvider) register(JsIrIncrementalDataProvider::class, testServices.jsIrIncrementalDataProvider) } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt index 90a806a1b1f..770a346f87b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.model.DependencyKind import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside -import org.jetbrains.kotlin.test.services.JsLibraryProvider +import org.jetbrains.kotlin.test.services.LibraryProvider import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider @@ -52,7 +52,7 @@ abstract class AbstractFirJsDiagnosticTestBase(val parser: FirParser) : Abstract ::CoroutineHelpersSourceFilesProvider, ) - useAdditionalService(::JsLibraryProvider) + useAdditionalService(::LibraryProvider) facadeStep(::FirFrontendFacade) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapPathRewriter.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapPathRewriter.kt index 27384ad21c9..f628ec06b4c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapPathRewriter.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapPathRewriter.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.js.parser.sourcemaps.* import org.jetbrains.kotlin.test.model.TestFile import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator -import org.jetbrains.kotlin.test.services.jsLibraryProvider +import org.jetbrains.kotlin.test.services.libraryProvider import org.jetbrains.kotlin.test.services.moduleStructure import java.io.File @@ -60,7 +60,7 @@ class JsSourceMapPathRewriter(testServices: TestServices) : AbstractJsArtifactsC private fun tryToMapLibrarySourceFile(dependencies: Iterable, sourceMapPath: String): String? { for (dependency in dependencies) { val libraryFile = try { - File(testServices.jsLibraryProvider.getPathByDescriptor(dependency)) + File(testServices.libraryProvider.getPathByDescriptor(dependency)) } catch (e: NoSuchElementException) { continue } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt index 5f14dc8d930..adb10a9429c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest import org.jetbrains.kotlin.test.runners.codegen.commonClassicFrontendHandlersForCodegenTest -import org.jetbrains.kotlin.test.services.JsLibraryProvider +import org.jetbrains.kotlin.test.services.LibraryProvider import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider @@ -136,7 +136,7 @@ fun < ::JsEnvironmentConfigurator, ) - useAdditionalService(::JsLibraryProvider) + useAdditionalService(::LibraryProvider) useAfterAnalysisCheckers( ::JsFailingTestSuppressor, diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTextTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTextTestBase.kt index ac73f41f582..b464cac205c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTextTestBase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTextTestBase.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.runners.ir.AbstractIrTextTest -import org.jetbrains.kotlin.test.services.JsLibraryProvider +import org.jetbrains.kotlin.test.services.LibraryProvider import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator @@ -28,7 +28,7 @@ abstract class AbstractJsIrTextTestBase