Fixes for 2025.1

.gitignore

@@ -24,6 +24,7 @@ crashlytics-build.properties
 hs_err_pid*
 
 **/.gradle/
+.intellijPlatform/
 .sandbox/
 .intellijPlatform/
 .kotlin/

build.gradle.kts

@@ -86,7 +86,9 @@ dependencies {
 
     implementation(files(gradleToolingExtensionJar))
 
-    implementation(libs.mixinExtras.expressions)
+    implementation(libs.mixinExtras.expressions) {
+        exclude(group = "org.ow2.asm", module = "asm-debug-all")
+    }
     testLibs(libs.mixinExtras.common)
 
     implementation(libs.mappingIo)
@@ -95,7 +97,7 @@ dependencies {
     implementation(libs.bundles.fuel)
 
     intellijPlatform {
-        intellijIdeaCommunity(libs.versions.intellij.ide)
+        intellijIdeaCommunity(libs.versions.intellij.ide, useInstaller = false)
 
         // Bundled plugin dependencies
         bundledPlugin("com.intellij.java")
@@ -105,13 +107,15 @@ dependencies {
         bundledPlugin("ByteCodeViewer")
         bundledPlugin("org.intellij.intelliLang")
         bundledPlugin("com.intellij.properties")
+        bundledPlugin("com.intellij.modules.json")
 
         // Optional dependencies
         bundledPlugin("org.jetbrains.kotlin")
         bundledPlugin("org.toml.lang")
         bundledPlugin("org.jetbrains.plugins.yaml")
 
         testFramework(TestFrameworkType.JUnit5)
+        testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.Plugin.Java)
 
         pluginVerifier()

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

@@ -45,27 +45,27 @@ if (buildNumber != null) {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"
     options.compilerArgs = listOf("-proc:none")
-    options.release.set(17)
+    options.release.set(21)
 }
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
+        jvmTarget = JvmTarget.JVM_21
         languageVersion = KotlinVersion.KOTLIN_2_0
-        freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=17")
+        freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=21")
         optIn.add("kotlin.contracts.ExperimentalContracts")
     }
     kotlinDaemonJvmArguments.add("-Xmx2G")

gradle.properties

@@ -19,7 +19,7 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
-ideaVersionName = 2024.1
+ideaVersionName = 2025.1
 
 coreVersion = 1.8.2
 

gradle/libs.versions.toml

@@ -7,10 +7,10 @@ asm = "9.6"
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.1.0"
-intellij-ide = "2024.1"
+intellij-plugin = "2.3.0"
+intellij-ide = "251.23774-EAP-CANDIDATE-SNAPSHOT"
 idea-ext = "1.1.8"
-psiPlugin = "241.14494.158-EAP-SNAPSHOT"
+psiPlugin = "251.175"
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -39,9 +39,9 @@ jflex-skeleton = "org.jetbrains.idea:jflex:1.7.0-c1fdf11"
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:241.11761.10-EAP-SNAPSHOT"
+gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version.ref = "intellij-ide" }
 annotations = "org.jetbrains:annotations:24.0.0"
-groovy = "org.codehaus.groovy:groovy-all:2.5.18"
+groovy = "org.codehaus.groovy:groovy:3.0.19"
 
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }

obfuscation-explorer/build.gradle.kts

@@ -38,7 +38,7 @@ intellijPlatform {
 
 dependencies {
     intellijPlatform {
-        intellijIdeaCommunity(libs.versions.intellij.ide)
+        intellijIdeaCommunity(libs.versions.intellij.ide, useInstaller = false)
 
         plugin(libs.versions.psiPlugin.map { "PsiViewer:$it" })
 

obfuscation-explorer/src/main/kotlin/facet/config/MappingsTable.kt

@@ -154,7 +154,7 @@ class MappingsTable(private val config: ObfExFacetConfiguration) {
         private val model: MappingsFileTableModel,
         private val state: MutableList<MappingsTableRow> = model.state,
     ) : AbstractTableCellEditor() {
-        private val textField = textFieldWithBrowseButton(null, "Mappings Files", fileDesc, null)
+        private val textField = textFieldWithBrowseButton(null, fileDesc, null)
         private var row: Int = -1
 
         override fun getCellEditorValue(): Any? {
@@ -308,6 +308,6 @@ class MappingsTable(private val config: ObfExFacetConfiguration) {
             return uri
         }
 
-        private val fileDesc = FileChooserDescriptor(true, false, false, false, false, true)
+        private val fileDesc = FileChooserDescriptor(true, false, false, false, false, true).withTitle("Mappings Files")
     }
 }

settings.gradle.kts

@@ -19,7 +19,7 @@
  */
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
 }
 
 rootProject.name = "MinecraftDev"

src/main/kotlin/MinecraftConfigurable.kt

@@ -30,15 +30,17 @@ import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.ui.EnumComboBoxModel
-import com.intellij.ui.components.Label
 import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.MutableProperty
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.IconUtil
+import java.awt.Font
 import javax.swing.JComponent
+import javax.swing.JLabel
+import javax.swing.SwingConstants
 import org.jetbrains.annotations.Nls
 
 class MinecraftConfigurable : Configurable {
@@ -50,9 +52,12 @@ class MinecraftConfigurable : Configurable {
 
     override fun createComponent(): JComponent = panel {
         row(
-            Label(MCDevBundle("minecraft.settings.title"), bold = true).apply {
-                font = font.deriveFont(font.size * 1.5f)
-                icon = IconUtil.scale(PlatformAssets.MINECRAFT_ICON_2X, null, 1.5f)
+            JLabel(
+                MCDevBundle("minecraft.settings.title"),
+                IconUtil.scale(PlatformAssets.MINECRAFT_ICON_2X, null, 1.5f),
+                SwingConstants.LEADING
+            ).apply {
+                font = font.deriveFont(Font.BOLD, font.size * 1.5f)
             }
         ) {
             button(MCDevBundle("minecraft.settings.change_update_channel")) {
@@ -77,6 +82,11 @@ class MinecraftConfigurable : Configurable {
         row {
             checkBox(MCDevBundle("minecraft.settings.show_chat_color_underlines"))
                 .bindSelected(settings::isShowChatColorUnderlines)
+        }
+        row {
+            checkBox(MCDevBundle("minecraft.settings.force_external_annotations"))
+                .bindSelected(settings::forceExternalAnnotations)
+                .comment(MCDevBundle("minecraft.settings.force_external_annotations.comment"))
         }.bottomGap(BottomGap.SMALL)
 
         group(indent = false) {

src/main/kotlin/MinecraftSettings.kt

@@ -40,6 +40,7 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         var isShowChatColorGutterIcons: Boolean = true,
         var isShowChatColorUnderlines: Boolean = false,
         var underlineType: UnderlineType = UnderlineType.DOTTED,
+        var forceExternalAnnotations: Boolean = true,
 
         var mixinClassIcon: Boolean = true,
 
@@ -124,6 +125,12 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
             state.underlineType = underlineType
         }
 
+    var forceExternalAnnotations: Boolean
+        get() = state.forceExternalAnnotations
+        set(forceExternalAnnotations) {
+            state.forceExternalAnnotations = forceExternalAnnotations
+        }
+
     var mixinClassIcon: Boolean
         get() = state.mixinClassIcon
         set(mixinClassIcon) {

src/main/kotlin/creator/PlatformVersion.kt

@@ -31,7 +31,7 @@ import com.github.kittinunf.fuel.coroutines.awaitString
 import com.google.gson.Gson
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.util.proxy.CommonProxy
+import com.intellij.util.net.JdkProxyProvider
 import java.io.IOException
 import java.net.Proxy
 import java.net.URI
@@ -103,7 +103,7 @@ fun selectProxy(urlText: String): Proxy? {
     val uri = URI(urlText)
     val url = uri.toURL()
 
-    val proxies = CommonProxy.getInstance().select(uri)
+    val proxies = JdkProxyProvider.getInstance().proxySelector.select(uri)
     for (proxy in proxies) {
         try {
             url.openConnection(proxy)

src/main/kotlin/creator/custom/BuiltinValidations.kt

@@ -23,13 +23,12 @@ package com.demonwav.mcdev.creator.custom
 import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.platform.fabric.util.FabricVersions
 import com.demonwav.mcdev.util.SemanticVersion
-import com.intellij.lang.java.lexer.JavaLexer
+import com.demonwav.mcdev.util.isJavaKeyword
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.ui.validation.DialogValidation
 import com.intellij.openapi.ui.validation.validationErrorIf
 import com.intellij.openapi.util.text.StringUtil
-import com.intellij.pom.java.LanguageLevel
 import javax.swing.JComponent
 
 object BuiltinValidations {
@@ -61,7 +60,7 @@ object BuiltinValidations {
 
     val validClassFqn = validationErrorIf<String>(MCDevBundle("creator.validation.class_fqn")) {
         it.isBlank() || it.split('.').any { part ->
-            !StringUtil.isJavaIdentifier(part) || JavaLexer.isKeyword(part, LanguageLevel.HIGHEST)
+            !StringUtil.isJavaIdentifier(part) || part.isJavaKeyword()
         }
     }
 

src/main/kotlin/creator/custom/CreatorContext.kt

@@ -27,7 +27,7 @@ import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
 import com.intellij.openapi.observable.properties.PropertyGraph
-import com.intellij.platform.util.coroutines.namedChildScope
+import com.intellij.platform.util.coroutines.childScope
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -53,7 +53,7 @@ data class CreatorContext(
     /**
      * A general purpose scope dependent of the main creator scope, cancelled when the creator is closed.
      */
-    fun childScope(name: String): CoroutineScope = scope.namedChildScope(name)
+    fun childScope(name: String): CoroutineScope = scope.childScope(name)
 
     @Suppress("UNCHECKED_CAST")
     fun <T> property(name: String): CreatorProperty<T> = properties[name] as CreatorProperty<T>

src/main/kotlin/creator/custom/CreatorTemplateProcessor.kt

@@ -39,7 +39,6 @@ import com.intellij.openapi.diagnostic.ControlFlowException
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.module.ModuleManager
-import com.intellij.openapi.module.ModuleTypeId
 import com.intellij.openapi.observable.properties.GraphProperty
 import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.project.Project
@@ -308,7 +307,7 @@ class CreatorTemplateProcessor(
 
     private fun setupTempRootModule(project: Project, projectPath: Path) {
         val modifiableModel = ModuleManager.getInstance(project).getModifiableModel()
-        val module = modifiableModel.newNonPersistentModule("mcdev-temp-root", ModuleTypeId.JAVA_MODULE)
+        val module = modifiableModel.newNonPersistentModule("mcdev-temp-root", "")
         val rootsModel = ModuleRootManager.getInstance(module).modifiableModel
         rootsModel.addContentEntry(projectPath.virtualFileOrError)
         rootsModel.commit()

src/main/kotlin/creator/custom/TemplateService.kt

@@ -25,7 +25,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
-import com.intellij.platform.util.coroutines.namedChildScope
+import com.intellij.platform.util.coroutines.childScope
 import com.intellij.util.application
 import kotlinx.coroutines.CoroutineScope
 
@@ -47,8 +47,7 @@ class TemplateService(private val scope: CoroutineScope) {
         pendingActions.remove(project.locationHash)?.invoke()
     }
 
-    @Suppress("UnstableApiUsage") // namedChildScope is Internal right now but has been promoted to Stable in 2024.2
-    fun scope(name: String): CoroutineScope = scope.namedChildScope(name)
+    fun scope(name: String): CoroutineScope = scope.childScope(name)
 
     companion object {
 

src/main/kotlin/creator/custom/finalizers/ImportGradleProjectFinalizer.kt

@@ -24,7 +24,7 @@ import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject
-import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
+import org.jetbrains.plugins.gradle.service.project.open.linkAndSyncGradleProject
 
 class ImportGradleProjectFinalizer : CreatorFinalizer {
 
@@ -38,7 +38,7 @@ class ImportGradleProjectFinalizer : CreatorFinalizer {
         val canLink = canLinkAndRefreshGradleProject(projectDir, project, showValidationDialog = false)
         thisLogger().info("canLink = $canLink projectDir = $projectDir")
         if (canLink) {
-            linkAndRefreshGradleProject(projectDir, project)
+            linkAndSyncGradleProject(project, projectDir)
             thisLogger().info("Linking done")
         }
     }

src/main/kotlin/creator/custom/providers/LocalTemplateProvider.kt

@@ -67,13 +67,11 @@ class LocalTemplateProvider : TemplateProvider {
         return panel {
             row(MCDevBundle("creator.ui.custom.path.label")) {
                 val pathChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor().apply {
+                    title = MCDevBundle("creator.ui.custom.path.dialog.title")
                     description = MCDevBundle("creator.ui.custom.path.dialog.description")
                 }
-                textFieldWithBrowseButton(
-                    MCDevBundle("creator.ui.custom.path.dialog.title"),
-                    null,
-                    pathChooserDescriptor
-                ).align(AlignX.FILL)
+                textFieldWithBrowseButton(pathChooserDescriptor)
+                    .align(AlignX.FILL)
                     .columns(COLUMNS_LARGE)
                     .bindText(pathProperty)
                     .textValidation(

src/main/kotlin/creator/custom/providers/ZipTemplateProvider.kt

@@ -68,13 +68,11 @@ class ZipTemplateProvider : TemplateProvider {
         return panel {
             row(MCDevBundle("creator.ui.custom.path.label")) {
                 val pathChooserDescriptor = FileChooserDescriptorFactory.createSingleLocalFileDescriptor()
+                    .withTitle(MCDevBundle("creator.ui.custom.archive.dialog.title"))
                     .withFileFilter { it.extension == "zip" }
                     .apply { description = MCDevBundle("creator.ui.custom.archive.dialog.description") }
-                textFieldWithBrowseButton(
-                    MCDevBundle("creator.ui.custom.archive.dialog.title"),
-                    null,
-                    pathChooserDescriptor
-                ).align(AlignX.FILL)
+                textFieldWithBrowseButton(pathChooserDescriptor)
+                    .align(AlignX.FILL)
                     .columns(COLUMNS_LARGE)
                     .bindText(pathProperty)
                     .textValidation(

src/main/kotlin/creator/field-validation.kt

@@ -20,7 +20,7 @@
 
 package com.demonwav.mcdev.creator
 
-import com.demonwav.mcdev.util.isJavaKeyword
+import com.demonwav.mcdev.util.isJavaSoftKeyword
 
 fun isValidClassName(className: String): Boolean {
     // default package
@@ -42,5 +42,5 @@ fun isValidClassName(className: String): Boolean {
         return false
     }
     // keyword identifier
-    return !fieldNameSplit.any { it.isJavaKeyword() }
+    return !fieldNameSplit.any { it.isJavaSoftKeyword() }
 }