2026.1 upgrade (#1236)

Author: m0rkeulv

.github/workflows/build.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false # set this to true if you want to cancel all builds if one fails.
       matrix:
-        IDEA_VERSION: [2025.3]
+        IDEA_VERSION: [2026.1]
         OS: [macos-15-intel, ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.OS }}

.github/workflows/prerelease.yaml

@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: true # cancel all builds if one fails.
       matrix:
-        IDEA_VERSION: [2025.3]
+        IDEA_VERSION: [2026.1]
     needs: prepare
     runs-on: ubuntu-latest
     steps:

.github/workflows/release.yaml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: true # cancel all builds if one fails.
       matrix:
-        IDEA_VERSION: [ 2025.3 ]
+        IDEA_VERSION: [ 2026.1 ]
     needs: prepare
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 1.8.0
+* Support for intellij 2026.1
+
 ## 1.7.11
 * Bugfix: Extern classes with a constructor that extends other classes should no longer warn about missing super call.
 * Bugfix: `case` keyword was not sugested in nested switch statements.

build.gradle.kts

@@ -15,19 +15,19 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "2.2.0"
+    id("org.jetbrains.kotlin.jvm") version "2.3.20"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij.platform") version "2.10.5"
+    id("org.jetbrains.intellij.platform") version "2.13.1"
     // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "2.0.0"
+    id("org.jetbrains.changelog") version "2.5.0"
     // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "2025.1.1"
+    id("org.jetbrains.qodana") version "2025.3.2"
     // Gradle Kover Plugin
     id("org.jetbrains.kotlinx.kover") version "0.9.1"
     // generate parser and lexer
-    id("org.jetbrains.grammarkit") version "2023.3.0.1"
+    id("org.jetbrains.grammarkit") version "2023.3.0.3"
     // console output for tests
-    id("com.adarshr.test-logger") version "3.2.0"
+    id("com.adarshr.test-logger") version "4.0.0"
 }
 
 group = properties("pluginGroup").get()
@@ -40,12 +40,14 @@ var platformType = properties("platformType").get();
 val ideaBaseDir = "${project.rootDir}/idea"
 val ideaTargetDir = "${ideaBaseDir}/idea${platformType}-${platformVersion}"
 
+val lombokDependency = "org.projectlombok:lombok:1.18.44";
+
 dependencies {
     implementation("org.commonmark:commonmark:0.21.0")
     implementation("org.commonmark:commonmark-ext-autolink:0.21.0")
     implementation("org.commonmark:commonmark-ext-gfm-tables:0.21.0")
 
-    implementation("tools.jackson.core:jackson-databind:3.0.4")
+    implementation("tools.jackson.core:jackson-databind:3.1.0")
     implementation("org.apache.commons:commons-text:1.14.0")
 
     implementation(project(":common"))
@@ -71,10 +73,10 @@ dependencies {
     testCompileOnly(files("${ideaTargetDir}/lib/openapi.jar"))
     testCompileOnly(files("${ideaTargetDir}/lib/util.jar"))
 
-    compileOnly("org.projectlombok:lombok:1.18.34")
-    testCompileOnly("org.projectlombok:lombok:1.18.34")
-    annotationProcessor ("org.projectlombok:lombok:1.18.34")
-    testAnnotationProcessor ("org.projectlombok:lombok:1.18.34")
+    compileOnly(lombokDependency)
+    testCompileOnly(lombokDependency)
+    annotationProcessor (lombokDependency)
+    testAnnotationProcessor (lombokDependency)
 
     // TODO upgrade to junit5 (testFramework(TestFrameworkType.JUnit5))
     testImplementation("junit:junit:4.13.2")
@@ -89,7 +91,9 @@ dependencies {
         bundledPlugins(properties("platformBundledPlugins").map { it.split(',') })
 
         // TODO upgrade to JUnit5
+        testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.Bundled)
+        testFramework(TestFrameworkType.Plugin.Java)
 
     }
 
@@ -117,10 +121,10 @@ subprojects {
     }
 
     dependencies {
-        compileOnly("org.projectlombok:lombok:1.18.34")
-        testCompileOnly("org.projectlombok:lombok:1.18.34")
-        annotationProcessor ("org.projectlombok:lombok:1.18.34")
-        testAnnotationProcessor ("org.projectlombok:lombok:1.18.34")
+        compileOnly(lombokDependency)
+        testCompileOnly(lombokDependency)
+        annotationProcessor (lombokDependency)
+        testAnnotationProcessor (lombokDependency)
 
         intellijPlatform {
 
@@ -263,6 +267,11 @@ tasks {
         dependsOn("generateLexer")
     }
 
+    compileKotlin {
+        dependsOn("generateParser")
+        dependsOn("generateLexer")
+    }
+
     processResources {
         dependsOn("generateParser")
         dependsOn("generateLexer")

gradle.properties

@@ -7,27 +7,24 @@ pluginName = Haxe Toolkit Support
 pluginRepositoryUrl = https://github.com/HaxeFoundation/intellij-haxe
 
 # SemVer format -> https://semver.org
-pluginVersion = 1.7.11
+pluginVersion = 1.8.0
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
 #platformType = IC
 
 
 #run print product releases to see what's the LATEST-EAP-SNAPSHOT
-#platformVersion = 2024.2.1
-#platformVersion = 2024.1.7
-#platformVersion = 2024.3.1.1
-#platformVersion = 2024.3.3
-#platformVersion = 2025.1.4.1
 #platformVersion = 2025.2.5
-platformVersion = 2025.3.2
+#platformVersion = 2025.3.2
+platformVersion = 261.22158.182
+#platformVersion = 2026.1
 platformDownloadSources = true
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 252
-pluginUntilBuild = 253.*
+pluginUntilBuild = 261.*
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
@@ -37,52 +34,24 @@ pluginUntilBuild = 253.*
 # Git Modal Commit Interface  : https://plugins.jetbrains.com/plugin/26647-git-modal-commit-interface
 # OpenGL-Plugin :  https://plugins.jetbrains.com/plugin/18470-glsl
 
-# 2025.3
+# 2026.1
 platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-platformPlugins = com.intellij.flex:253.28294.251, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:253.28294.218, intellij.git.commit.modal:253.28294.256
-
-# IC 2025.2
-#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:252.23892.360, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:252.23892.201, intellij.git.commit.modal:252.23892.364
-
-# IC 2025.1.3
-#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:251.26094.37, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:251.23774.318, intellij.git.commit.modal:251.25410.104
-
-# IC 2025.1
-#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:251.23774.318, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:251.23774.318, intellij.git.commit.modal:251.23774.33
+platformPlugins = com.intellij.flex:261.22158.182, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:261.22158.185, intellij.git.commit.modal:261.22158.41
 
-# IC 2024.3.x
-#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:243.22562.59, OpenGL-Plugin:1.1.4, com.intellij.classic.ui:243.21565.122
-
-# IC 2024.3.1.1
+# 2025.3
 #platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:243.22562.59, OpenGL-Plugin:1.1.3, com.intellij.classic.ui:243.21565.122
+#platformPlugins = com.intellij.flex:253.28294.251, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:253.28294.218, intellij.git.commit.modal:253.28294.256
 
-# IC 2024.3
+# IC 2025.2
 #platformBundledPlugins = com.intellij.java, com.intellij.modules.json
-#platformPlugins = com.intellij.flex:243.21565.129, OpenGL-Plugin:1.1.3, com.intellij.classic.ui:243.21565.122
-
-# IU 2024.3
-#platformBundledPlugins = com.intellij.java, com.intellij.modules.json, JavaScript
-#platformPlugins = com.intellij.flex:243.21565.129, OpenGL-Plugin:1.1.3, com.intellij.classic.ui:243.21565.122
-
-# IC 2024.2.1
-#platformBundledPlugins = com.intellij.java
-#platformPlugins = com.intellij.flex:242.20224.159, OpenGL-Plugin:1.1.3, com.intellij.classic.ui:242.20224.159
-
-# IU 2024.2.1
-#platformBundledPlugins = com.intellij.java, JavaScript
-#platformPlugins = com.intellij.flex:242.20224.159, OpenGL-Plugin:1.1.3, com.intellij.classic.ui:242.20224.159
+#platformPlugins = com.intellij.flex:252.23892.360, OpenGL-Plugin:1.1.6, com.intellij.classic.ui:252.23892.201, intellij.git.commit.modal:252.23892.364
 
 
 # Java language level used to compile sources and to generate the files for - Java 17 is required since 2022.2
 javaVersion = 21
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.9
+gradleVersion = 9.4.0
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

haxe-compiler-protocol/build.gradle.kts

@@ -0,0 +1,20 @@
+
+fun properties(key: String) = providers.gradleProperty(key)
+fun environment(key: String) = providers.environmentVariable(key)
+
+val protocolSrcFolder = "src/main/haxe"
+
+val hxjavaVersion = properties("hxjavaVersion").get()
+
+tasks.register<Exec>("generateCompilerProtocolJavaSource") {
+    group = "haxe-compiler"
+//    dependsOn("installHxJava")
+
+    inputs.file(File("${protocolSrcFolder}/HaxeCompilerProtocol.hx"))
+    outputs.upToDateWhen { File("gen/src").exists() }
+
+    workingDir = File("src/main/haxe/")
+    commandLine = listOf("haxe", "-cp", "..", "--jvm", "../../bin/", "-main", "HaxeCompilerProtocol",
+        "-lib", "hxjava:$hxjavaVersion")
+}
+

hxcpp-debugger-protocol/build.gradle.kts

@@ -31,23 +31,22 @@ tasks {
     }
 }
 
-
-tasks.create<Exec>("installHxJava") {
+tasks.register<Exec>("installHxJava") {
     group = "hxcpp"
     onlyIf({ generateHxcppDebugger })
     commandLine = listOf("haxelib", "install", "hxjava", hxjavaVersion, haxeLibChangeVersion)
 //    if (!logger.isDebugEnabled()) standardOutput = ByteArrayOutputStream() // avoid to much output (loads of empty lines on install)
 
 }
 
-tasks.create<Exec>("installHxcppDebugger") {
+tasks.register<Exec>("installHxcppDebugger") {
     group = "hxcpp"
     onlyIf({ generateHxcppDebugger })
     commandLine = listOf("haxelib", "git", "hxcpp-debugger", hxcppDebuggerGit, hxcppDebuggerBranch, haxeLibChangeVersion)
     if (!logger.isDebugEnabled()) standardOutput = ByteArrayOutputStream() // avoid to much output (loads of empty lines on install)
 }
 
-tasks.create<Exec>("generateDebuggerJavaSource") {
+tasks.register<Exec>("generateDebuggerJavaSource") {
     group = "hxcpp"
     onlyIf({ generateHxcppDebugger })
     dependsOn("installHxJava")
@@ -63,7 +62,7 @@ tasks.create<Exec>("generateDebuggerJavaSource") {
 }
 
 
-tasks.create<Delete>("cleanGenerated") {
+tasks.register<Delete>("cleanGenerated") {
     group = "hxcpp"
     delete.add("src/gen/")
 }

src/test/java/com/intellij/plugins/haxe/actions/HaxeRenameTest.java

@@ -90,11 +90,11 @@ public void doTest(String newName, int dialogAnswer, Map<String, String> expecte
 
     renameProcessor.doRun();
 
-    log.warn("----------");
+    log.debug("----------");
     for (Map.Entry<String, String> entry : renameMap.entrySet()) {
-      log.warn(String.format("rename entry '%s' => '%s'", entry.getKey(), entry.getValue()));
+      log.debug(String.format("rename entry '%s' => '%s'", entry.getKey(), entry.getValue()));
     }
-    log.warn("----------");
+    log.debug("----------");
 
     for (Map.Entry<String, String> entry : expectedRename.entrySet()) {
       String key = entry.getKey();