User: joe
Date: 20 Oct 25 15:19
Revision: 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc
Summary:
2025.3


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10183&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ build.gradle.kts	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -101,7 +101,9 @@
     }
 
     intellijPlatform {
-        intellijIdeaCommunity(libs.versions.intellij.ide, useInstaller = false)
+        intellijIdea(libs.versions.intellij.ide) {
+            useInstaller = false
+        }
 
         // Bundled plugin dependencies
         bundledPlugin("com.intellij.java")
@@ -109,7 +111,7 @@
         bundledPlugin("com.intellij.gradle")
         bundledPlugin("org.intellij.groovy")
         bundledPlugin("ByteCodeViewer")
-        bundledPlugin("org.intellij.intelliLang")
+        bundledModule("intellij.platform.langInjection")
         bundledPlugin("com.intellij.properties")
         bundledPlugin("Git4Idea")
         bundledPlugin("com.intellij.modules.json")
Index: buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -26,6 +26,7 @@
 import kotlin.io.path.absolute
 import org.jetbrains.intellij.platform.gradle.utils.IdeServicesPluginRepositoryService
 import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
+import org.jetbrains.intellij.pluginRepository.model.ProductFamily
 
 plugins {
     id("org.jetbrains.intellij.platform")
@@ -62,9 +63,9 @@
 
                     false -> PluginRepositoryFactory.create(host.get(), token.get())
                 }
-                @Suppress("DEPRECATION")
-                val uploadBean = repositoryClient.uploader.upload(
+                val uploadBean = repositoryClient.uploader.uploadUpdateByXmlIdAndFamily(
                     id = pluginId,
+                    family = ProductFamily.INTELLIJ,
                     file = path.toFile(),
                     channel = channel.takeIf { it != "default" },
                     notes = null,
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ gradle.properties	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -21,7 +21,7 @@
 # suppress inspection "UnusedProperty" for whole file
 org.gradle.jvmargs=-Xmx1g
 
-ideaVersionName = 2025.2
+ideaVersionName = 2025.3
 
 coreVersion = 1.8.6
 
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ gradle/libs.versions.toml	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -1,17 +1,24 @@
 [versions]
-kotlin = "2.1.21"
+# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlin_stdlib.xml
+kotlin = "2.2.20"
+# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlinx_coroutines_core.xml
 coroutines = "1.10.2"
 junit = "5.10.2"
 junit-platform = "1.10.2"
-asm = "9.6"
+asm = "9.9"
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.6.0"
-intellij-plugin-repository-rest-client = "2.0.46"
-intellij-ide = "2025.2"
-idea-ext = "1.1.10"
-psiPlugin = "251.175"
+# https://github.com/JetBrains/intellij-platform-gradle-plugin
+intellij-plugin = "2.10.1"
+# https://search.maven.org/artifact/org.jetbrains.intellij/plugin-repository-rest-client
+intellij-plugin-repository-rest-client = "2.0.47"
+# https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
+intellij-ide = "253.27642.30-EAP-SNAPSHOT"
+# https://github.com/JetBrains/gradle-idea-ext-plugin
+idea-ext = "1.3"
+# https://plugins.jetbrains.com/plugin/227-psiviewer/versions
+psiPlugin = "253.7181"
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Index: obfuscation-explorer/build.gradle.kts
===================================================================
--- obfuscation-explorer/build.gradle.kts	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ obfuscation-explorer/build.gradle.kts	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -38,7 +38,9 @@
 
 dependencies {
     intellijPlatform {
-        intellijIdeaCommunity(libs.versions.intellij.ide, useInstaller = false)
+        intellijIdea(libs.versions.intellij.ide) {
+            useInstaller = false
+        }
 
         plugin(libs.versions.psiPlugin.map { "PsiViewer:$it" })
 
Index: src/main/kotlin/insight/ColorLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -149,7 +149,7 @@
             }
 
             val actionText = MCDevBundle("generate.color.choose_action")
-            val c = ColorChooserService.instance.showDialog(psiElement.project, editor.component, actionText, color)
+            val c = ColorChooserService.getInstance().showDialog(psiElement.project, editor.component, actionText, color)
                 ?: return@handler
             when (workElement) {
                 is ULiteralExpression -> {
Index: src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt
===================================================================
--- src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -68,7 +68,7 @@
             val taskCallback = object : TaskCallback {
                 override fun onSuccess() {
                     val importSpec = ImportSpecBuilder(project, GradleConstants.SYSTEM_ID)
-                        .callback(
+                        .withCallback(
                             object : ExternalProjectRefreshCallback {
                                 override fun onSuccess(externalProject: DataNode<ProjectData>?) = callback.setDone()
 
Index: src/main/kotlin/platform/mixin/completion/InjectionPointTypedHandlerDelegate.kt
===================================================================
--- src/main/kotlin/platform/mixin/completion/InjectionPointTypedHandlerDelegate.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/platform/mixin/completion/InjectionPointTypedHandlerDelegate.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -34,7 +34,7 @@
         if (charTyped != ':' || !file.language.isKindOf(JavaLanguage.INSTANCE)) {
             return Result.CONTINUE
         }
-        AutoPopupController.getInstance(project).autoPopupMemberLookup(editor) {
+        AutoPopupController.getInstance(project).scheduleAutoPopup(editor) {
             val offset = editor.caretModel.offset
             val element = it.findElementAt(offset)?.findContextElement()
             InjectionPointReference.ELEMENT_PATTERN.accepts(element)
Index: src/main/kotlin/platform/mixin/expression/MEExpressionAnnotator.kt
===================================================================
--- src/main/kotlin/platform/mixin/expression/MEExpressionAnnotator.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/platform/mixin/expression/MEExpressionAnnotator.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -362,7 +362,7 @@
             hostEditor.caretModel.moveToOffset(dummy.textOffset)
             PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(hostEditor.document)
             hostEditor.document.replaceString(dummy.textRange.startOffset, dummy.textRange.endOffset, "")
-            AutoPopupController.getInstance(project).autoPopupMemberLookup(hostEditor, null)
+            AutoPopupController.getInstance(project).scheduleAutoPopup(hostEditor, null)
         }
     }
 }
Index: src/main/kotlin/platform/mixin/expression/MEExpressionTypedHandlerDelegate.kt
===================================================================
--- src/main/kotlin/platform/mixin/expression/MEExpressionTypedHandlerDelegate.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/platform/mixin/expression/MEExpressionTypedHandlerDelegate.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -31,7 +31,7 @@
 class MEExpressionTypedHandlerDelegate : TypedHandlerDelegate() {
     override fun checkAutoPopup(charTyped: Char, project: Project, editor: Editor, file: PsiFile): Result {
         if (charTyped == ':' && file.language == MEExpressionLanguage) {
-            AutoPopupController.getInstance(project).autoPopupMemberLookup(editor) {
+            AutoPopupController.getInstance(project).scheduleAutoPopup(editor) {
                 val offset = editor.caretModel.offset
                 it.findElementAt(offset - 1).elementType == MEExpressionTypes.TOKEN_METHOD_REF
             }
Index: src/main/kotlin/platform/mixin/util/AsmUtil.kt
===================================================================
--- src/main/kotlin/platform/mixin/util/AsmUtil.kt	(revision 3f914457e1a535024dc2eb9fb0d94ae75141755c)
+++ src/main/kotlin/platform/mixin/util/AsmUtil.kt	(revision 0f55d27acdf3b772c5a51ba8a9dc044a1d1ef2cc)
@@ -42,6 +42,7 @@
 import com.intellij.byteCodeViewer.ByteCodeViewerManager
 import com.intellij.codeEditor.JavaEditorFileSwapper
 import com.intellij.ide.highlighter.JavaFileType
+import com.intellij.java.syntax.parser.JavaKeywords
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
@@ -64,7 +65,6 @@
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiFileFactory
 import com.intellij.psi.PsiJavaFile
-import com.intellij.psi.PsiKeyword
 import com.intellij.psi.PsiLambdaExpression
 import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiMethod
@@ -224,7 +224,7 @@
 fun findClassNodeByPsiClass(psiClass: PsiClass, module: Module? = psiClass.findModule()): ClassNode? {
     return psiClass.lockedCached(NODE_BY_PSI_CLASS_KEY) {
         try {
-            val bytes = ByteCodeViewerManager.loadClassFileBytes(psiClass)
+            val bytes = ByteCodeViewerManager.findClassFile(psiClass)?.contentsToByteArray(false)
             if (bytes == null) {
                 // find compiler output
                 if (module == null) return@lockedCached null
@@ -1050,7 +1050,7 @@
         if (body != null) {
             val children = body.children
             val superCtorIndex = children.indexOfFirst {
-                it is PsiMethodCallExpression && it.methodExpression.text == PsiKeyword.SUPER
+                it is PsiMethodCallExpression && it.methodExpression.text == JavaKeywords.SUPER
             }
             result += children.take(superCtorIndex + 1)
             sourceMethod.containingClass?.children?.forEach { element ->