Skip to content

Commit 6f62f3e

Browse files
authored
Fix "Unused Mixin Inspection" no longer providing a quick-fix (#2378)
* fix unused mixin inspection * remove old imports
1 parent 56b3764 commit 6f62f3e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/main/kotlin/platform/mixin/MixinModule.kt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import com.demonwav.mcdev.util.nullable
3131
import com.intellij.json.psi.JsonFile
3232
import com.intellij.json.psi.JsonObject
3333
import com.intellij.openapi.fileTypes.FileTypeManager
34-
import com.intellij.openapi.fileTypes.FileTypes
3534
import com.intellij.openapi.project.Project
3635
import com.intellij.psi.JavaPsiFacade
3736
import com.intellij.psi.PsiClass
@@ -54,19 +53,24 @@ class MixinModule(facet: MinecraftFacet) : AbstractModule(facet) {
5453
override val icon: Icon? = null
5554

5655
companion object {
57-
private val mixinFileType by lazy {
58-
FileTypeManager.getInstance().findFileTypeByName("Mixin Configuration") ?: FileTypes.UNKNOWN
56+
private val mixinFileTypes by lazy {
57+
listOfNotNull(
58+
FileTypeManager.getInstance().findFileTypeByName("Mixin Json Configuration"),
59+
FileTypeManager.getInstance().findFileTypeByName("Mixin Json5 Configuration")
60+
)
5961
}
6062

6163
fun getMixinConfigs(
6264
project: Project,
6365
scope: GlobalSearchScope,
6466
): Collection<MixinConfig> {
65-
return FileTypeIndex.getFiles(mixinFileType, scope)
66-
.mapNotNull {
67-
(PsiManager.getInstance(project).findFile(it) as? JsonFile)?.topLevelValue as? JsonObject
67+
return mixinFileTypes
68+
.flatMap { FileTypeIndex.getFiles(it, scope) }
69+
.mapNotNull { file ->
70+
(PsiManager.getInstance(project).findFile(file) as? JsonFile)?.topLevelValue as? JsonObject
71+
}.map { jsonObject ->
72+
MixinConfig(project, jsonObject)
6873
}
69-
.map { MixinConfig(project, it) }
7074
}
7175

7276
fun getAllMixinClasses(
@@ -93,3 +97,4 @@ class MixinModule(facet: MinecraftFacet) : AbstractModule(facet) {
9397
}
9498
}
9599
}
100+

src/main/kotlin/platform/mixin/config/MixinConfig.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ class MixinConfig(private val project: Project, private var json: JsonObject) {
147147
}
148148

149149
private fun reformat() {
150+
if(json.containingFile.name.endsWith(".json5")) return
151+
150152
json = CodeStyleManager.getInstance(project).reformat(json) as JsonObject
151153
file?.let { file ->
152154
val psiFile = PsiManager.getInstance(project).findFile(file) as? JsonFile ?: return

0 commit comments

Comments
 (0)