src/main/kotlin/platform/mixin/expression/MEDefinitionFoldingBuilder.kt diff

← → edited src/main/kotlin/platform/mixin/expression/MEDefinitionFoldingBuilder.kt

Ignore whitespaces Open in IDE

⁠ llamalad7: Feature/mixin quantifiers (#2643 )

* Refactor: Split MemberInfo and MemberReference.

Mixin MemberInfo strings are only tangentially related to concrete MemberReferences. We also introduce a MemberMatcher superinterface for resolving things.

* Refactor: Parse MemberInfos properly and represent Quantifiers.

* Fix: Handle all cases properly in AmbiguousReferenceInspection.

Really nothing is "ambiguous" (except perhaps to the reader), it's just that Mixin's default behaviour of matching the first method in a given class is unexpected, but I'll leave the terminology for now. Adding any explicit quantifier suppresses this inspection, including `{1}` if that's really what's desired.

Additionally, adding a wildcard is almost never the correct fix. Choosing one of the available descriptors is what should be offered instead, but I'll leave that too for now.

* New: Handle maximum values in quantifiers.

* Fix: Fix incorrect filter stats emptiness check.

Causes targets not to show as unresolved when they should.

* New: Handle minimum values in quantifiers.

* Fix: Account for individual Mixin `method` strings contributing multiple methods.

* Fix: Don't report injector signature issues in methods where we find no targets.

* Move insn resolution failure message to field in failure class, and add message for min quantifier not satisfied

---------

Co-authored-by: joe <[email protected]>

Copy Copy

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2025 minecraft-dev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, version 3.0 only.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package com.demonwav.mcdev.platform.mixin.expression

import com.demonwav.mcdev.platform.mixin.MixinModuleType
import com.demonwav.mcdev.platform.mixin.folding.MixinFoldingSettings
import com.demonwav.mcdev.platform.mixin.reference.target.FieldDefinitionReference
import com.demonwav.mcdev.platform.mixin.reference.target.MethodDefinitionReference
import com.demonwav.mcdev.platform.mixin.util.MixinConstants
import com.demonwav.mcdev.util.MemberReference
import com.intellij.lang.ASTNode
import com.intellij.lang.folding.CustomFoldingBuilder
import com.intellij.lang.folding.FoldingDescriptor
import com.intellij.openapi.editor.Document
import com.intellij.openapi.util.TextRange
import com.intellij.psi.JavaRecursiveElementWalkingVisitor
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiLiteralExpression
import com.intellij.psi.PsiModifierList
import com.intellij.psi.util.PsiTreeUtil

class MEDefinitionFoldingBuilder : CustomFoldingBuilder() {
override fun isDumbAware() = false

override fun isRegionCollapsedByDefault(node: ASTNode): Boolean =
MixinFoldingSettings.instance.state.foldDefinitions

override fun getLanguagePlaceholderText(node: ASTNode, range: TextRange): String {
val psi = node.psi
if (psi is PsiLiteralExpression) {
val value = psi.value as? String ?: return "..."
val memberReference = MemberReference.parse(value) ?: return "..."
return memberReference.presentableText
}
return "..."
}

override fun buildLanguageFoldRegions(
descriptors: MutableList<FoldingDescriptor>,
root: PsiElement,
document: Document,
quick: Boolean
) {
if (root !is PsiJavaFile || !MixinModuleType.isInModule(root)) {
return
}

root.accept(Visitor(descriptors))
}

private class Visitor(private val descriptors: MutableList<FoldingDescriptor>) :
JavaRecursiveElementWalkingVisitor() {
override fun visitModifierList(list: PsiModifierList) {
val currentDefinitionList = mutableListOf<PsiAnnotation>()
val definitionLists = mutableListOf<List<PsiAnnotation>>()

for (annotation in list.annotations) {
if (annotation.hasQualifiedName(MixinConstants.MixinExtras.DEFINITION)) {
currentDefinitionList += annotation
} else if (currentDefinitionList.isNotEmpty()) {
definitionLists += currentDefinitionList.toList()
currentDefinitionList.clear()
}
}

if (currentDefinitionList.isNotEmpty()) {
definitionLists += currentDefinitionList
}

if (definitionLists.isEmpty()) {
return
}

for (definitionList in definitionLists) {
val range = TextRange(
definitionList.first().parameterList.firstChild.nextSibling.textRange.startOffset,
PsiTreeUtil.getDeepestVisibleLast(definitionList.last())!!.textRange.startOffset,
)
if (!range.isEmpty) {
descriptors.add(FoldingDescriptor(list.node, range))
}
}

super.visitModifierList(list)
}

override fun visitLiteralExpression(expression: PsiLiteralExpression) {
if (FieldDefinitionReference.ELEMENT_PATTERN.accepts(expression) ||
MethodDefinitionReference.ELEMENT_PATTERN.accepts(expression)
) {
if (MemberReference.parse(expression.value as String) != null) {
descriptors.add(FoldingDescriptor(expression.node, expression.textRange))
}
}
}
}
}

/*
* Minecraft Development for IntelliJ
*
* https://mcdev.io/
*
* Copyright (C) 2026 minecraft-dev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, version 3.0 only.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package com.demonwav.mcdev.platform.mixin.expression

import com.demonwav.mcdev.platform.mixin.MixinModuleType
import com.demonwav.mcdev.platform.mixin.folding.MixinFoldingSettings
import com.demonwav.mcdev.platform.mixin.reference.target.FieldDefinitionReference
import com.demonwav.mcdev.platform.mixin.reference.target.MethodDefinitionReference
import com.demonwav.mcdev.platform.mixin.util.MemberInfo
import com.demonwav.mcdev.platform.mixin.util.MixinConstants
import com.demonwav.mcdev.util.MemberReference
import com.intellij.lang.ASTNode
import com.intellij.lang.folding.CustomFoldingBuilder
import com.intellij.lang.folding.FoldingDescriptor
import com.intellij.openapi.editor.Document
import com.intellij.openapi.util.TextRange
import com.intellij.psi.JavaRecursiveElementWalkingVisitor
import com.intellij.psi.PsiAnnotation
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiLiteralExpression
import com.intellij.psi.PsiModifierList
import com.intellij.psi.util.PsiTreeUtil

class MEDefinitionFoldingBuilder : CustomFoldingBuilder() {
override fun isDumbAware() = false

override fun isRegionCollapsedByDefault(node: ASTNode): Boolean =
MixinFoldingSettings.instance.state.foldDefinitions

override fun getLanguagePlaceholderText(node: ASTNode, range: TextRange): String {
val psi = node.psi
if (psi is PsiLiteralExpression) {
val value = psi.value as? String ?: return "..."
val memberInfo = MemberInfo.parse(value) ?: return "..."
return MemberReference(memberInfo.name ?: "*", memberInfo.descriptor, memberInfo.owner).presentableText
}
return "..."
}

override fun buildLanguageFoldRegions(
descriptors: MutableList<FoldingDescriptor>,
root: PsiElement,
document: Document,
quick: Boolean
) {
if (root !is PsiJavaFile || !MixinModuleType.isInModule(root)) {
return
}

root.accept(Visitor(descriptors))
}

private class Visitor(private val descriptors: MutableList<FoldingDescriptor>) :
JavaRecursiveElementWalkingVisitor() {
override fun visitModifierList(list: PsiModifierList) {
val currentDefinitionList = mutableListOf<PsiAnnotation>()
val definitionLists = mutableListOf<List<PsiAnnotation>>()

for (annotation in list.annotations) {
if (annotation.hasQualifiedName(MixinConstants.MixinExtras.DEFINITION)) {
currentDefinitionList += annotation
} else if (currentDefinitionList.isNotEmpty()) {
definitionLists += currentDefinitionList.toList()
currentDefinitionList.clear()
}
}

if (currentDefinitionList.isNotEmpty()) {
definitionLists += currentDefinitionList
}

if (definitionLists.isEmpty()) {
return
}

for (definitionList in definitionLists) {
val range = TextRange(
definitionList.first().parameterList.firstChild.nextSibling.textRange.startOffset,
PsiTreeUtil.getDeepestVisibleLast(definitionList.last())!!.textRange.startOffset,
)
if (!range.isEmpty) {
descriptors.add(FoldingDescriptor(list.node, range))
}
}

super.visitModifierList(list)
}

override fun visitLiteralExpression(expression: PsiLiteralExpression) {
if (FieldDefinitionReference.ELEMENT_PATTERN.accepts(expression) ||
MethodDefinitionReference.ELEMENT_PATTERN.accepts(expression)
) {
if (MemberInfo.parse(expression.value as String) != null) {
descriptors.add(FoldingDescriptor(expression.node, expression.textRange))
}
}
}
}
}

/* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2025 minecraft-dev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published * by the Free Software Foundation, version 3.0 only. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package com.demonwav.mcdev.platform.mixin.expression import com.demonwav.mcdev.platform.mixin.MixinModuleType import com.demonwav.mcdev.platform.mixin.folding.MixinFoldingSettings import com.demonwav.mcdev.platform.mixin.reference.target.FieldDefinitionReference import com.demonwav.mcdev.platform.mixin.reference.target.MethodDefinitionReference import com.demonwav.mcdev.platform.mixin.util.MixinConstants import com.demonwav.mcdev.util.MemberReference import com.intellij.lang.ASTNode import com.intellij.lang.folding.CustomFoldingBuilder import com.intellij.lang.folding.FoldingDescriptor import com.intellij.openapi.editor.Document import com.intellij.openapi.util.TextRange import com.intellij.psi.JavaRecursiveElementWalkingVisitor import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiElement import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiLiteralExpression import com.intellij.psi.PsiModifierList import com.intellij.psi.util.PsiTreeUtil class MEDefinitionFoldingBuilder : CustomFoldingBuilder() { override fun isDumbAware() = false override fun isRegionCollapsedByDefault(node: ASTNode): Boolean = MixinFoldingSettings.instance.state.foldDefinitions override fun getLanguagePlaceholderText(node: ASTNode, range: TextRange): String { val psi = node.psi if (psi is PsiLiteralExpression) { val value = psi.value as? String ?: return "..." val memberReference = MemberReference.parse(value) ?: return "..." return memberReference.presentableText } return "..." } override fun buildLanguageFoldRegions( descriptors: MutableList<FoldingDescriptor>, root: PsiElement, document: Document, quick: Boolean ) { if (root !is PsiJavaFile || !MixinModuleType.isInModule(root)) { return } root.accept(Visitor(descriptors)) } private class Visitor(private val descriptors: MutableList<FoldingDescriptor>) : JavaRecursiveElementWalkingVisitor() { override fun visitModifierList(list: PsiModifierList) { val currentDefinitionList = mutableListOf<PsiAnnotation>() val definitionLists = mutableListOf<List<PsiAnnotation>>() for (annotation in list.annotations) { if (annotation.hasQualifiedName(MixinConstants.MixinExtras.DEFINITION)) { currentDefinitionList += annotation } else if (currentDefinitionList.isNotEmpty()) { definitionLists += currentDefinitionList.toList() currentDefinitionList.clear() } } if (currentDefinitionList.isNotEmpty()) { definitionLists += currentDefinitionList } if (definitionLists.isEmpty()) { return } for (definitionList in definitionLists) { val range = TextRange( definitionList.first().parameterList.firstChild.nextSibling.textRange.startOffset, PsiTreeUtil.getDeepestVisibleLast(definitionList.last())!!.textRange.startOffset, ) if (!range.isEmpty) { descriptors.add(FoldingDescriptor(list.node, range)) } } super.visitModifierList(list) } override fun visitLiteralExpression(expression: PsiLiteralExpression) { if (FieldDefinitionReference.ELEMENT_PATTERN.accepts(expression) || MethodDefinitionReference.ELEMENT_PATTERN.accepts(expression) ) { if (MemberReference.parse(expression.value as String) != null) { descriptors.add(FoldingDescriptor(expression.node, expression.textRange)) } } } } } /* * Minecraft Development for IntelliJ * * https://mcdev.io/ * * Copyright (C) 2026 minecraft-dev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published * by the Free Software Foundation, version 3.0 only. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package com.demonwav.mcdev.platform.mixin.expression import com.demonwav.mcdev.platform.mixin.MixinModuleType import com.demonwav.mcdev.platform.mixin.folding.MixinFoldingSettings import com.demonwav.mcdev.platform.mixin.reference.target.FieldDefinitionReference import com.demonwav.mcdev.platform.mixin.reference.target.MethodDefinitionReference import com.demonwav.mcdev.platform.mixin.util.MemberInfo import com.demonwav.mcdev.platform.mixin.util.MixinConstants import com.demonwav.mcdev.util.MemberReference import com.intellij.lang.ASTNode import com.intellij.lang.folding.CustomFoldingBuilder import com.intellij.lang.folding.FoldingDescriptor import com.intellij.openapi.editor.Document import com.intellij.openapi.util.TextRange import com.intellij.psi.JavaRecursiveElementWalkingVisitor import com.intellij.psi.PsiAnnotation import com.intellij.psi.PsiElement import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiLiteralExpression import com.intellij.psi.PsiModifierList import com.intellij.psi.util.PsiTreeUtil class MEDefinitionFoldingBuilder : CustomFoldingBuilder() { override fun isDumbAware() = false override fun isRegionCollapsedByDefault(node: ASTNode): Boolean = MixinFoldingSettings.instance.state.foldDefinitions override fun getLanguagePlaceholderText(node: ASTNode, range: TextRange): String { val psi = node.psi if (psi is PsiLiteralExpression) { val value = psi.value as? String ?: return "..." val memberInfo = MemberInfo.parse(value) ?: return "..." return MemberReference(memberInfo.name ?: "*", memberInfo.descriptor, memberInfo.owner).presentableText } return "..." } override fun buildLanguageFoldRegions( descriptors: MutableList<FoldingDescriptor>, root: PsiElement, document: Document, quick: Boolean ) { if (root !is PsiJavaFile || !MixinModuleType.isInModule(root)) { return } root.accept(Visitor(descriptors)) } private class Visitor(private val descriptors: MutableList<FoldingDescriptor>) : JavaRecursiveElementWalkingVisitor() { override fun visitModifierList(list: PsiModifierList) { val currentDefinitionList = mutableListOf<PsiAnnotation>() val definitionLists = mutableListOf<List<PsiAnnotation>>() for (annotation in list.annotations) { if (annotation.hasQualifiedName(MixinConstants.MixinExtras.DEFINITION)) { currentDefinitionList += annotation } else if (currentDefinitionList.isNotEmpty()) { definitionLists += currentDefinitionList.toList() currentDefinitionList.clear() } } if (currentDefinitionList.isNotEmpty()) { definitionLists += currentDefinitionList } if (definitionLists.isEmpty()) { return } for (definitionList in definitionLists) { val range = TextRange( definitionList.first().parameterList.firstChild.nextSibling.textRange.startOffset, PsiTreeUtil.getDeepestVisibleLast(definitionList.last())!!.textRange.startOffset, ) if (!range.isEmpty) { descriptors.add(FoldingDescriptor(list.node, range)) } } super.visitModifierList(list) } override fun visitLiteralExpression(expression: PsiLiteralExpression) { if (FieldDefinitionReference.ELEMENT_PATTERN.accepts(expression) || MethodDefinitionReference.ELEMENT_PATTERN.accepts(expression) ) { if (MemberInfo.parse(expression.value as String) != null) { descriptors.add(FoldingDescriptor(expression.node, expression.textRange)) } } } } }

Add build comment

Mute test

Server communication failure

Run custom build

TODO

Responsibility

Edit tags

Loading...

Are you sure?