Merge branch '2024.2' into 2024.3

Author: RedNesto

.github/workflows/test.yml

@@ -38,3 +38,9 @@ jobs:
           echo -e '\norg.gradle.jvmargs=-Xmx4G\n' >> ~/.gradle/gradle.properties
       - name: Build
         run: ./gradlew build --stacktrace
+      - name: Upload test reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports-${{ matrix.os }}
+          path: build/reports

changelog.md

@@ -1,5 +1,24 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.5]
+
+### Added
+
+- Support for the 2025.2 EAP
+
+### Changed
+
+- Demote a couple of mixin inspections from error to warning
+- Allow handler methods to be static even when not required, except for `@Inject` on stock mixin
+- Allow `CallbackInfoReturnable.cancel()` in MixinCancellableInspection
+- Check bases for `CIR.cancel()`
+- Allow `.aw` as alternative access widener file extension
+
+### Fixed
+
+- [#2148](https://github.com/minecraft-dev/MinecraftDev/issues/2148) Allow assignment to `@Final` fields in class initializer blocks
+- [#2468](https://github.com/minecraft-dev/MinecraftDev/issues/2468) Fix entrypoint checks on non-ending parts of entrypoint references, and handle escapes in entrypoint reference strings
+
 ## [1.8.4]
 
 ### Added

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
 
 ideaVersionName = 2024.3
 
-coreVersion = 1.8.4
+coreVersion = 1.8.5
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false

readme.md

@@ -23,6 +23,10 @@ Minecraft Development for IntelliJ
         <td align="left">2025.1</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20251"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20251)/statusIcon.svg" alt="2025.1 Nightly Status" /></a></td>
     </tr>
+    <tr>
+        <td align="left">2025.2</td>
+        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20252"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20252)/statusIcon.svg" alt="2025.2 Nightly Status" /></a></td>
+    </tr>
     <tr>
         <td align="right"><b>OS Tests</b></td>
         <td align="left" colspan="2">
@@ -31,7 +35,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.4-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.5-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/main/kotlin/facet/MinecraftFacetDetector.kt

@@ -32,6 +32,7 @@ import com.intellij.facet.FacetManager
 import com.intellij.facet.impl.ui.libraries.LibrariesValidatorContextImpl
 import com.intellij.framework.library.LibraryVersionProperties
 import com.intellij.openapi.application.EDT
+import com.intellij.openapi.application.readAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.module.Module
@@ -132,8 +133,14 @@ class MinecraftFacetDetector : ProjectActivity {
             }
         }
 
-        private fun checkNoFacet(module: Module) {
-            val platforms = autoDetectTypes(module).ifEmpty { return }
+        private suspend fun checkNoFacet(module: Module) {
+            val platforms = readAction {
+                if (!module.isDisposed) {
+                    autoDetectTypes(module)
+                } else {
+                    emptyList()
+                }
+            }.ifEmpty { return }
 
             runWriteTaskLater {
                 // Only add the new facet if there isn't a Minecraft facet already - double check here since this

src/main/kotlin/platform/fabric/inspection/FabricEntrypointsInspection.kt

@@ -79,6 +79,10 @@ class FabricEntrypointsInspection : LocalInspectionTool() {
                     )
                 }
 
+                if (!reference.isFinalPart) {
+                    continue
+                }
+
                 val element = resolved.singleOrNull()?.element
                 when {
                     element is PsiClass && !literal.text.contains("::") -> {

src/main/kotlin/platform/fabric/reference/EntryPointReference.kt

@@ -35,6 +35,7 @@ import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementResolveResult
 import com.intellij.psi.PsiField
+import com.intellij.psi.PsiLanguageInjectionHost
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiPolyVariantReference
@@ -51,12 +52,17 @@ import com.intellij.util.ProcessingContext
 
 object EntryPointReference : PsiReferenceProvider() {
     override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
-        if (element !is JsonStringLiteral) {
+        if (element !is JsonStringLiteral || element !is PsiLanguageInjectionHost) {
             return PsiReference.EMPTY_ARRAY
         }
         val manipulator = element.manipulator ?: return PsiReference.EMPTY_ARRAY
         val range = manipulator.getRangeInElement(element)
-        val text = element.text.substring(range.startOffset, range.endOffset)
+        val escaper = element.createLiteralTextEscaper()
+        val text = buildString {
+            if (!escaper.decode(range, this)) {
+                return PsiReference.EMPTY_ARRAY
+            }
+        }
         val memberParts = text.split("::", limit = 2)
         val clazzParts = memberParts[0].split("$", limit = 0)
         val references = mutableListOf<Reference>()
@@ -68,7 +74,10 @@ object EntryPointReference : PsiReferenceProvider() {
             references.add(
                 Reference(
                     element,
-                    range.cutOut(TextRange.from(cursor, clazzPart.length)),
+                    TextRange.create(
+                        escaper.getOffsetInHost(cursor, range),
+                        escaper.getOffsetInHost(cursor + clazzPart.length, range)
+                    ),
                     innerClassDepth,
                     false,
                 ),
@@ -80,12 +89,16 @@ object EntryPointReference : PsiReferenceProvider() {
             references.add(
                 Reference(
                     element,
-                    range.cutOut(TextRange.from(cursor, memberParts[1].length)),
+                    TextRange.create(
+                        escaper.getOffsetInHost(cursor, range),
+                        escaper.getOffsetInHost(cursor + memberParts[1].length, range),
+                    ),
                     innerClassDepth,
                     true,
                 ),
             )
         }
+        references.lastOrNull()?.isFinalPart = true
         return references.toTypedArray()
     }
 
@@ -167,6 +180,9 @@ object EntryPointReference : PsiReferenceProvider() {
         PsiPolyVariantReference,
         InspectionReference {
 
+        var isFinalPart = false
+            internal set
+
         override val description = "entry point '%s'"
         override val unresolved = resolve() == null
 

src/main/kotlin/platform/mixin/handlers/desugar/DesugarUtil.kt

@@ -26,14 +26,16 @@ import com.intellij.openapi.util.Key
 import com.intellij.psi.JavaRecursiveElementWalkingVisitor
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.parents
+import org.jetbrains.annotations.VisibleForTesting
 
 object DesugarUtil {
     private val ORIGINAL_ELEMENT_KEY = Key.create<PsiElement>("mcdev.desugar.originalElement")
 
-    private val DESUGARERS = arrayOf<Desugarer>(
+    private val DESUGARERS = arrayOf(
+        RemoveVarArgsDesugarer,
         FieldAssignmentDesugarer,
     )
 
@@ -45,19 +47,34 @@ object DesugarUtil {
         desugared.putCopyableUserData(ORIGINAL_ELEMENT_KEY, original)
     }
 
-    fun desugar(project: Project, clazz: PsiClass): PsiClass {
-        return clazz.cached {
-            val desugaredFile = clazz.containingFile.copy() as PsiFile
-            val desugaredClass = PsiTreeUtil.findSameElementInCopy(clazz, desugaredFile)
-            setOriginalRecursive(desugaredClass, clazz)
+    fun getOriginalToDesugaredMap(desugared: PsiElement): Map<PsiElement, List<PsiElement>> {
+        val desugaredFile = desugared.containingFile ?: return emptyMap()
+        return desugaredFile.cached {
+            val result = mutableMapOf<PsiElement, MutableList<PsiElement>>()
+            PsiTreeUtil.processElements(desugaredFile) { desugaredElement ->
+                desugaredElement.getCopyableUserData(ORIGINAL_ELEMENT_KEY)?.let { original ->
+                    result.getOrPut(original) { mutableListOf() } += desugaredElement
+                }
+                true
+            }
+            result
+        }
+    }
+
+    fun desugar(project: Project, clazz: PsiClass): PsiClass? {
+        val file = clazz.containingFile as? PsiJavaFile ?: return null
+        return file.cached {
+            val desugaredFile = file.copy() as PsiJavaFile
+            setOriginalRecursive(desugaredFile, file)
             for (desugarer in DESUGARERS) {
-                desugarer.desugar(project, desugaredClass)
+                desugarer.desugar(project, desugaredFile)
             }
-            desugaredClass
+            getOriginalToDesugaredMap(desugaredFile)[clazz]?.filterIsInstance<PsiClass>()?.firstOrNull()
         }
     }
 
-    private fun setOriginalRecursive(desugared: PsiElement, original: PsiElement) {
+    @VisibleForTesting
+    fun setOriginalRecursive(desugared: PsiElement, original: PsiElement) {
         val desugaredElements = mutableListOf<PsiElement>()
         desugared.accept(object : JavaRecursiveElementWalkingVisitor() {
             override fun visitElement(element: PsiElement) {
@@ -78,17 +95,4 @@ object DesugarUtil {
             setOriginalElement(desugaredElement, originalElement)
         }
     }
-
-    fun getOriginalToDesugaredMap(desugared: PsiElement): Map<PsiElement, List<PsiElement>> {
-        val result = mutableMapOf<PsiElement, MutableList<PsiElement>>()
-        desugared.accept(object : JavaRecursiveElementWalkingVisitor() {
-            override fun visitElement(element: PsiElement) {
-                super.visitElement(element)
-                getOriginalElement(element)?.let { original ->
-                    result.getOrPut(original) { mutableListOf() } += desugared
-                }
-            }
-        })
-        return result
-    }
 }

src/main/kotlin/platform/mixin/handlers/desugar/Desugarer.kt

@@ -22,7 +22,15 @@ package com.demonwav.mcdev.platform.mixin.handlers.desugar
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiJavaFile
+import com.intellij.psi.util.childrenOfType
 
-interface Desugarer {
-    fun desugar(project: Project, clazz: PsiClass)
+abstract class Desugarer {
+    abstract fun desugar(project: Project, file: PsiJavaFile)
+
+    companion object {
+        @JvmStatic
+        protected val PsiJavaFile.allClasses: List<PsiClass>
+            get() = this.childrenOfType<PsiClass>()
+    }
 }