Skip to content

fix(rider): Restore rd-gen model generation for both 2025.x and 2026.1#6337

Merged
branrin merged 1 commit intofeature/toolkitOnlyfrom
toolkitOnly-rider-fix
Apr 6, 2026
Merged

fix(rider): Restore rd-gen model generation for both 2025.x and 2026.1#6337
branrin merged 1 commit intofeature/toolkitOnlyfrom
toolkitOnly-rider-fix

Conversation

@branrin
Copy link
Copy Markdown
Contributor

@branrin branrin commented Apr 6, 2026

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Description

Commit 292181d removed hashFolder, classpath, and sources from the RdGenExtension config to accommodate rd-gen 2026.1 API changes, but this broke the 2025.x build and left 2026.1 model generation non-functional.

All the automated unit tests on Linux and Windows were failing with the message below

Execution failed for task ':plugin-toolkit:jetbrains-rider:compileKotlin'.
> A failure occurred while executing org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction
   > Compilation error. See log for more details

Fix
For pre-2026 profiles, restore the extension properties via reflection to avoid script compilation failures when the 2026.1 rd-gen jar is on the buildscript classpath.

For 2026.1+, add a compileModelSources task that pre-compiles model sources with an external Kotlin compiler, since rd-gen 2026.1 removed its built-in Kotlin compilation support.

Checklist

  • My code follows the code style of this project
  • I have added tests to cover my changes
  • A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
  • I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

Commit 292181d removed hashFolder, classpath, and sources from the
RdGenExtension config to accommodate rd-gen 2026.1 API changes, but
this broke the 2025.3 build and left 2026.1 model generation non-
functional.

For pre-2026 profiles, restore the extension properties via reflection
to avoid script compilation failures when the 2026.1 rd-gen jar is on
the buildscript classpath.

For 2026.1+, add a compileModelSources task that pre-compiles model
sources with an external Kotlin compiler, since rd-gen 2026.1 removed
its built-in Kotlin compilation support.
@branrin branrin requested a review from a team as a code owner April 6, 2026 20:10
@branrin branrin changed the title fix(rider): Restore rd-gen model generation for both 2025.3 and 2026.1 fix(rider): Restore rd-gen model generation for both 2025.x and 2026.1 Apr 6, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 6, 2026

Qodana for JVM

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

@branrin
Copy link
Copy Markdown
Contributor Author

branrin commented Apr 6, 2026

This fixed the compileKotlin issue in all of the Linux and Windows builds. Now, Windows 2025.1 and 2025.2 fully passed, while the others were a mix of failures for Execution failed for task ':plugin-toolkit:jetbrains-rider:detekt' and Execution failed for task ':plugin-toolkit:jetbrains-core:test'. with the failing tests being from CloudFormationServiceNodeTest, possibly related to commit 566a023 ("feat(cloudformation): add try new CloudFormation node to Explorer").

Merging this since it fixes the main issue and will continue to iterate on resolving everything

@branrin branrin merged commit 34aa041 into feature/toolkitOnly Apr 6, 2026
12 of 17 checks passed
@branrin branrin deleted the toolkitOnly-rider-fix branch April 6, 2026 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants