Loading...
Comment:
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]>
Status: all builds with this change have finished
Revision: dec3e63ba62b9f6aaea5ad6a21bc011fe087b08c VCS Roots: minecraft-dev/MinecraftDev (Git), minecraft-dev/MinecraftDev Nightly (Git)
Parent revisions: b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8  
User: Unknown (none of TeamCity users defined llamalad7 username in their VCS username settings)

Edit change description

Here you can change the description in TeamCity only. You may consider changing it in the VCS as well, to avoid an ambiguity and inconsistency.

Cancel
Changed: 33 files (3 added, 30 edited) in
Download patch
Download patch to IDE
Open in GitHub
edited mixin-test-data/src/main/java/com/demonwav/mcdev/mixintestdata/ambiguousReference/MixedIn.java
edited src/main/kotlin/platform/mixin/action/CopyMixinTargetReferenceAction.kt
edited src/main/kotlin/platform/mixin/expression/MEDefinitionFoldingBuilder.kt
edited src/main/kotlin/platform/mixin/expression/MEExpressionMatchUtil.kt
edited src/main/kotlin/platform/mixin/expression/MESourceMatchContext.kt
edited src/main/kotlin/platform/mixin/folding/MixinTargetDescriptorFoldingBuilder.kt
edited src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt
edited src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt
edited src/main/kotlin/platform/mixin/handlers/MixinMemberAnnotationHandler.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/AtResolver.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/ConstantStringMethodInjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/FieldInjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/InjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/InvokeAssignInjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/InvokeInjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/injectionPoint/NewInsnInjectionPoint.kt
edited src/main/kotlin/platform/mixin/handlers/mixinextras/ExpressionInjectionPoint.kt
edited src/main/kotlin/platform/mixin/inspection/MixinAnnotationTargetInspection.kt
edited src/main/kotlin/platform/mixin/inspection/injector/InvalidInjectorMethodSignatureInspection.kt
edited src/main/kotlin/platform/mixin/inspection/reference/AmbiguousReferenceInspection.kt
edited src/main/kotlin/platform/mixin/inspection/reference/UnnecessaryQualifiedMemberReferenceInspection.kt
edited src/main/kotlin/platform/mixin/reference/AbstractMethodReference.kt
edited src/main/kotlin/platform/mixin/reference/MixinSelectors.kt
edited src/main/kotlin/platform/mixin/reference/target/DefinitionReferences.kt
edited src/main/kotlin/platform/mixin/reference/target/TargetReference.kt
edited src/main/kotlin/platform/mixin/util/AsmUtil.kt
added src/main/kotlin/platform/mixin/util/MemberInfo.kt
added src/main/kotlin/util/MemberMatcher.kt
edited src/main/kotlin/util/MemberReference.kt
added src/main/kotlin/util/Quantifier.kt
edited src/main/kotlin/util/sequences.kt
edited src/test/kotlin/platform/mixin/AmbiguousReferenceInspectionTest.kt
edited src/test/kotlin/platform/mixin/InvalidInjectorMethodSignatureInspectionTest.kt

Add build comment

Cancel

Mute test

Server communication failure

Server is unavailable

Server stopped or communication with the server is not possible due to network failure.

Server shutdown started.

Please relogin to continue your work.

Run custom build

TODO

Loading related builds...
Cancel

Responsibility

Edit tags

Cancel

Loading...

Are you sure?

Cancel

Please type to confirm.
Cancel