User: bawnorton
Date: 27 Sep 24 19:48
Revision: 6f62f3e7f0c7074b41e80154ddba7f430d1aa13f
Summary:
Fix "Unused Mixin Inspection" no longer providing a quick-fix (#2378)

* fix unused mixin inspection

* remove old imports

TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9710&personal=false

Index: src/main/kotlin/platform/mixin/MixinModule.kt
===================================================================
--- src/main/kotlin/platform/mixin/MixinModule.kt	(revision 56b37648bc393ecfc073a42759ca05fc8461a3be)
+++ src/main/kotlin/platform/mixin/MixinModule.kt	(revision 6f62f3e7f0c7074b41e80154ddba7f430d1aa13f)
@@ -31,7 +31,6 @@
 import com.intellij.json.psi.JsonFile
 import com.intellij.json.psi.JsonObject
 import com.intellij.openapi.fileTypes.FileTypeManager
-import com.intellij.openapi.fileTypes.FileTypes
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
@@ -54,19 +53,24 @@
     override val icon: Icon? = null
 
     companion object {
-        private val mixinFileType by lazy {
-            FileTypeManager.getInstance().findFileTypeByName("Mixin Configuration") ?: FileTypes.UNKNOWN
+        private val mixinFileTypes by lazy {
+            listOfNotNull(
+                FileTypeManager.getInstance().findFileTypeByName("Mixin Json Configuration"),
+                FileTypeManager.getInstance().findFileTypeByName("Mixin Json5 Configuration")
+            )
         }
 
         fun getMixinConfigs(
             project: Project,
             scope: GlobalSearchScope,
         ): Collection<MixinConfig> {
-            return FileTypeIndex.getFiles(mixinFileType, scope)
-                .mapNotNull {
-                    (PsiManager.getInstance(project).findFile(it) as? JsonFile)?.topLevelValue as? JsonObject
+            return mixinFileTypes
+                .flatMap { FileTypeIndex.getFiles(it, scope) }
+                .mapNotNull { file ->
+                    (PsiManager.getInstance(project).findFile(file) as? JsonFile)?.topLevelValue as? JsonObject
+                }.map { jsonObject ->
+                    MixinConfig(project, jsonObject)
                 }
-                .map { MixinConfig(project, it) }
         }
 
         fun getAllMixinClasses(
@@ -93,3 +97,4 @@
         }
     }
 }
+
Index: src/main/kotlin/platform/mixin/config/MixinConfig.kt
===================================================================
--- src/main/kotlin/platform/mixin/config/MixinConfig.kt	(revision 56b37648bc393ecfc073a42759ca05fc8461a3be)
+++ src/main/kotlin/platform/mixin/config/MixinConfig.kt	(revision 6f62f3e7f0c7074b41e80154ddba7f430d1aa13f)
@@ -147,6 +147,8 @@
     }
 
     private fun reformat() {
+        if(json.containingFile.name.endsWith(".json5")) return
+
         json = CodeStyleManager.getInstance(project).reformat(json) as JsonObject
         file?.let { file ->
             val psiFile = PsiManager.getInstance(project).findFile(file) as? JsonFile ?: return