Handle isSomething methods that return a bool

PaperMC · Jul 26, 2023 · 688df27 · 688df27
1 parent e09736a
commit 688df27
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java b/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java
@@ -41,6 +41,13 @@ private LvtAssignmentSuggester() {}
             return suggested;
         }
 
+        if (insn.desc != null && insn.desc.endsWith(")Z")) { // only handle methods that return booleans
+            suggested = suggestNameFromIs(methodName);
+            if (suggested != null) {
+                return suggested;
+            }
+        }
+
         suggested = suggestNameFromAs(methodName);
         if (suggested != null) {
             return suggested;
@@ -105,6 +112,18 @@ public static String suggestNameFromRecord(final String methodName) {
         }
     }
 
+    private static @Nullable String suggestNameFromIs(final String methodName) {
+        if (!methodName.startsWith("is") || methodName.equals("is")) {
+            return null;
+        }
+
+        if (Character.isUpperCase(methodName.charAt(2))) {
+            return methodName;
+        } else {
+            return null;
+        }
+    }
+
     private static @Nullable String suggestNameFromAs(final String methodName) {
         if (!methodName.startsWith("as") || methodName.equals("as")) {
             return null;

diff --git a/src/test/resources/io/papermc/codebook/lvt/LvtAssignmentSuggesterTest.csv b/src/test/resources/io/papermc/codebook/lvt/LvtAssignmentSuggesterTest.csv
@@ -45,3 +45,6 @@ getOrCreate,io/paper/Paper,()Ljava/lang/String;,
 gettingBetter,io/paper/Paper,()Ljava/lang/String;,
 as,io/paper/paper,()Ljava/lang/String;,
 ass,io/paper/paper,()Ljava/lang/String;,
+is,io/paper/Paper,()Z,
+isValid,io/paper/Paper,()Z,isValid
+isValid,io/paper/Paper,()Ljava/lang/String;,