diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..45cfa0f --- /dev/null +++ b/README.md @@ -0,0 +1,31 @@ +# Kotlin Compiler Plugin template + +This is a template project for writing a compiler plugin for the Kotlin compiler. + +## Details + +This project has three modules: +- The [`:compiler-plugin`](compiler-plugin/src) module contains the compiler plugin itself. +- The [`:plugin-annotations`](plugin-annotations/src/commonMain/kotlin) module contains annotations which can be used in +user code for interacting with compiler plugin. +- The [`:gradle-plugin`](gradle-plugin/src) module contains a simple Gradle plugin to add the compiler plugin and +annotation dependency to a Kotlin project. + +Extension point registration: +- K2 Frontend (FIR) extensions can be registered in `SimplePluginRegistrar`. +- All other extensions (including K1 frontend and backend) can be registered in `SimplePluginComponentRegistrar`. + +## Tests + +The [Kotlin compiler test framework][test-framework] is set up for this project. +To create a new test, add a new `.kt` file in a [compiler-plugin/testData](compiler-plugin/testData) sub-directory: +`testData/box` for codegen tests and `testData/diagnostics` for diagnostics tests. +The generated JUnit 5 test classes will be updated automatically when tests are next run. +They can be manually updated with the `generateTests` Gradle task as well. +To aid in running tests, it is recommended to install the [Kotlin Test Data Helper][test-plugin] IntelliJ plugin, +which is pre-configured in this repository. + +[//]: # (Links) + +[test-framework]: https://github.com/JetBrains/kotlin/blob/2.1.20/compiler/test-infrastructure/ReadMe.md +[test-plugin]: https://github.com/demiurg906/test-data-helper-plugin diff --git a/Readme.md b/Readme.md deleted file mode 100644 index fe5900f..0000000 --- a/Readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# Kotlin Compiler Plugin template - -This is a template project for compiler plugins for K2 Kotlin compiler - -## Details - -Project contains two modules: -- root module is a module for the compiler plugin itself -- `:plugin-annotations` module contains annotations which can be used in user code for interacting with compiler plugin - -Extension point registration: -- K2 Frontend (FIR) extensions can be registered in `SimplePluginRegistrar` -- All other extensions (including K1 frontend and backend) can be registered in `SimplePluginComponentRegistrar` - -## Tests - -Kotlin compiler test framework is set up for this project. To add a new test you need to put new `.kt` file in `testData` -directory (`testData/box` for codegen tests and `testData/diagnostics` for diagnostics tests) and run `:generateTests` -Gradle task. This task will update generated tests classes and generate new tests methods for added tests diff --git a/build.gradle.kts b/build.gradle.kts index 0a95f0c..c6e425d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,5 +7,5 @@ plugins { allprojects { group = "org.demiurg906.kotlin.plugin" - version = "0.1" + version = "0.1.0-SNAPSHOT" } diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts index 5b3721c..454c89e 100644 --- a/compiler-plugin/build.gradle.kts +++ b/compiler-plugin/build.gradle.kts @@ -61,6 +61,9 @@ tasks.test { setLibraryProperty("org.jetbrains.kotlin.test.kotlin-test", "kotlin-test") setLibraryProperty("org.jetbrains.kotlin.test.kotlin-script-runtime", "kotlin-script-runtime") setLibraryProperty("org.jetbrains.kotlin.test.kotlin-annotations-jvm", "kotlin-annotations-jvm") + + systemProperty("idea.ignore.disabled.plugins", "true") + systemProperty("idea.home.path", rootDir) } kotlin { diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt index 856c0cb..3cedc09 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt +++ b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt @@ -1,17 +1,17 @@ package org.demiurg906.kotlin.plugin import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 -import org.demiurg906.kotlin.plugin.runners.AbstractBoxTest -import org.demiurg906.kotlin.plugin.runners.AbstractDiagnosticTest +import org.demiurg906.kotlin.plugin.runners.AbstractJvmBoxTest +import org.demiurg906.kotlin.plugin.runners.AbstractJvmDiagnosticTest fun main() { generateTestGroupSuiteWithJUnit5 { testGroup(testDataRoot = "compiler-plugin/testData", testsRoot = "compiler-plugin/test-gen") { - testClass { + testClass { model("diagnostics") } - testClass { + testClass { model("box") } } diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractBoxTest.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractBoxTest.kt deleted file mode 100644 index 4bce2ae..0000000 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractBoxTest.kt +++ /dev/null @@ -1,63 +0,0 @@ -package org.demiurg906.kotlin.plugin.runners - -import org.jetbrains.kotlin.platform.jvm.JvmPlatforms -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.IrTextDumpHandler -import org.jetbrains.kotlin.test.backend.handlers.IrTreeVerifierHandler -import org.jetbrains.kotlin.test.backend.handlers.JvmBoxRunner -import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade -import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.builders.fir2IrStep -import org.jetbrains.kotlin.test.builders.irHandlersStep -import org.jetbrains.kotlin.test.builders.jvmArtifactsHandlersStep -import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_IR -import org.jetbrains.kotlin.test.directives.configureFirParser -import org.jetbrains.kotlin.test.model.DependencyKind -import org.jetbrains.kotlin.test.runners.RunnerWithTargetBackendForTestGeneratorMarker - -/* - * Containers of different directives, which can be used in tests: - * - ModuleStructureDirectives - * - LanguageSettingsDirectives - * - DiagnosticsDirectives - * - CodegenTestDirectives - * - * All of them are located in `org.jetbrains.kotlin.test.directives` package - */ -open class AbstractBoxTest : BaseTestRunner(), RunnerWithTargetBackendForTestGeneratorMarker { - override val targetBackend: TargetBackend - get() = TargetBackend.JVM_IR - - override fun configure(builder: TestConfigurationBuilder) { - with(builder) { - globalDefaults { - targetBackend = TargetBackend.JVM_IR - targetPlatform = JvmPlatforms.defaultJvmPlatform - dependencyKind = DependencyKind.Binary - } - - configureFirParser(FirParser.Psi) - - defaultDirectives { - +DUMP_IR - } - - commonFirWithPluginFrontendConfiguration() - fir2IrStep() - irHandlersStep { - useHandlers( - ::IrTextDumpHandler, - ::IrTreeVerifierHandler, - ) - } - facadeStep(::JvmIrBackendFacade) - jvmArtifactsHandlersStep { - useHandlers(::JvmBoxRunner) - } - - useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor) - } - } -} diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractDiagnosticTest.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractDiagnosticTest.kt deleted file mode 100644 index 6b8507b..0000000 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractDiagnosticTest.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.demiurg906.kotlin.plugin.runners - -import org.jetbrains.kotlin.test.FirParser -import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.directives.configureFirParser -import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider -import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider - -abstract class AbstractDiagnosticTest : BaseTestRunner() { - override fun configure(builder: TestConfigurationBuilder) { - with(builder) { - commonFirWithPluginFrontendConfiguration() - configureFirParser(FirParser.Psi) - } - } - - override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider { - return EnvironmentBasedStandardLibrariesPathProvider - } -} diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt new file mode 100644 index 0000000..fa15e7a --- /dev/null +++ b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt @@ -0,0 +1,48 @@ +package org.demiurg906.kotlin.plugin.runners + +import org.demiurg906.kotlin.plugin.services.ExtensionRegistrarConfigurator +import org.demiurg906.kotlin.plugin.services.PluginAnnotationsProvider +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.CodegenTestDirectives +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTestBase +import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider +import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider + +open class AbstractJvmBoxTest : AbstractFirBlackBoxCodegenTestBase(FirParser.LightTree) { + override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider { + return EnvironmentBasedStandardLibrariesPathProvider + } + + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + + with(builder) { + /* + * Containers of different directives, which can be used in tests: + * - ModuleStructureDirectives + * - LanguageSettingsDirectives + * - DiagnosticsDirectives + * - FirDiagnosticsDirectives + * - CodegenTestDirectives + * - JvmEnvironmentConfigurationDirectives + * + * All of them are located in `org.jetbrains.kotlin.test.directives` package + */ + defaultDirectives { + +CodegenTestDirectives.DUMP_IR + +FirDiagnosticsDirectives.FIR_DUMP + +JvmEnvironmentConfigurationDirectives.FULL_JDK + + +CodegenTestDirectives.IGNORE_DEXING // Avoids loading R8 from the classpath. + } + + useConfigurators( + ::PluginAnnotationsProvider, + ::ExtensionRegistrarConfigurator + ) + } + } +} diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt new file mode 100644 index 0000000..c520595 --- /dev/null +++ b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt @@ -0,0 +1,45 @@ +package org.demiurg906.kotlin.plugin.runners + +import org.demiurg906.kotlin.plugin.services.ExtensionRegistrarConfigurator +import org.demiurg906.kotlin.plugin.services.PluginAnnotationsProvider +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.CodegenTestDirectives +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives +import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest +import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider +import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider + +open class AbstractJvmDiagnosticTest : AbstractFirPhasedDiagnosticTest(FirParser.LightTree) { + override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider { + return EnvironmentBasedStandardLibrariesPathProvider + } + + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + + with(builder) { + /* + * Containers of different directives, which can be used in tests: + * - ModuleStructureDirectives + * - LanguageSettingsDirectives + * - DiagnosticsDirectives + * - FirDiagnosticsDirectives + * + * All of them are located in `org.jetbrains.kotlin.test.directives` package + */ + defaultDirectives { + +FirDiagnosticsDirectives.FIR_DUMP + +JvmEnvironmentConfigurationDirectives.FULL_JDK + + +CodegenTestDirectives.IGNORE_DEXING // Avoids loading R8 from the classpath. + } + + useConfigurators( + ::PluginAnnotationsProvider, + ::ExtensionRegistrarConfigurator + ) + } + } +} diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/BaseTestRunner.kt b/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/BaseTestRunner.kt deleted file mode 100644 index 8427ee2..0000000 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/BaseTestRunner.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.demiurg906.kotlin.plugin.runners - -import org.demiurg906.kotlin.plugin.services.ExtensionRegistrarConfigurator -import org.demiurg906.kotlin.plugin.services.PluginAnnotationsProvider -import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.configuration.baseFirDiagnosticTestConfiguration -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives -import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives -import org.jetbrains.kotlin.test.initIdeaConfiguration -import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest -import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider -import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider -import org.junit.jupiter.api.BeforeAll - -abstract class BaseTestRunner : AbstractKotlinCompilerTest() { - companion object { - @BeforeAll - @JvmStatic - fun setUp() { - initIdeaConfiguration() - } - } - - override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider { - return EnvironmentBasedStandardLibrariesPathProvider - } -} - -fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() { - baseFirDiagnosticTestConfiguration() - - defaultDirectives { - +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES - +FirDiagnosticsDirectives.FIR_DUMP - +JvmEnvironmentConfigurationDirectives.FULL_JDK - } - - useConfigurators( - ::PluginAnnotationsProvider, - ::ExtensionRegistrarConfigurator - ) -} diff --git a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/BoxTestGenerated.java b/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java similarity index 94% rename from compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/BoxTestGenerated.java rename to compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java index 8cf8cef..2cd1eae 100644 --- a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/BoxTestGenerated.java +++ b/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java @@ -15,7 +15,7 @@ @SuppressWarnings("all") @TestMetadata("compiler-plugin/testData/box") @TestDataPath("$PROJECT_ROOT") -public class BoxTestGenerated extends AbstractBoxTest { +public class JvmBoxTestGenerated extends AbstractJvmBoxTest { @Test public void testAllFilesPresentInBox() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/DiagnosticTestGenerated.java b/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java similarity index 84% rename from compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/DiagnosticTestGenerated.java rename to compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java index c704223..6661df8 100644 --- a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/DiagnosticTestGenerated.java +++ b/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java @@ -4,6 +4,7 @@ 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.Test; @@ -14,10 +15,10 @@ @SuppressWarnings("all") @TestMetadata("compiler-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class DiagnosticTestGenerated extends AbstractDiagnosticTest { +public class JvmDiagnosticTestGenerated extends AbstractJvmDiagnosticTest { @Test public void testAllFilesPresentInDiagnostics() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @Test diff --git a/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt b/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt index d54a1aa..2580fb4 100644 --- a/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt +++ b/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt @@ -6,7 +6,6 @@ FILE: foo.kt } public final fun test(): R|kotlin/Unit| { R|foo/takeInt|(Int(10)) - R|foo/takeInt#|(String(Hello)) } FILE: __GENERATED DECLARATIONS__.kt package foo.bar @@ -23,6 +22,7 @@ FILE: bar.kt public final fun test(): R|kotlin/Unit| { R|foo/takeInt|(Int(10)) + R|foo/takeInt#|(String(Hello)) } FILE: __GENERATED DECLARATIONS__.kt package foo.bar diff --git a/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt b/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt index e60a372..4e514ed 100644 --- a/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt +++ b/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt @@ -1,3 +1,5 @@ +// RUN_PIPELINE_TILL: FRONTEND + // MODULE: lib // FILE: foo.kt package foo @@ -6,7 +8,6 @@ fun takeInt(x: Int) {} fun test() { takeInt(10) - takeInt("Hello") } // MODULE: main(lib) @@ -17,4 +18,5 @@ import foo.takeInt fun test() { takeInt(10) + takeInt("Hello") } diff --git a/compiler-plugin/testData/diagnostics/simple.kt b/compiler-plugin/testData/diagnostics/simple.kt index cc16988..224ef5e 100644 --- a/compiler-plugin/testData/diagnostics/simple.kt +++ b/compiler-plugin/testData/diagnostics/simple.kt @@ -1,3 +1,5 @@ +// RUN_PIPELINE_TILL: FRONTEND + package foo.bar import org.demiurg906.kotlin.plugin.SomeAnnotation diff --git a/plugin-annotations/build.gradle.kts b/plugin-annotations/build.gradle.kts index 47fa290..3a82cd6 100644 --- a/plugin-annotations/build.gradle.kts +++ b/plugin-annotations/build.gradle.kts @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalWasmDsl::class) -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { kotlin("multiplatform")