add support for the 'has' prefix

PaperMC · Jul 26, 2023 · 8617b28 · 8617b28
1 parent bebfd67
commit 8617b28
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java b/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java
@@ -41,7 +41,7 @@ private LvtAssignmentSuggester() {}
             return suggested;
         }
 
-        suggested = suggestNameFromIs(methodName, insn);
+        suggested = suggestNameFromIsOrHas(methodName, insn);
         if (suggested != null) {
             return suggested;
         }
@@ -110,16 +110,21 @@ public static String suggestNameFromRecord(final String methodName) {
         }
     }
 
-    private static @Nullable String suggestNameFromIs(final String methodName, final MethodInsnNode insn) {
+    private static @Nullable String suggestNameFromIsOrHas(final String methodName, final MethodInsnNode insn) {
         if (insn.desc == null || !insn.desc.endsWith("Z")) { // only handle methods that return booleans
             return null;
         }
 
-        if (!methodName.startsWith("is") || methodName.equals("is")) {
+        final String prefix;
+        if (!"is".equals(methodName) && methodName.startsWith("is")) {
+            prefix = "is";
+        } else if (!"has".equals(methodName) && methodName.startsWith("has")) {
+            prefix = "has";
+        } else {
             return null;
         }
 
-        if (Character.isUpperCase(methodName.charAt(2))) {
+        if (Character.isUpperCase(methodName.charAt(prefix.length()))) {
             return methodName;
         } else {
             return null;