Skip to content

Commit ec76ae4

Browse files
authored
Fix L being dropped from @shadow's (#154)
Fixes #134
1 parent c067634 commit ec76ae4

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -883,16 +883,6 @@ public static MemberInfo parse(final String input, final ISelectorContext contex
883883
if (context != null) {
884884
name = context.remap(name);
885885
}
886-
887-
int lastDotPos = name.lastIndexOf('.');
888-
int semiColonPos = name.indexOf(';');
889-
if (lastDotPos > -1) {
890-
owner = name.substring(0, lastDotPos).replace('.', '/');
891-
name = name.substring(lastDotPos + 1);
892-
} else if (semiColonPos > -1 && name.startsWith("L")) {
893-
owner = name.substring(1, semiColonPos).replace('.', '/');
894-
name = name.substring(semiColonPos + 1);
895-
}
896886

897887
int parenPos = name.indexOf('(');
898888
int colonPos = name.indexOf(':');
@@ -904,6 +894,16 @@ public static MemberInfo parse(final String input, final ISelectorContext contex
904894
name = name.substring(0, colonPos);
905895
}
906896

897+
int lastDotPos = name.lastIndexOf('.');
898+
int semiColonPos = name.indexOf(';');
899+
if (lastDotPos > -1) {
900+
owner = name.substring(0, lastDotPos).replace('.', '/');
901+
name = name.substring(lastDotPos + 1);
902+
} else if (semiColonPos > -1 && name.startsWith("L")) {
903+
owner = name.substring(1, semiColonPos).replace('.', '/');
904+
name = name.substring(semiColonPos + 1);
905+
}
906+
907907
if ((name.indexOf('/') > -1 || name.indexOf('.') > -1) && owner == null) {
908908
owner = name;
909909
name = "";

0 commit comments

Comments
 (0)