From a47395fc288cb96ad1393a8a137b425b5540f4aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2026 07:36:28 +0000 Subject: [PATCH 1/2] build(deps): bump org.jetbrains.kotlin:kotlin-compiler-embeddable Bumps [org.jetbrains.kotlin:kotlin-compiler-embeddable](https://github.com/JetBrains/kotlin) from 2.3.20 to 2.4.21. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.20...v2.4.21) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-compiler-embeddable dependency-version: 2.4.21 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gen.kotlin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen.kotlin/build.gradle b/gen.kotlin/build.gradle index 0d1f88e90..a7eb995d7 100644 --- a/gen.kotlin/build.gradle +++ b/gen.kotlin/build.gradle @@ -7,7 +7,7 @@ description = 'GumTree tree generator for Kotlin using Kotlin PSI.' dependencies { implementation project(':core') - implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20' + implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable:2.4.21' testImplementation project(':gen.treesitter-ng') } From a572cc0936079a6b6c45e7026c1d8cadf58e4320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-R=C3=A9my=20Falleri?= Date: Wed, 14 Oct 2026 10:45:42 +0200 Subject: [PATCH 2/2] fix(gen.kotlin): register compiler extensions Initialize Kotlin compiler extension storage required by Kotlin 2.4 before creating the PSI environment. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../gumtreediff/gen/kotlin/KotlinPsiTreeGenerator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gen.kotlin/src/main/java/com/github/gumtreediff/gen/kotlin/KotlinPsiTreeGenerator.java b/gen.kotlin/src/main/java/com/github/gumtreediff/gen/kotlin/KotlinPsiTreeGenerator.java index f840483da..9193d59ac 100644 --- a/gen.kotlin/src/main/java/com/github/gumtreediff/gen/kotlin/KotlinPsiTreeGenerator.java +++ b/gen.kotlin/src/main/java/com/github/gumtreediff/gen/kotlin/KotlinPsiTreeGenerator.java @@ -26,6 +26,8 @@ import com.github.gumtreediff.utils.Registry; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.FrontendConfigurationKeysKt; +import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar; import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer; import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange; import org.jetbrains.kotlin.com.intellij.psi.PsiElement; @@ -57,8 +59,11 @@ protected TreeContext generate(Reader reader) throws IOException { var disposable = Disposer.newDisposable(); try { + CompilerConfiguration configuration = new CompilerConfiguration(); + FrontendConfigurationKeysKt.setExtensionsStorage( + configuration, new CompilerPluginRegistrar.ExtensionStorage()); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForProduction( - disposable, new CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES); + disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); PsiFile psiFile = PsiFileFactory.getInstance(environment.getProject()) .createFileFromText("file.kt", KotlinLanguage.INSTANCE, content.toString()); TreeContext context = new TreeContext();