Fix previous commit

Astrarre · Nov 10, 2021 · 8918abd · 8918abd
1 parent 88b0631
commit 8918abd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/StringUtility.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/StringUtility.java
@@ -67,7 +67,7 @@ public static boolean isClassDesc(String text) {
 	}
 
 	private static final Pattern FIELD_DESC_PATTERN = Pattern.compile("\\[*(" + CLASS_DESC_PATTERN +"|[BCDFIJSZ])");
-	private static final Pattern METHOD_DESC_PATTERN = Pattern.compile("\\(" + FIELD_DESC_PATTERN + "*\\)(" + FIELD_DESC_PATTERN + "|V)");
+	private static final Pattern METHOD_DESC_PATTERN = Pattern.compile("\\((" + FIELD_DESC_PATTERN + ")*\\)(" + FIELD_DESC_PATTERN + "|V)");
 
 	public static boolean isFieldDesc(String text) {
 		return FIELD_DESC_PATTERN.matcher(text).matches();

diff --git a/src/test/java/net/fabricmc/tinyremapper/extension/mixin/common/StringUtilityTest.java b/src/test/java/net/fabricmc/tinyremapper/extension/mixin/common/StringUtilityTest.java
@@ -63,7 +63,7 @@ void isClassName() {
 		assertTrue(StringUtility.isClassName("com/github/logicf/$$__cl_a_ss"));
 		assertTrue(StringUtility.isClassName("com/gith$$ub/log$$icf/cla$$ss"));
 		assertTrue(StringUtility.isClassName("$$/__"));
-		assertFalse(StringUtility.isClassName("abc"));
+		assertTrue(StringUtility.isClassName("abc"));
 		assertFalse(StringUtility.isClassName("com/github/logicf/"));
 		assertFalse(StringUtility.isClassName("com//github/logicf"));
 		assertFalse(StringUtility.isClassName("com.github.logicf.class"));
@@ -75,7 +75,7 @@ void isClassDesc() {
 		assertTrue(StringUtility.isClassDesc("Lcom/github/logicf/$$__cl_a_ss;"));
 		assertTrue(StringUtility.isClassDesc("Lcom/gith$$ub/log$$icf/cla$$ss;"));
 		assertTrue(StringUtility.isClassDesc("L$$/__;"));
-		assertFalse(StringUtility.isClassDesc("Labc;"));
+		assertTrue(StringUtility.isClassDesc("Labc;"));
 		assertFalse(StringUtility.isClassDesc("Lcom/github/logicf/;"));
 		assertFalse(StringUtility.isClassDesc("Lcom//github/logicf;"));
 		assertFalse(StringUtility.isClassDesc("Lcom.github.logicf.class;"));
@@ -134,6 +134,6 @@ void isInternalClassName() {
 		assertTrue(StringUtility.isInternalClassName("java/lang/Boolean"));
 		assertTrue(StringUtility.isInternalClassName("javax/crypto/Cipher"));
 		assertFalse(StringUtility.isInternalClassName("net/minecraft/bla"));
-		assertThrows(RuntimeException.class, () -> StringUtility.isInternalClassName("bla"));
+		assertThrows(RuntimeException.class, () -> StringUtility.isInternalClassName("()bla"));
 	}
 }