diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml index 185427a034b..e7ccb32ef8f 100644 --- a/.idea/kotlinTestDataPluginTestDataPaths.xml +++ b/.idea/kotlinTestDataPluginTestDataPaths.xml @@ -89,6 +89,7 @@ diff --git a/compiler/util-klib-abi/build.gradle.kts b/compiler/util-klib-abi/build.gradle.kts index 86a85e10253..809763770e5 100644 --- a/compiler/util-klib-abi/build.gradle.kts +++ b/compiler/util-klib-abi/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":generators:test-generator")) + testImplementation(projectTests(":js:js.tests")) } sourceSets { diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractLibraryAbiReaderTest.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractLibraryAbiReaderTest.kt index a63fec27477..d0473f33d2f 100644 --- a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractLibraryAbiReaderTest.kt +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractLibraryAbiReaderTest.kt @@ -5,38 +5,133 @@ package org.jetbrains.kotlin.library.abi -import org.jetbrains.kotlin.library.abi.impl.AbiSignatureVersions -import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.TestInfo -import java.io.File +import org.jetbrains.kotlin.js.test.converters.FirJsKlibBackendFacade +import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade +import org.jetbrains.kotlin.library.abi.handlers.LibraryAbiDumpHandler +import org.jetbrains.kotlin.platform.TargetPlatform +import org.jetbrains.kotlin.platform.js.JsPlatforms +import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor +import org.jetbrains.kotlin.test.backend.handlers.NoCompilationErrorsHandler +import org.jetbrains.kotlin.test.backend.handlers.NoFirCompilationErrorsHandler +import org.jetbrains.kotlin.test.backend.ir.IrBackendInput +import org.jetbrains.kotlin.test.builders.* +import org.jetbrains.kotlin.test.directives.configureFirParser +import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter +import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade +import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact +import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJsResultsConverter +import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade +import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact +import org.jetbrains.kotlin.test.model.* +import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest +import org.jetbrains.kotlin.test.services.LibraryProvider +import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator +import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator -@OptIn(ExperimentalLibraryAbiReader::class) -abstract class AbstractLibraryAbiReaderTest { - private lateinit var testName: String - private lateinit var buildDir: File +/** + * This test class can potentially be re-used in the future for other backends. + */ +abstract class AbstractLibraryAbiReaderTest>( + private val targetPlatform: TargetPlatform, + targetBackend: TargetBackend, +) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) { - @BeforeEach - fun setUp(testInfo: TestInfo) { - testName = getTestName(testInfo) - buildDir = setUpBuildDir(testInfo) - } + abstract val frontend: FrontendKind<*> + abstract val frontendFacade: Constructor> + abstract val converter: Constructor> + abstract val backendFacade: Constructor> - fun runTest(relativePath: String) { - val (sourceFile, dumpFiles) = computeTestFiles(relativePath, AbiSignatureVersions.Supported.entries) + open fun TestConfigurationBuilder.applyConfigurators() {} - val filters = computeFiltersFromTestDirectives(sourceFile) + override fun TestConfigurationBuilder.configuration() { + globalDefaults { + frontend = this@AbstractLibraryAbiReaderTest.frontend + targetPlatform = this@AbstractLibraryAbiReaderTest.targetPlatform + artifactKind = BinaryKind.NoArtifact + targetBackend = this@AbstractLibraryAbiReaderTest.targetBackend + dependencyKind = DependencyKind.Binary + } - val library = buildLibrary(sourceFile, libraryName = testName, buildDir) - val libraryAbi = LibraryAbiReader.readAbiInfo(library, filters) + useAfterAnalysisCheckers( + ::BlackBoxCodegenSuppressor + ) - dumpFiles.entries.forEach { (signatureVersion, dumpFile) -> - val abiDump = LibraryAbiRenderer.render( - libraryAbi, - AbiRenderingSettings(signatureVersion) + applyConfigurators() + + facadeStep(frontendFacade) + + classicFrontendHandlersStep { + useHandlers( + ::NoCompilationErrorsHandler ) + } - assertEqualsToFile(dumpFile, abiDump) + firHandlersStep { + useHandlers( + ::NoFirCompilationErrorsHandler + ) + } + + facadeStep(converter) + irHandlersStep() + + facadeStep(backendFacade) + klibArtifactsHandlersStep { + useHandlers( + ::LibraryAbiDumpHandler + ) } } } + +abstract class AbstractJsLibraryAbiReaderTest> : + AbstractLibraryAbiReaderTest( + JsPlatforms.defaultJsPlatform, + TargetBackend.JS_IR, + ) { + + override fun TestConfigurationBuilder.applyConfigurators() { + useConfigurators( + ::CommonEnvironmentConfigurator, + ::JsEnvironmentConfigurator, + ) + + useAdditionalService(::LibraryProvider) + } +} + +open class AbstractFirJsLibraryAbiReaderTest : AbstractJsLibraryAbiReaderTest() { + final override val frontend: FrontendKind<*> + get() = FrontendKinds.FIR + + final override val frontendFacade: Constructor> + get() = ::FirFrontendFacade + + override val converter: Constructor> + get() = ::Fir2IrJsResultsConverter + + override val backendFacade: Constructor> + get() = ::FirJsKlibBackendFacade + + override fun configure(builder: TestConfigurationBuilder) { + builder.configureFirParser(FirParser.Psi) + super.configure(builder) + } +} + +open class AbstractClassicJsLibraryAbiReaderTest : AbstractJsLibraryAbiReaderTest() { + final override val frontend: FrontendKind<*> + get() = FrontendKinds.ClassicFrontend + + final override val frontendFacade: Constructor> + get() = ::ClassicFrontendFacade + + override val converter: Constructor> + get() = ::ClassicFrontend2IrConverter + + override val backendFacade: Constructor> + get() = ::JsKlibBackendFacade +} diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractOldLibraryAbiReaderTest.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractOldLibraryAbiReaderTest.kt new file mode 100644 index 00000000000..bfdac7bb586 --- /dev/null +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/AbstractOldLibraryAbiReaderTest.kt @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.library.abi + +import org.jetbrains.kotlin.library.abi.impl.AbiSignatureVersions +import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.TestInfo +import java.io.File + +@OptIn(ExperimentalLibraryAbiReader::class) +abstract class AbstractOldLibraryAbiReaderTest { + private lateinit var testName: String + private lateinit var buildDir: File + + @BeforeEach + fun setUp(testInfo: TestInfo) { + testName = getTestName(testInfo) + buildDir = setUpBuildDir(testInfo) + } + + fun runTest(relativePath: String) { + val (sourceFile, dumpFiles) = computeTestFiles(relativePath, AbiSignatureVersions.Supported.entries) + + val (moduleName, filters) = computeModuleNameAndFiltersFromTestDirectives(sourceFile) + + val library = buildLibrary(sourceFile, moduleName, buildDir) + val libraryAbi = LibraryAbiReader.readAbiInfo(library, filters) + + dumpFiles.entries.forEach { (signatureVersion, dumpFile) -> + val abiDump = LibraryAbiRenderer.render( + libraryAbi, + AbiRenderingSettings(signatureVersion) + ) + + assertEqualsToFile(dumpFile, abiDump) + } + } +} diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt index 4888af3083e..10c1823defe 100644 --- a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt @@ -12,7 +12,18 @@ fun main() { generateTestGroupSuiteWithJUnit5 { testGroup("compiler/util-klib-abi/tests-gen", "compiler/util-klib-abi/testData") { - testClass(suiteTestClassName = "LibraryAbiReaderTest") { + testClass(suiteTestClassName = "OldLibraryAbiReaderTest") { + model("content") + } + } + } + + generateTestGroupSuiteWithJUnit5 { + testGroup("compiler/util-klib-abi/tests-gen", "compiler/util-klib-abi/testData") { + testClass { + model("content") + } + testClass { model("content") } } diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/directives/LibraryAbiDumpDirectives.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/directives/LibraryAbiDumpDirectives.kt new file mode 100644 index 00000000000..89286a39a42 --- /dev/null +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/directives/LibraryAbiDumpDirectives.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.library.abi.directives + +import org.jetbrains.kotlin.library.abi.AbiCompoundName +import org.jetbrains.kotlin.library.abi.AbiQualifiedName +import org.jetbrains.kotlin.library.abi.ExperimentalLibraryAbiReader +import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer + +@OptIn(ExperimentalLibraryAbiReader::class) +object LibraryAbiDumpDirectives : SimpleDirectivesContainer() { + val EXCLUDED_PACKAGES by valueDirective( + description = "Packages that should be filtered out from ABI dump", + parser = ::parseCompoundName + ) + + val EXCLUDED_CLASSES by valueDirective( + description = "Classes that should be filtered out from ABI dump", + parser = ::parseQualifiedName + ) + + val NON_PUBLIC_MARKERS by valueDirective( + description = "Non-public API markers (annotation classes)", + parser = ::parseQualifiedName + ) + + private fun String.removeDoubleQuotes() = removeSurrounding("\"") + + private fun parseCompoundName(value: String) = AbiCompoundName(value.removeDoubleQuotes()) + + private fun parseQualifiedName(value: String): AbiQualifiedName = + with(value.removeDoubleQuotes()) { + AbiQualifiedName( + packageName = AbiCompoundName(substringBefore('/', missingDelimiterValue = "")), + relativeName = AbiCompoundName(substringAfter('/')) + ) + } +} diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/handlers/LibraryAbiDumpHandler.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/handlers/LibraryAbiDumpHandler.kt new file mode 100644 index 00000000000..b82859eb09b --- /dev/null +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/handlers/LibraryAbiDumpHandler.kt @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.library.abi.handlers + +import org.jetbrains.kotlin.library.KotlinIrSignatureVersion +import org.jetbrains.kotlin.library.abi.* +import org.jetbrains.kotlin.library.abi.AbiReadingFilter.* +import org.jetbrains.kotlin.library.abi.directives.LibraryAbiDumpDirectives +import org.jetbrains.kotlin.library.abi.impl.AbiSignatureVersions +import org.jetbrains.kotlin.test.model.ArtifactKinds +import org.jetbrains.kotlin.test.model.BinaryArtifactHandler +import org.jetbrains.kotlin.test.model.BinaryArtifacts +import org.jetbrains.kotlin.test.model.TestModule +import org.jetbrains.kotlin.test.services.TestServices +import org.jetbrains.kotlin.test.services.moduleStructure +import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumper +import org.jetbrains.kotlin.test.utils.withExtension + +@OptIn(ExperimentalLibraryAbiReader::class) +class LibraryAbiDumpHandler(testServices: TestServices) : BinaryArtifactHandler( + testServices, + ArtifactKinds.KLib, + failureDisablesNextSteps = true, + doNotRunIfThereWerePreviousFailures = true, +) { + override val directiveContainers get() = listOf(LibraryAbiDumpDirectives) + + private val dumpers = KotlinIrSignatureVersion.CURRENTLY_SUPPORTED_VERSIONS.map { irSignatureVersion -> + AbiSignatureVersions.resolveByVersionNumber(irSignatureVersion.number) to MultiModuleInfoDumper() + } + + override fun processModule(module: TestModule, info: BinaryArtifacts.KLib) { + val libraryAbi = LibraryAbiReader.readAbiInfo( + info.outputFile, + ExcludedPackages(module.directives[LibraryAbiDumpDirectives.EXCLUDED_PACKAGES]), + ExcludedClasses(module.directives[LibraryAbiDumpDirectives.EXCLUDED_CLASSES]), + NonPublicMarkerAnnotations(module.directives[LibraryAbiDumpDirectives.NON_PUBLIC_MARKERS]) + ) + + for ((abiSignatureVersion, dumper) in dumpers) { + LibraryAbiRenderer.render(libraryAbi, dumper.builderForModule(module), AbiRenderingSettings(abiSignatureVersion)) + } + } + + override fun processAfterAllModules(someAssertionWasFailed: Boolean) { + assertions.assertAll( + dumpers.map { (abiSignatureVersion, dumper) -> + { + val expectedFile = testServices + .moduleStructure + .originalTestDataFiles + .first() + .withExtension("v${abiSignatureVersion.versionNumber}.txt") + assertions.assertEqualsToFile(expectedFile, dumper.generateResultingDump()) + } + } + ) + } +} diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/utils.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/utils.kt index 1fc3b7792fe..63434f6379c 100644 --- a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/utils.kt +++ b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/utils.kt @@ -80,30 +80,36 @@ internal fun computeTestFiles( } @OptIn(ExperimentalLibraryAbiReader::class) -internal fun computeFiltersFromTestDirectives(sourceFile: File): List { +internal fun computeModuleNameAndFiltersFromTestDirectives(sourceFile: File): Pair> { fun String.parseQualifiedName() = AbiQualifiedName( packageName = AbiCompoundName(substringBefore('/', missingDelimiterValue = "")), relativeName = AbiCompoundName(substringAfter('/')) ) + var moduleName: String? = null val excludedPackages = mutableListOf() val excludedClasses = mutableListOf() val nonPublicMarkers = mutableListOf() - sourceFile.bufferedReader().lineSequence().forEach { line -> + for (line in sourceFile.bufferedReader().lineSequence()) { if (!line.parseTestDirective(DIRECTIVE_EXCLUDED_PACKAGES, ::AbiCompoundName, excludedPackages::add) && !line.parseTestDirective(DIRECTIVE_EXCLUDED_CLASSES, String::parseQualifiedName, excludedClasses::add) && !line.parseTestDirective(DIRECTIVE_NON_PUBLIC_MARKERS, String::parseQualifiedName, nonPublicMarkers::add) + && !line.parseTestDirective(DIRECTIVE_MODULE, { it }, { moduleName = it }) + && !line.startsWith("//") + && line.isNotBlank() ) { - return listOfNotNull( - excludedPackages.ifNotEmpty(AbiReadingFilter::ExcludedPackages), - excludedClasses.ifNotEmpty(AbiReadingFilter::ExcludedClasses), - nonPublicMarkers.ifNotEmpty(AbiReadingFilter::NonPublicMarkerAnnotations) - ) + break } } - return emptyList() + assert(moduleName != null) { "No module name specified with MODULE test directive" } + + return moduleName!! to listOfNotNull( + excludedPackages.ifNotEmpty(AbiReadingFilter::ExcludedPackages), + excludedClasses.ifNotEmpty(AbiReadingFilter::ExcludedClasses), + nonPublicMarkers.ifNotEmpty(AbiReadingFilter::NonPublicMarkerAnnotations) + ) } private inline fun String.parseTestDirective( @@ -124,6 +130,7 @@ private inline fun String.parseTestDirective( } } +private const val DIRECTIVE_MODULE = "// MODULE:" private const val DIRECTIVE_EXCLUDED_PACKAGES = "// EXCLUDED_PACKAGES:" private const val DIRECTIVE_EXCLUDED_CLASSES = "// EXCLUDED_CLASSES:" private const val DIRECTIVE_NON_PUBLIC_MARKERS = "// NON_PUBLIC_MARKERS:" diff --git a/compiler/util-klib-abi/testData/content/callables.kt b/compiler/util-klib-abi/testData/content/callables.kt index 6c9a441755f..76cde519f20 100644 --- a/compiler/util-klib-abi/testData/content/callables.kt +++ b/compiler/util-klib-abi/testData/content/callables.kt @@ -1,3 +1,6 @@ +// !LANGUAGE: +ContextReceivers +// MODULE: callables_library + package callables.test fun regularFun(): String = "" diff --git a/compiler/util-klib-abi/testData/content/callables.v1.txt b/compiler/util-klib-abi/testData/content/callables.v1.txt index 9a092415f7f..f3e1a074227 100644 --- a/compiler/util-klib-abi/testData/content/callables.v1.txt +++ b/compiler/util-klib-abi/testData/content/callables.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class callables.test/FunctionContainer { // callables.test/FunctionContainer|null[0] constructor () // callables.test/FunctionContainer.|-5645683436151566731[0] final fun regularFun(): kotlin/String // callables.test/FunctionContainer.regularFun|-1607736902443358908[0] diff --git a/compiler/util-klib-abi/testData/content/callables.v2.txt b/compiler/util-klib-abi/testData/content/callables.v2.txt index b729d5a6122..fb58756a273 100644 --- a/compiler/util-klib-abi/testData/content/callables.v2.txt +++ b/compiler/util-klib-abi/testData/content/callables.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class callables.test/FunctionContainer { // callables.test/FunctionContainer|null[0] constructor () // callables.test/FunctionContainer.|(){}[0] final fun regularFun(): kotlin/String // callables.test/FunctionContainer.regularFun|regularFun(){}[0] diff --git a/compiler/util-klib-abi/testData/content/classifiers.kt b/compiler/util-klib-abi/testData/content/classifiers.kt index 9264cdfd6e5..141ca2b16b2 100644 --- a/compiler/util-klib-abi/testData/content/classifiers.kt +++ b/compiler/util-klib-abi/testData/content/classifiers.kt @@ -1,3 +1,5 @@ +// MODULE: classifiers_library + package classifiers.test class RegularClass(val property: String) { diff --git a/compiler/util-klib-abi/testData/content/classifiers.v1.txt b/compiler/util-klib-abi/testData/content/classifiers.v1.txt index 89659b84ead..02db7dcc412 100644 --- a/compiler/util-klib-abi/testData/content/classifiers.v1.txt +++ b/compiler/util-klib-abi/testData/content/classifiers.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: open annotation class classifiers.test/AnnotationClass : kotlin/Annotation { // classifiers.test/AnnotationClass|null[0] final val property // classifiers.test/AnnotationClass.property|4634558160746314112[0] final fun (): kotlin/String // classifiers.test/AnnotationClass.property.|4838831487146901942[0] diff --git a/compiler/util-klib-abi/testData/content/classifiers.v2.txt b/compiler/util-klib-abi/testData/content/classifiers.v2.txt index d480ddf8862..5f5afd2884b 100644 --- a/compiler/util-klib-abi/testData/content/classifiers.v2.txt +++ b/compiler/util-klib-abi/testData/content/classifiers.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: open annotation class classifiers.test/AnnotationClass : kotlin/Annotation { // classifiers.test/AnnotationClass|null[0] final val property // classifiers.test/AnnotationClass.property|{}property[0] final fun (): kotlin/String // classifiers.test/AnnotationClass.property.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.kt b/compiler/util-klib-abi/testData/content/excluded_classes_1.kt index 8ca9f49a291..dfce2220dd5 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_1.kt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_1.kt @@ -1,4 +1,5 @@ // EXCLUDED_CLASSES: one.two/Foo three.four/Bar five.six/Baz +// MODULE: excluded_classes_library package excluded_classes.test diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt b/compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt index 22c60177a48..0ea8ebdebab 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] constructor () // excluded_classes.test/Bar.|-5645683436151566731[0] final class Nested { // excluded_classes.test/Bar.Nested|null[0] diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt b/compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt index 0ef934f2658..7ff5e040bdf 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] constructor () // excluded_classes.test/Bar.|(){}[0] final class Nested { // excluded_classes.test/Bar.Nested|null[0] diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.kt b/compiler/util-klib-abi/testData/content/excluded_classes_2.kt index f0a34b7a3fa..b9a8e455f92 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_2.kt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_2.kt @@ -1,4 +1,5 @@ // EXCLUDED_CLASSES: one.two/Foo three.four/Bar excluded_classes.test/Foo excluded_classes.test/Bar.Nested excluded_classes.test/Baz.Nested.Nested five.six/Baz +// MODULE: excluded_classes_library package excluded_classes.test diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt b/compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt index 6445b17b16c..108905c7c89 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] constructor () // excluded_classes.test/Bar.|-5645683436151566731[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt b/compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt index 0f277337006..4b76ac42176 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] constructor () // excluded_classes.test/Bar.|(){}[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.kt b/compiler/util-klib-abi/testData/content/excluded_classes_3.kt index 2e51fe2a1fe..4daed02f538 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_3.kt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_3.kt @@ -1,4 +1,5 @@ // EXCLUDED_CLASSES: one.two/Foo three.four/Bar /Foo /Bar.Nested /Baz.Nested.Nested five.six/Baz +// MODULE: excluded_classes_library class Foo { class Nested { diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt b/compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt index 71d1681dff4..e938eb6ee5f 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class /Bar { // /Bar|null[0] constructor () // /Bar.|-5645683436151566731[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt b/compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt index cd59409a376..56ab2864b26 100644 --- a/compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class /Bar { // /Bar|null[0] constructor () // /Bar.|(){}[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.kt b/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.kt deleted file mode 100644 index 02a42ab9497..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.kt +++ /dev/null @@ -1,19 +0,0 @@ -// EXCLUDED_CLASSES: - -package excluded_classes.test - -class Foo { - class Nested { - class Nested - } -} -class Bar { - class Nested { - class Nested - } -} -class Baz { - class Nested { - class Nested - } -} \ No newline at end of file diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v1.txt b/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v1.txt deleted file mode 100644 index a6c4fdfe0d7..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v1.txt +++ /dev/null @@ -1,33 +0,0 @@ -// Rendering settings: -// - Signature version: 1 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] - constructor () // excluded_classes.test/Bar.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Bar.Nested|null[0] - constructor () // excluded_classes.test/Bar.Nested.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Bar.Nested.Nested|null[0] - constructor () // excluded_classes.test/Bar.Nested.Nested.|-5645683436151566731[0] - } - } -} -final class excluded_classes.test/Baz { // excluded_classes.test/Baz|null[0] - constructor () // excluded_classes.test/Baz.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Baz.Nested|null[0] - constructor () // excluded_classes.test/Baz.Nested.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Baz.Nested.Nested|null[0] - constructor () // excluded_classes.test/Baz.Nested.Nested.|-5645683436151566731[0] - } - } -} -final class excluded_classes.test/Foo { // excluded_classes.test/Foo|null[0] - constructor () // excluded_classes.test/Foo.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Foo.Nested|null[0] - constructor () // excluded_classes.test/Foo.Nested.|-5645683436151566731[0] - final class Nested { // excluded_classes.test/Foo.Nested.Nested|null[0] - constructor () // excluded_classes.test/Foo.Nested.Nested.|-5645683436151566731[0] - } - } -} diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v2.txt b/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v2.txt deleted file mode 100644 index a05b9f7d15d..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_classes_unspecified.v2.txt +++ /dev/null @@ -1,33 +0,0 @@ -// Rendering settings: -// - Signature version: 2 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final class excluded_classes.test/Bar { // excluded_classes.test/Bar|null[0] - constructor () // excluded_classes.test/Bar.|(){}[0] - final class Nested { // excluded_classes.test/Bar.Nested|null[0] - constructor () // excluded_classes.test/Bar.Nested.|(){}[0] - final class Nested { // excluded_classes.test/Bar.Nested.Nested|null[0] - constructor () // excluded_classes.test/Bar.Nested.Nested.|(){}[0] - } - } -} -final class excluded_classes.test/Baz { // excluded_classes.test/Baz|null[0] - constructor () // excluded_classes.test/Baz.|(){}[0] - final class Nested { // excluded_classes.test/Baz.Nested|null[0] - constructor () // excluded_classes.test/Baz.Nested.|(){}[0] - final class Nested { // excluded_classes.test/Baz.Nested.Nested|null[0] - constructor () // excluded_classes.test/Baz.Nested.Nested.|(){}[0] - } - } -} -final class excluded_classes.test/Foo { // excluded_classes.test/Foo|null[0] - constructor () // excluded_classes.test/Foo.|(){}[0] - final class Nested { // excluded_classes.test/Foo.Nested|null[0] - constructor () // excluded_classes.test/Foo.Nested.|(){}[0] - final class Nested { // excluded_classes.test/Foo.Nested.Nested|null[0] - constructor () // excluded_classes.test/Foo.Nested.Nested.|(){}[0] - } - } -} diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt index 64f5f29e457..53fff13a59e 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four excluded_packages.test five.six +// MODULE: excluded_packages_library package excluded_packages.test diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt index b15894b91d9..56756971d8f 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt index cf74f29b45b..0a693e24ffd 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt index be96f0ef667..287a4d83902 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four excluded_packages five.six +// MODULE: excluded_packages_library package excluded_packages.test diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt index 73174cca372..56756971d8f 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt index 12c4c5d5210..0a693e24ffd 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt index 23d4a80fe4e..47aceafdddd 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four excluded_packages_ five.six +// MODULE: excluded_packages_library package excluded_packages.test diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt index b20aa743acd..3316fca5f84 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_packages.test/Class { // excluded_packages.test/Class|null[0] constructor () // excluded_packages.test/Class.|-5645683436151566731[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt index 3e009a201aa..0db938b7177 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_packages.test/Class { // excluded_packages.test/Class|null[0] constructor () // excluded_packages.test/Class.|(){}[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt index fb8866c9ced..58ce911f37a 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four excluded_packages_non_root_ five.six +// MODULE: excluded_packages_library package excluded_packages.test diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt index ffef0a41a83..3316fca5f84 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_packages.test/Class { // excluded_packages.test/Class|null[0] constructor () // excluded_packages.test/Class.|-5645683436151566731[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt index 61f6fab431a..0db938b7177 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class excluded_packages.test/Class { // excluded_packages.test/Class|null[0] constructor () // excluded_packages.test/Class.|(){}[0] } diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt index fca00175a32..d7ba4531a90 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four "" five.six +// MODULE: excluded_packages_library class Class fun function(): String = "" diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt index c303799d63b..56756971d8f 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt index 281873f4813..0a693e24ffd 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt index a89ff43a371..c582af882fa 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt @@ -1,4 +1,5 @@ // EXCLUDED_PACKAGES: one.two three.four "" five.six +// MODULE: excluded_packages_library package excluded_packages.test diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt index a185aadbad4..56756971d8f 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt index ac9e03e6d5c..0a693e24ffd 100644 --- a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt +++ b/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt @@ -3,4 +3,4 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.kt b/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.kt deleted file mode 100644 index 4cc9a16fa78..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.kt +++ /dev/null @@ -1,5 +0,0 @@ -// EXCLUDED_PACKAGES: - -class Class -fun function(): String = "" -val property: String get() = "" diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v1.txt b/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v1.txt deleted file mode 100644 index 5a57596593b..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v1.txt +++ /dev/null @@ -1,12 +0,0 @@ -// Rendering settings: -// - Signature version: 1 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final class /Class { // /Class|null[0] - constructor () // /Class.|-5645683436151566731[0] -} -final val /property // /property|4634558160746314112[0] - final fun (): kotlin/String // /property.|4838831487146901942[0] -final fun /function(): kotlin/String // /function|-3322893411126713785[0] diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v2.txt b/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v2.txt deleted file mode 100644 index 1c1341e2f18..00000000000 --- a/compiler/util-klib-abi/testData/content/excluded_packages_unspecified.v2.txt +++ /dev/null @@ -1,12 +0,0 @@ -// Rendering settings: -// - Signature version: 2 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final class /Class { // /Class|null[0] - constructor () // /Class.|(){}[0] -} -final val /property // /property|{}property[0] - final fun (): kotlin/String // /property.|(){}[0] -final fun /function(): kotlin/String // /function|function(){}[0] diff --git a/compiler/util-klib-abi/testData/content/inheritance.kt b/compiler/util-klib-abi/testData/content/inheritance.kt index 34da367c153..83dd348d862 100644 --- a/compiler/util-klib-abi/testData/content/inheritance.kt +++ b/compiler/util-klib-abi/testData/content/inheritance.kt @@ -1,3 +1,5 @@ +// MODULE: classifiers_inheritance_library + package classifiers.inheritance final class FinalClass { diff --git a/compiler/util-klib-abi/testData/content/inheritance.v1.txt b/compiler/util-klib-abi/testData/content/inheritance.v1.txt index f73dfd9c3d0..d7c496e98ef 100644 --- a/compiler/util-klib-abi/testData/content/inheritance.v1.txt +++ b/compiler/util-klib-abi/testData/content/inheritance.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: abstract class classifiers.inheritance/AbstractClass { // classifiers.inheritance/AbstractClass|null[0] abstract val abstractVal // classifiers.inheritance/AbstractClass.abstractVal|2000751617811374017[0] abstract fun (): kotlin/String // classifiers.inheritance/AbstractClass.abstractVal.|-836793625462255519[0] diff --git a/compiler/util-klib-abi/testData/content/inheritance.v2.txt b/compiler/util-klib-abi/testData/content/inheritance.v2.txt index f7e51f1d42f..277218ab442 100644 --- a/compiler/util-klib-abi/testData/content/inheritance.v2.txt +++ b/compiler/util-klib-abi/testData/content/inheritance.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: abstract class classifiers.inheritance/AbstractClass { // classifiers.inheritance/AbstractClass|null[0] abstract val abstractVal // classifiers.inheritance/AbstractClass.abstractVal|{}abstractVal[0] abstract fun (): kotlin/String // classifiers.inheritance/AbstractClass.abstractVal.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/root_package.kt b/compiler/util-klib-abi/testData/content/root_package.kt index 804b47f62e6..e06c7f4a0db 100644 --- a/compiler/util-klib-abi/testData/content/root_package.kt +++ b/compiler/util-klib-abi/testData/content/root_package.kt @@ -1,4 +1,7 @@ -// Check how declarations from the root package are rendered. +// MODULE: root_package_library + +// About this test: +// It checks how declarations from the root package are rendered. interface Interface { interface NestedInterface diff --git a/compiler/util-klib-abi/testData/content/root_package.v1.txt b/compiler/util-klib-abi/testData/content/root_package.v1.txt index 11f71ce8acd..436b061570f 100644 --- a/compiler/util-klib-abi/testData/content/root_package.v1.txt +++ b/compiler/util-klib-abi/testData/content/root_package.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class /Class : /Interface, /Interface.NestedInterface { // /Class|null[0] final val property // /Class.property|4634558160746314112[0] final fun (): kotlin/String // /Class.property.|4838831487146901942[0] diff --git a/compiler/util-klib-abi/testData/content/root_package.v2.txt b/compiler/util-klib-abi/testData/content/root_package.v2.txt index 8e4e14c67bb..71d37067124 100644 --- a/compiler/util-klib-abi/testData/content/root_package.v2.txt +++ b/compiler/util-klib-abi/testData/content/root_package.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class /Class : /Interface, /Interface.NestedInterface { // /Class|null[0] final val property // /Class.property|{}property[0] final fun (): kotlin/String // /Class.property.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/type_parameters.kt b/compiler/util-klib-abi/testData/content/type_parameters.kt index a7568858a32..13d926f67ed 100644 --- a/compiler/util-klib-abi/testData/content/type_parameters.kt +++ b/compiler/util-klib-abi/testData/content/type_parameters.kt @@ -1,3 +1,6 @@ +// !LANGUAGE: +ContextReceivers +// MODULE: type_parameters_library + package type_parameters.test interface Interface diff --git a/compiler/util-klib-abi/testData/content/type_parameters.v1.txt b/compiler/util-klib-abi/testData/content/type_parameters.v1.txt index d33149ea51d..bb9a5cb6875 100644 --- a/compiler/util-klib-abi/testData/content/type_parameters.v1.txt +++ b/compiler/util-klib-abi/testData/content/type_parameters.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: abstract interface <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> type_parameters.test/Interface // type_parameters.test/Interface|null[0] final class <#A: kotlin.text/Appendable> type_parameters.test/Outer { // type_parameters.test/Outer|null[0] final var property // type_parameters.test/Outer.property|4489440291872326119[0] diff --git a/compiler/util-klib-abi/testData/content/type_parameters.v2.txt b/compiler/util-klib-abi/testData/content/type_parameters.v2.txt index 9939f329dc7..e379f14cc6b 100644 --- a/compiler/util-klib-abi/testData/content/type_parameters.v2.txt +++ b/compiler/util-klib-abi/testData/content/type_parameters.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: abstract interface <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> type_parameters.test/Interface // type_parameters.test/Interface|null[0] final class <#A: kotlin.text/Appendable> type_parameters.test/Outer { // type_parameters.test/Outer|null[0] final var property // type_parameters.test/Outer.property|@1:0{}property[0] diff --git a/compiler/util-klib-abi/testData/content/value_parameters.kt b/compiler/util-klib-abi/testData/content/value_parameters.kt index 16806d62c5a..bd450b5c0e2 100644 --- a/compiler/util-klib-abi/testData/content/value_parameters.kt +++ b/compiler/util-klib-abi/testData/content/value_parameters.kt @@ -1,3 +1,6 @@ +// !LANGUAGE: +ContextReceivers +// MODULE: value_parameters_library + package value_parameters.test inline fun funWithInlineParameters1( diff --git a/compiler/util-klib-abi/testData/content/value_parameters.v1.txt b/compiler/util-klib-abi/testData/content/value_parameters.v1.txt index 5b073934ee2..3b0ead19522 100644 --- a/compiler/util-klib-abi/testData/content/value_parameters.v1.txt +++ b/compiler/util-klib-abi/testData/content/value_parameters.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final fun value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|-2013334893880470152[0] final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|-1283395221811731897[0] final inline fun value_parameters.test/funWithInlineParameters1(kotlin/Function1, noinline kotlin/Function1, crossinline kotlin/Function1): kotlin/String // value_parameters.test/funWithInlineParameters1|8789385144825475619[0] diff --git a/compiler/util-klib-abi/testData/content/value_parameters.v2.txt b/compiler/util-klib-abi/testData/content/value_parameters.v2.txt index 32646c92145..8a0713447d0 100644 --- a/compiler/util-klib-abi/testData/content/value_parameters.v2.txt +++ b/compiler/util-klib-abi/testData/content/value_parameters.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final fun value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs(kotlin.Int;kotlin.Long;kotlin.String){}[0] final fun context(kotlin/Int, kotlin/Long) value_parameters.test/funWithDefaultArgs(kotlin/Int =..., kotlin/Long, kotlin/String =...): kotlin/String // value_parameters.test/funWithDefaultArgs|funWithDefaultArgs!kotlin.Int!kotlin.Long(kotlin.Int;kotlin.Long;kotlin.String){}[0] final inline fun value_parameters.test/funWithInlineParameters1(kotlin/Function1, noinline kotlin/Function1, crossinline kotlin/Function1): kotlin/String // value_parameters.test/funWithInlineParameters1|funWithInlineParameters1(kotlin.Function1;kotlin.Function1;kotlin.Function1){}[0] diff --git a/compiler/util-klib-abi/testData/content/visibilities.kt b/compiler/util-klib-abi/testData/content/visibilities.kt index 3b3a418a838..0aa018d5793 100644 --- a/compiler/util-klib-abi/testData/content/visibilities.kt +++ b/compiler/util-klib-abi/testData/content/visibilities.kt @@ -1,3 +1,5 @@ +// MODULE: visibilities_library + package visibilities.test public fun publicFun(): String = "" diff --git a/compiler/util-klib-abi/testData/content/visibilities.v1.txt b/compiler/util-klib-abi/testData/content/visibilities.v1.txt index d0fb6f88ec3..625872ed6c1 100644 --- a/compiler/util-klib-abi/testData/content/visibilities.v1.txt +++ b/compiler/util-klib-abi/testData/content/visibilities.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class visibilities.test/InternalPAClass { // visibilities.test/InternalPAClass|null[0] final val property // visibilities.test/InternalPAClass.property|4634558160746314112[0] final fun (): kotlin/String // visibilities.test/InternalPAClass.property.|4838831487146901942[0] diff --git a/compiler/util-klib-abi/testData/content/visibilities.v2.txt b/compiler/util-klib-abi/testData/content/visibilities.v2.txt index ca3e0286ed5..7ff0fc5a3f5 100644 --- a/compiler/util-klib-abi/testData/content/visibilities.v2.txt +++ b/compiler/util-klib-abi/testData/content/visibilities.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final class visibilities.test/InternalPAClass { // visibilities.test/InternalPAClass|null[0] final val property // visibilities.test/InternalPAClass.property|{}property[0] final fun (): kotlin/String // visibilities.test/InternalPAClass.property.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt index a2248aab9b9..6abef3e945c 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: one.two/Three.Four five.six/Seven.Eight nine.ten/Eleven.Twelve +// MODULE: with_non_public_markers_library annotation class Foo annotation class Bar diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt index fa9fb425b76..e466227e60f 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|-5645683436151566731[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt index f98a29f5478..c44f4ea3fee 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt index debcc28fd21..8f00177ceca 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: one.two/Three.Four five.six/Seven.Eight /Foo nine.ten/Eleven.Twelve +// MODULE: with_non_public_markers_library annotation class Foo annotation class Bar diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt index 00fd2416fa0..e664131690e 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|-5645683436151566731[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt index 70624da86ca..176687b96e3 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt index 9d97b050892..240396424d8 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: one.two/Three.Four five.six/Seven.Eight /Foo /Another.Bar nine.ten/Eleven.Twelve +// MODULE: with_non_public_markers_library annotation class Foo annotation class Bar diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt index 1c978a5ab6e..dd2799cb377 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|-5645683436151566731[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt index 4143be3b13a..f878ca535f0 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object /Another { // /Another|null[0] open annotation class Bar : kotlin/Annotation { // /Another.Bar|null[0] constructor () // /Another.Bar.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt index 85e96370196..761308e24ac 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: one.two/Three.Four five.six/Seven.Eight non_public_markers.test/Foo nine.ten/Eleven.Twelve +// MODULE: with_non_public_markers_library package non_public_markers.test diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt index ab2810c23de..9303c09bec7 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] constructor () // non_public_markers.test/Another.Bar.|-5645683436151566731[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt index 4d2f5dd1228..0ad2890c0a4 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] constructor () // non_public_markers.test/Another.Bar.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt index d59bce45121..4b63820b39a 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: one.two/Three.Four five.six/Seven.Eight non_public_markers.test/Foo non_public_markers.test/Another.Bar nine.ten/Eleven.Twelve +// MODULE: with_non_public_markers_library package non_public_markers.test diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt index 556e71f1080..5f2576b9673 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] constructor () // non_public_markers.test/Another.Bar.|-5645683436151566731[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt index 86807edec47..eac1da9b2cb 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] constructor () // non_public_markers.test/Another.Bar.|(){}[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt index d264ea25556..f7643904ae0 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt @@ -1,4 +1,5 @@ // NON_PUBLIC_MARKERS: /PublicAnnotation /InternalAnnotation /PrivateAnnotation /PublicContainer.PublicAnnotation /PublicContainer.InternalAnnotation /InternalContainer.PublicAnnotation /InternalContainer.InternalAnnotation /PrivateContainer.PublicAnnotation /PrivateContainer.InternalAnnotation +// MODULE: with_non_public_markers_library annotation class PublicAnnotation internal annotation class InternalAnnotation diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt index 5c5c3854491..943b012aacb 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: open annotation class /PublicAnnotation : kotlin/Annotation { // /PublicAnnotation|null[0] constructor () // /PublicAnnotation.|-5645683436151566731[0] } diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt index 61b4cf54662..87e1cbb38d5 100644 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt +++ b/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt @@ -3,7 +3,7 @@ // - Show manifest properties: false // - Show declarations: true -// Library unique name: +// Library unique name: open annotation class /PublicAnnotation : kotlin/Annotation { // /PublicAnnotation|null[0] constructor () // /PublicAnnotation.|(){}[0] } diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.kt b/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.kt deleted file mode 100644 index 20a3694e0cd..00000000000 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.kt +++ /dev/null @@ -1,118 +0,0 @@ -// NON_PUBLIC_MARKERS: - -package non_public_markers.test - -annotation class Foo -annotation class Bar - -object Another { - annotation class Foo - annotation class Bar -} - -class NonMarkedClass { - class NonMarkedClass { - class NonMarkedClass - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar - } - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar -} -@Foo class ClassMarkedWithFoo { - class NonMarkedClass { - class NonMarkedClass - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar - } - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar -} -@Bar class ClassMarkedWithAnotherFoo { - class NonMarkedClass { - class NonMarkedClass - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar - } - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar -} -@Another.Foo class ClassMarkedWithBar { - class NonMarkedClass { - class NonMarkedClass - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar - } - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar -} -@Another.Bar class ClassMarkedWithAnotherBar { - class NonMarkedClass { - class NonMarkedClass - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar - } - @Foo class ClassMarkedWithFoo - @Bar class ClassMarkedWithAnotherFoo - @Another.Foo class ClassMarkedWithBar - @Another.Bar class ClassMarkedWithAnotherBar -} - -class ClassWithConstructorMarkedWithFoo @Foo constructor() -class ClassWithConstructorMarkedWithAnotherFoo @Another.Foo constructor() -class ClassWithConstructorMarkedWithBar @Bar constructor() -class ClassWithConstructorMarkedWithAnotherBar @Another.Bar constructor() - -fun nonMarkedFunction(): String = "" -@Foo fun functionMarkedWithFoo(): String = "" -@Bar fun functionMarkedWithAnotherFoo(): String = "" -@Another.Foo fun functionMarkedWithBar(): String = "" -@Another.Bar fun functionMarkedWithAnotherBar(): String = "" - -var nonMarkedProperty: String get() = "" - set(_) = Unit - -@Foo var propertyWholeMarkedWithFoo: String get() = "" - set(_) = Unit -@Another.Foo var propertyWholeMarkedWithAnotherFoo: String get() = "" - set(_) = Unit -@Bar var propertyWholeMarkedWithBar: String get() = "" - set(_) = Unit -@Another.Bar var propertyWholeMarkedWithAnotherBar: String get() = "" - set(_) = Unit - -var propertyGetterMarkedWithFoo: String @Foo get() = "" - set(_) = Unit -var propertyGetterMarkedWithAnotherFoo: String @Another.Foo get() = "" - set(_) = Unit -var propertyGetterMarkedWithBar: String @Bar get() = "" - set(_) = Unit -var propertyGetterMarkedWithAnotherBar: String @Another.Bar get() = "" - set(_) = Unit - -var propertySetterMarkedWithFoo: String get() = "" - @Foo set(_) = Unit -var propertySetterMarkedWithAnotherFoo: String get() = "" - @Another.Foo set(_) = Unit -var propertySetterMarkedWithBar: String get() = "" - @Bar set(_) = Unit -var propertySetterMarkedWithAnotherBar: String get() = "" - @Another.Bar set(_) = Unit diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v1.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v1.txt deleted file mode 100644 index 84a894e22c8..00000000000 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v1.txt +++ /dev/null @@ -1,241 +0,0 @@ -// Rendering settings: -// - Signature version: 1 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] - open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] - constructor () // non_public_markers.test/Another.Bar.|-5645683436151566731[0] - } - open annotation class Foo : kotlin/Annotation { // non_public_markers.test/Another.Foo|null[0] - constructor () // non_public_markers.test/Another.Foo.|-5645683436151566731[0] - } -} -open annotation class non_public_markers.test/Bar : kotlin/Annotation { // non_public_markers.test/Bar|null[0] - constructor () // non_public_markers.test/Bar.|-5645683436151566731[0] -} -final class non_public_markers.test/ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - } - } -} -final class non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar { // non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar.|-5645683436151566731[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo { // non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo.|-5645683436151566731[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithBar { // non_public_markers.test/ClassWithConstructorMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithBar.|-5645683436151566731[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithFoo { // non_public_markers.test/ClassWithConstructorMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithFoo.|-5645683436151566731[0] -} -open annotation class non_public_markers.test/Foo : kotlin/Annotation { // non_public_markers.test/Foo|null[0] - constructor () // non_public_markers.test/Foo.|-5645683436151566731[0] -} -final class non_public_markers.test/NonMarkedClass { // non_public_markers.test/NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherBar.|-5645683436151566731[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherFoo.|-5645683436151566731[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithBar.|-5645683436151566731[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithFoo.|-5645683436151566731[0] - } - final class NonMarkedClass { // non_public_markers.test/NonMarkedClass.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.NonMarkedClass.|-5645683436151566731[0] - } - } -} -final var non_public_markers.test/nonMarkedProperty // non_public_markers.test/nonMarkedProperty|2555039021383536112[0] - final fun (): kotlin/String // non_public_markers.test/nonMarkedProperty.|3521952790317234139[0] - final fun (kotlin/String) // non_public_markers.test/nonMarkedProperty.|-1967656686156177486[0] -final var non_public_markers.test/propertyGetterMarkedWithAnotherBar // non_public_markers.test/propertyGetterMarkedWithAnotherBar|-8321084504405299502[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithAnotherBar.|7768138341638919361[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithAnotherBar.|1952287206559835979[0] -final var non_public_markers.test/propertyGetterMarkedWithAnotherFoo // non_public_markers.test/propertyGetterMarkedWithAnotherFoo|839569568647204104[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithAnotherFoo.|1487266266209481670[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithAnotherFoo.|-8358141007331692807[0] -final var non_public_markers.test/propertyGetterMarkedWithBar // non_public_markers.test/propertyGetterMarkedWithBar|-1638684334333087309[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithBar.|6425367069051405147[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithBar.|-7277763711448582747[0] -final var non_public_markers.test/propertyGetterMarkedWithFoo // non_public_markers.test/propertyGetterMarkedWithFoo|-1600129117215170169[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithFoo.|7715429316947815497[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithFoo.|6101825374130458315[0] -final var non_public_markers.test/propertySetterMarkedWithAnotherBar // non_public_markers.test/propertySetterMarkedWithAnotherBar|5611678287610594662[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithAnotherBar.|-2853824538371026163[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithAnotherBar.|7757487364805814175[0] -final var non_public_markers.test/propertySetterMarkedWithAnotherFoo // non_public_markers.test/propertySetterMarkedWithAnotherFoo|-6739876303163327450[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithAnotherFoo.|6152184411550223957[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithAnotherFoo.|5641698148509098165[0] -final var non_public_markers.test/propertySetterMarkedWithBar // non_public_markers.test/propertySetterMarkedWithBar|-1734653558734028189[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithBar.|8631669627377921573[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithBar.|7103802845088436414[0] -final var non_public_markers.test/propertySetterMarkedWithFoo // non_public_markers.test/propertySetterMarkedWithFoo|1014214022435246726[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithFoo.|-717220786783485579[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithFoo.|-5398085748280780705[0] -final var non_public_markers.test/propertyWholeMarkedWithAnotherBar // non_public_markers.test/propertyWholeMarkedWithAnotherBar|9162962495777663780[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithAnotherBar.|-1161906039333473922[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithAnotherBar.|-4350706110481715922[0] -final var non_public_markers.test/propertyWholeMarkedWithAnotherFoo // non_public_markers.test/propertyWholeMarkedWithAnotherFoo|7767984100232675887[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithAnotherFoo.|7102392919901087513[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithAnotherFoo.|3373183467277540973[0] -final var non_public_markers.test/propertyWholeMarkedWithBar // non_public_markers.test/propertyWholeMarkedWithBar|-119318583651089964[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithBar.|5964037984201295529[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithBar.|-2146460773497366334[0] -final var non_public_markers.test/propertyWholeMarkedWithFoo // non_public_markers.test/propertyWholeMarkedWithFoo|1235853922868560214[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithFoo.|-8118247767275252666[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithFoo.|1985764616902292422[0] -final fun non_public_markers.test/functionMarkedWithAnotherBar(): kotlin/String // non_public_markers.test/functionMarkedWithAnotherBar|-2313438891947829111[0] -final fun non_public_markers.test/functionMarkedWithAnotherFoo(): kotlin/String // non_public_markers.test/functionMarkedWithAnotherFoo|-5357424157245366714[0] -final fun non_public_markers.test/functionMarkedWithBar(): kotlin/String // non_public_markers.test/functionMarkedWithBar|-4713248467320396269[0] -final fun non_public_markers.test/functionMarkedWithFoo(): kotlin/String // non_public_markers.test/functionMarkedWithFoo|5454702469127665692[0] -final fun non_public_markers.test/nonMarkedFunction(): kotlin/String // non_public_markers.test/nonMarkedFunction|463145417007613104[0] diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v2.txt b/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v2.txt deleted file mode 100644 index 87d266b4b9f..00000000000 --- a/compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.v2.txt +++ /dev/null @@ -1,241 +0,0 @@ -// Rendering settings: -// - Signature version: 2 -// - Show manifest properties: false -// - Show declarations: true - -// Library unique name: -final object non_public_markers.test/Another { // non_public_markers.test/Another|null[0] - open annotation class Bar : kotlin/Annotation { // non_public_markers.test/Another.Bar|null[0] - constructor () // non_public_markers.test/Another.Bar.|(){}[0] - } - open annotation class Foo : kotlin/Annotation { // non_public_markers.test/Another.Foo|null[0] - constructor () // non_public_markers.test/Another.Foo.|(){}[0] - } -} -open annotation class non_public_markers.test/Bar : kotlin/Annotation { // non_public_markers.test/Bar|null[0] - constructor () // non_public_markers.test/Bar.|(){}[0] -} -final class non_public_markers.test/ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherBar.NonMarkedClass.NonMarkedClass.|(){}[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithAnotherFoo.NonMarkedClass.NonMarkedClass.|(){}[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithBar.NonMarkedClass.NonMarkedClass.|(){}[0] - } - } -} -final class non_public_markers.test/ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/ClassMarkedWithFoo.NonMarkedClass.NonMarkedClass.|(){}[0] - } - } -} -final class non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar { // non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithAnotherBar.|(){}[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo { // non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithAnotherFoo.|(){}[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithBar { // non_public_markers.test/ClassWithConstructorMarkedWithBar|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithBar.|(){}[0] -} -final class non_public_markers.test/ClassWithConstructorMarkedWithFoo { // non_public_markers.test/ClassWithConstructorMarkedWithFoo|null[0] - constructor () // non_public_markers.test/ClassWithConstructorMarkedWithFoo.|(){}[0] -} -open annotation class non_public_markers.test/Foo : kotlin/Annotation { // non_public_markers.test/Foo|null[0] - constructor () // non_public_markers.test/Foo.|(){}[0] -} -final class non_public_markers.test/NonMarkedClass { // non_public_markers.test/NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.|(){}[0] - final class ClassMarkedWithAnotherBar { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherBar.|(){}[0] - } - final class ClassMarkedWithAnotherFoo { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithAnotherFoo.|(){}[0] - } - final class ClassMarkedWithBar { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithBar|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithBar.|(){}[0] - } - final class ClassMarkedWithFoo { // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithFoo|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.ClassMarkedWithFoo.|(){}[0] - } - final class NonMarkedClass { // non_public_markers.test/NonMarkedClass.NonMarkedClass.NonMarkedClass|null[0] - constructor () // non_public_markers.test/NonMarkedClass.NonMarkedClass.NonMarkedClass.|(){}[0] - } - } -} -final var non_public_markers.test/nonMarkedProperty // non_public_markers.test/nonMarkedProperty|{}nonMarkedProperty[0] - final fun (): kotlin/String // non_public_markers.test/nonMarkedProperty.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/nonMarkedProperty.|(kotlin.String){}[0] -final var non_public_markers.test/propertyGetterMarkedWithAnotherBar // non_public_markers.test/propertyGetterMarkedWithAnotherBar|{}propertyGetterMarkedWithAnotherBar[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithAnotherBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithAnotherBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertyGetterMarkedWithAnotherFoo // non_public_markers.test/propertyGetterMarkedWithAnotherFoo|{}propertyGetterMarkedWithAnotherFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithAnotherFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithAnotherFoo.|(kotlin.String){}[0] -final var non_public_markers.test/propertyGetterMarkedWithBar // non_public_markers.test/propertyGetterMarkedWithBar|{}propertyGetterMarkedWithBar[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertyGetterMarkedWithFoo // non_public_markers.test/propertyGetterMarkedWithFoo|{}propertyGetterMarkedWithFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertyGetterMarkedWithFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyGetterMarkedWithFoo.|(kotlin.String){}[0] -final var non_public_markers.test/propertySetterMarkedWithAnotherBar // non_public_markers.test/propertySetterMarkedWithAnotherBar|{}propertySetterMarkedWithAnotherBar[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithAnotherBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithAnotherBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertySetterMarkedWithAnotherFoo // non_public_markers.test/propertySetterMarkedWithAnotherFoo|{}propertySetterMarkedWithAnotherFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithAnotherFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithAnotherFoo.|(kotlin.String){}[0] -final var non_public_markers.test/propertySetterMarkedWithBar // non_public_markers.test/propertySetterMarkedWithBar|{}propertySetterMarkedWithBar[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertySetterMarkedWithFoo // non_public_markers.test/propertySetterMarkedWithFoo|{}propertySetterMarkedWithFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertySetterMarkedWithFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertySetterMarkedWithFoo.|(kotlin.String){}[0] -final var non_public_markers.test/propertyWholeMarkedWithAnotherBar // non_public_markers.test/propertyWholeMarkedWithAnotherBar|{}propertyWholeMarkedWithAnotherBar[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithAnotherBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithAnotherBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertyWholeMarkedWithAnotherFoo // non_public_markers.test/propertyWholeMarkedWithAnotherFoo|{}propertyWholeMarkedWithAnotherFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithAnotherFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithAnotherFoo.|(kotlin.String){}[0] -final var non_public_markers.test/propertyWholeMarkedWithBar // non_public_markers.test/propertyWholeMarkedWithBar|{}propertyWholeMarkedWithBar[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithBar.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithBar.|(kotlin.String){}[0] -final var non_public_markers.test/propertyWholeMarkedWithFoo // non_public_markers.test/propertyWholeMarkedWithFoo|{}propertyWholeMarkedWithFoo[0] - final fun (): kotlin/String // non_public_markers.test/propertyWholeMarkedWithFoo.|(){}[0] - final fun (kotlin/String) // non_public_markers.test/propertyWholeMarkedWithFoo.|(kotlin.String){}[0] -final fun non_public_markers.test/functionMarkedWithAnotherBar(): kotlin/String // non_public_markers.test/functionMarkedWithAnotherBar|functionMarkedWithAnotherBar(){}[0] -final fun non_public_markers.test/functionMarkedWithAnotherFoo(): kotlin/String // non_public_markers.test/functionMarkedWithAnotherFoo|functionMarkedWithAnotherFoo(){}[0] -final fun non_public_markers.test/functionMarkedWithBar(): kotlin/String // non_public_markers.test/functionMarkedWithBar|functionMarkedWithBar(){}[0] -final fun non_public_markers.test/functionMarkedWithFoo(): kotlin/String // non_public_markers.test/functionMarkedWithFoo|functionMarkedWithFoo(){}[0] -final fun non_public_markers.test/nonMarkedFunction(): kotlin/String // non_public_markers.test/nonMarkedFunction|nonMarkedFunction(){}[0] diff --git a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java new file mode 100644 index 00000000000..5b2d36f2abc --- /dev/null +++ b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java @@ -0,0 +1,159 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.library.abi; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.library.abi.GenerateLibraryAbiReaderTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("compiler/util-klib-abi/testData/content") +@TestDataPath("$PROJECT_ROOT") +public class ClassicJsLibraryAbiReaderTestGenerated extends AbstractClassicJsLibraryAbiReaderTest { + @Test + public void testAllFilesPresentInContent() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @Test + @TestMetadata("callables.kt") + public void testCallables() throws Exception { + runTest("compiler/util-klib-abi/testData/content/callables.kt"); + } + + @Test + @TestMetadata("classifiers.kt") + public void testClassifiers() throws Exception { + runTest("compiler/util-klib-abi/testData/content/classifiers.kt"); + } + + @Test + @TestMetadata("excluded_classes_1.kt") + public void testExcluded_classes_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt"); + } + + @Test + @TestMetadata("excluded_classes_2.kt") + public void testExcluded_classes_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt"); + } + + @Test + @TestMetadata("excluded_classes_3.kt") + public void testExcluded_classes_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_1.kt") + public void testExcluded_packages_non_root_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_2.kt") + public void testExcluded_packages_non_root_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_3.kt") + public void testExcluded_packages_non_root_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_4.kt") + public void testExcluded_packages_non_root_4() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt"); + } + + @Test + @TestMetadata("excluded_packages_root_1.kt") + public void testExcluded_packages_root_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt"); + } + + @Test + @TestMetadata("excluded_packages_root_2.kt") + public void testExcluded_packages_root_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt"); + } + + @Test + @TestMetadata("inheritance.kt") + public void testInheritance() throws Exception { + runTest("compiler/util-klib-abi/testData/content/inheritance.kt"); + } + + @Test + @TestMetadata("root_package.kt") + public void testRoot_package() throws Exception { + runTest("compiler/util-klib-abi/testData/content/root_package.kt"); + } + + @Test + @TestMetadata("type_parameters.kt") + public void testType_parameters() throws Exception { + runTest("compiler/util-klib-abi/testData/content/type_parameters.kt"); + } + + @Test + @TestMetadata("value_parameters.kt") + public void testValue_parameters() throws Exception { + runTest("compiler/util-klib-abi/testData/content/value_parameters.kt"); + } + + @Test + @TestMetadata("visibilities.kt") + public void testVisibilities() throws Exception { + runTest("compiler/util-klib-abi/testData/content/visibilities.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_1.kt") + public void testWith_non_public_markers_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_2.kt") + public void testWith_non_public_markers_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_3.kt") + public void testWith_non_public_markers_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_4.kt") + public void testWith_non_public_markers_4() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_5.kt") + public void testWith_non_public_markers_5() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_private_annotations.kt") + public void testWith_non_public_markers_private_annotations() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt"); + } +} diff --git a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java new file mode 100644 index 00000000000..3685499f26f --- /dev/null +++ b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java @@ -0,0 +1,159 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.library.abi; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.library.abi.GenerateLibraryAbiReaderTestsKt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("compiler/util-klib-abi/testData/content") +@TestDataPath("$PROJECT_ROOT") +public class FirJsLibraryAbiReaderTestGenerated extends AbstractFirJsLibraryAbiReaderTest { + @Test + public void testAllFilesPresentInContent() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + } + + @Test + @TestMetadata("callables.kt") + public void testCallables() throws Exception { + runTest("compiler/util-klib-abi/testData/content/callables.kt"); + } + + @Test + @TestMetadata("classifiers.kt") + public void testClassifiers() throws Exception { + runTest("compiler/util-klib-abi/testData/content/classifiers.kt"); + } + + @Test + @TestMetadata("excluded_classes_1.kt") + public void testExcluded_classes_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt"); + } + + @Test + @TestMetadata("excluded_classes_2.kt") + public void testExcluded_classes_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt"); + } + + @Test + @TestMetadata("excluded_classes_3.kt") + public void testExcluded_classes_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_1.kt") + public void testExcluded_packages_non_root_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_2.kt") + public void testExcluded_packages_non_root_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_3.kt") + public void testExcluded_packages_non_root_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt"); + } + + @Test + @TestMetadata("excluded_packages_non_root_4.kt") + public void testExcluded_packages_non_root_4() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt"); + } + + @Test + @TestMetadata("excluded_packages_root_1.kt") + public void testExcluded_packages_root_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt"); + } + + @Test + @TestMetadata("excluded_packages_root_2.kt") + public void testExcluded_packages_root_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt"); + } + + @Test + @TestMetadata("inheritance.kt") + public void testInheritance() throws Exception { + runTest("compiler/util-klib-abi/testData/content/inheritance.kt"); + } + + @Test + @TestMetadata("root_package.kt") + public void testRoot_package() throws Exception { + runTest("compiler/util-klib-abi/testData/content/root_package.kt"); + } + + @Test + @TestMetadata("type_parameters.kt") + public void testType_parameters() throws Exception { + runTest("compiler/util-klib-abi/testData/content/type_parameters.kt"); + } + + @Test + @TestMetadata("value_parameters.kt") + public void testValue_parameters() throws Exception { + runTest("compiler/util-klib-abi/testData/content/value_parameters.kt"); + } + + @Test + @TestMetadata("visibilities.kt") + public void testVisibilities() throws Exception { + runTest("compiler/util-klib-abi/testData/content/visibilities.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_1.kt") + public void testWith_non_public_markers_1() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_2.kt") + public void testWith_non_public_markers_2() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_3.kt") + public void testWith_non_public_markers_3() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_4.kt") + public void testWith_non_public_markers_4() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_5.kt") + public void testWith_non_public_markers_5() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt"); + } + + @Test + @TestMetadata("with_non_public_markers_private_annotations.kt") + public void testWith_non_public_markers_private_annotations() throws Exception { + runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt"); + } +} diff --git a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/LibraryAbiReaderTest.java b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/OldLibraryAbiReaderTest.java similarity index 87% rename from compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/LibraryAbiReaderTest.java rename to compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/OldLibraryAbiReaderTest.java index 9bcdc7975f8..0ea7defca4f 100644 --- a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/LibraryAbiReaderTest.java +++ b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/OldLibraryAbiReaderTest.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/util-klib-abi/testData/content") @TestDataPath("$PROJECT_ROOT") -public class LibraryAbiReaderTest extends AbstractLibraryAbiReaderTest { +public class OldLibraryAbiReaderTest extends AbstractOldLibraryAbiReaderTest { @Test public void testAllFilesPresentInContent() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -54,12 +54,6 @@ public class LibraryAbiReaderTest extends AbstractLibraryAbiReaderTest { runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt"); } - @Test - @TestMetadata("excluded_classes_unspecified.kt") - public void testExcluded_classes_unspecified() throws Exception { - runTest("compiler/util-klib-abi/testData/content/excluded_classes_unspecified.kt"); - } - @Test @TestMetadata("excluded_packages_non_root_1.kt") public void testExcluded_packages_non_root_1() throws Exception { @@ -96,12 +90,6 @@ public class LibraryAbiReaderTest extends AbstractLibraryAbiReaderTest { runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt"); } - @Test - @TestMetadata("excluded_packages_unspecified.kt") - public void testExcluded_packages_unspecified() throws Exception { - runTest("compiler/util-klib-abi/testData/content/excluded_packages_unspecified.kt"); - } - @Test @TestMetadata("inheritance.kt") public void testInheritance() throws Exception { @@ -167,10 +155,4 @@ public class LibraryAbiReaderTest extends AbstractLibraryAbiReaderTest { public void testWith_non_public_markers_private_annotations() throws Exception { runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt"); } - - @Test - @TestMetadata("with_non_public_markers_unspecified.kt") - public void testWith_non_public_markers_unspecified() throws Exception { - runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_unspecified.kt"); - } }