Merge branch '2025.2' into 2025.3

Author: Earthcomputer

changelog.md

@@ -1,5 +1,11 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.8]
+
+### Fixed
+
+- `@At` targets inside `@Slice` are no longer checked for invalid instructions according to the injector type.
+
 ## [1.8.7]
 
 ### Added

gradle.properties

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

readme.md

@@ -31,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.7-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.8-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/creator/custom/providers/RemoteTemplateProvider.kt

@@ -36,7 +36,6 @@ import com.github.kittinunf.result.getOrNull
 import com.github.kittinunf.result.onError
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.application.PathManager
-import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.diagnostic.ControlFlowException
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.observable.properties.PropertyGraph
@@ -161,7 +160,7 @@ open class RemoteTemplateProvider : TemplateProvider {
         val rootFile = fs.refreshAndFindFileByPath(archiveRoot)
             ?: return emptyList()
         val modalityState = context.modalityState
-        writeAction { rootFile.refreshSync(modalityState) }
+        rootFile.refreshSync(modalityState)
 
         val innerPath = replaceVariables(rawInnerPath)
         val repoRoot = if (innerPath.isNotBlank()) {

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

@@ -46,6 +46,8 @@ import com.intellij.util.KeyedLazyInstance
 import com.intellij.util.xmlb.annotations.Attribute
 import java.util.ResourceBundle
 import javax.swing.JComponent
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 
 /**
  * Extensions responsible for creating a [TemplateDescriptor] based on whatever data it is provided in its configuration
@@ -73,31 +75,34 @@ interface TemplateProvider {
 
         fun getAllKeys() = EP_NAME.extensionList.mapNotNull { it.key }
 
-        fun findTemplates(
+        suspend fun findTemplates(
             modalityState: ModalityState,
             repoRoot: VirtualFile,
             templates: MutableList<VfsLoadedTemplate> = mutableListOf(),
-            bundle: ResourceBundle? = loadMessagesBundle(modalityState, repoRoot)
+            bundle: ResourceBundle? = null
         ): List<VfsLoadedTemplate> {
+            val bundle = bundle ?: loadMessagesBundle(modalityState, repoRoot)
             val visitor = object : VirtualFileVisitor<Unit>() {
                 override fun visitFile(file: VirtualFile): Boolean {
                     if (!file.isFile || !file.name.endsWith(".mcdev.template.json")) {
                         return true
                     }
 
-                    try {
-                        createVfsLoadedTemplate(modalityState, file.parent, file, bundle = bundle)
-                            ?.let(templates::add)
-                    } catch (t: Throwable) {
-                        if (t is ControlFlowException) {
-                            throw t
-                        }
-
-                        val attachment = runCatching { Attachment(file.name, file.readText()) }.getOrNull()
-                        if (attachment != null) {
-                            thisLogger().error("Failed to load template ${file.path}", t, attachment)
-                        } else {
-                            thisLogger().error("Failed to load template ${file.path}", t)
+                    runBlocking(Dispatchers.Unconfined) {
+                        try {
+                            createVfsLoadedTemplate(modalityState, file.parent, file, bundle = bundle)
+                                ?.let(templates::add)
+                        } catch (t: Throwable) {
+                            if (t is ControlFlowException) {
+                                throw t
+                            }
+
+                            val attachment = runCatching { Attachment(file.name, file.readText()) }.getOrNull()
+                            if (attachment != null) {
+                                thisLogger().error("Failed to load template ${file.path}", t, attachment)
+                            } else {
+                                thisLogger().error("Failed to load template ${file.path}", t)
+                            }
                         }
                     }
 
@@ -108,7 +113,7 @@ interface TemplateProvider {
             return templates
         }
 
-        fun loadMessagesBundle(modalityState: ModalityState, repoRoot: VirtualFile): ResourceBundle? = try {
+        suspend fun loadMessagesBundle(modalityState: ModalityState, repoRoot: VirtualFile): ResourceBundle? = try {
             val locale = DynamicBundle.getLocale()
             // Simplified bundle resolution, but covers all the most common cases
             val baseBundle = doLoadMessageBundle(
@@ -135,7 +140,7 @@ interface TemplateProvider {
             null
         }
 
-        private fun doLoadMessageBundle(
+        private suspend fun doLoadMessageBundle(
             file: VirtualFile?,
             modalityState: ModalityState,
             parent: ResourceBundle?
@@ -158,7 +163,7 @@ interface TemplateProvider {
             return parent
         }
 
-        fun createVfsLoadedTemplate(
+        suspend fun createVfsLoadedTemplate(
             modalityState: ModalityState,
             templateRoot: VirtualFile,
             descriptorFile: VirtualFile,

src/main/kotlin/platform/mixin/handlers/injectionPoint/AtResolver.kt

@@ -29,6 +29,8 @@ import com.demonwav.mcdev.platform.mixin.reference.isMiscDynamicSelector
 import com.demonwav.mcdev.platform.mixin.reference.parseMixinSelector
 import com.demonwav.mcdev.platform.mixin.reference.target.TargetReference
 import com.demonwav.mcdev.platform.mixin.util.InjectionPointSpecifier
+import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.AT
+import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SLICE
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Classes.SHIFT
 import com.demonwav.mcdev.platform.mixin.util.findSourceClass
 import com.demonwav.mcdev.platform.mixin.util.findSourceElement
@@ -152,11 +154,13 @@ class AtResolver(
             }
         }
 
-        fun findInjectorAnnotation(at: PsiAnnotation): PsiAnnotation? {
+        fun findInjectorAnnotation(at: PsiAnnotation, skipThroughSlice: Boolean = true): PsiAnnotation? {
             return at.parents(false)
                 .takeWhile { it !is PsiClass }
                 .filterIsInstance<PsiAnnotation>()
-                .firstOrNull { it.parent is PsiModifierList }
+                .firstOrNull {
+                    !skipThroughSlice || (!it.hasQualifiedName(SLICE) && !it.hasQualifiedName(AT))
+                }
         }
 
         fun getShift(at: PsiAnnotation): Int {
@@ -281,7 +285,7 @@ class AtResolver(
         val injectionPoint = getInjectionPoint(at) ?: return emptyList()
         val targetAttr = at.findAttributeValue("target")
         val target = targetAttr?.let { parseMixinSelector(it) }
-        val injector = findInjectorAnnotation(at)?.let(MixinAnnotationHandler::forMixinAnnotation)
+        val injector = findInjectorAnnotation(at, skipThroughSlice = false)?.let(MixinAnnotationHandler::forMixinAnnotation)
             as? InjectorAnnotationHandler
 
         // Collect all possible targets

src/main/kotlin/platform/mixin/inspection/injector/DisallowedTargetInsnInspection.kt

@@ -41,7 +41,7 @@ class DisallowedTargetInsnInspection : MixinInspection() {
                 return
             }
 
-            val injectorAnnotation = AtResolver.findInjectorAnnotation(annotation) ?: return
+            val injectorAnnotation = AtResolver.findInjectorAnnotation(annotation, skipThroughSlice = false) ?: return
             val injector = MixinAnnotationHandler.forMixinAnnotation(injectorAnnotation, annotation.project)
                 as? InjectorAnnotationHandler ?: return
             val containingClass = injectorAnnotation.findContainingClass() ?: return

src/main/kotlin/util/files.kt

@@ -20,7 +20,9 @@
 
 package com.demonwav.mcdev.util
 
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
+import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
@@ -44,7 +46,7 @@ val Path.virtualFileOrError: VirtualFile
 val VirtualFile.manifest: Manifest?
     get() = try {
         JarFile(localFile).use { it.manifest }
-    } catch (e: IOException) {
+    } catch (_: IOException) {
         null
     }
 
@@ -77,7 +79,18 @@ val VirtualFile.mcDomainAndPath: Pair<String, String>?
 operator fun Manifest.get(attribute: String): String? = mainAttributes.getValue(attribute)
 operator fun Manifest.get(attribute: Attributes.Name): String? = mainAttributes.getValue(attribute)
 
-fun VirtualFile.refreshSync(modalityState: ModalityState): VirtualFile? {
-    RefreshQueue.getInstance().refresh(false, this.isDirectory, null, modalityState, this)
+suspend fun VirtualFile.refreshSync(modalityState: ModalityState): VirtualFile? {
+    fun refresh() {
+        RefreshQueue.getInstance().refresh(false, this.isDirectory, null, modalityState, this)
+    }
+
+    if (ApplicationManager.getApplication().isWriteAccessAllowed) {
+        refresh()
+    } else {
+        writeAction {
+            refresh()
+        }
+    }
+
     return this.parent?.findOrCreateChildData(this, this.name)
 }