combine 2 util classes

PaperMC · Aug 3, 2023 · d679934 · d679934
1 parent 80771c5
commit d679934
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 50 deletions.
diff --git a/src/main/java/io/papermc/codebook/lvt/LvtUtil.java b/src/main/java/io/papermc/codebook/lvt/LvtUtil.java
@@ -25,6 +25,7 @@
 import dev.denwav.hypo.asm.HypoAsmUtil;
 import dev.denwav.hypo.model.data.types.JvmType;
 import java.util.Arrays;
+import java.util.List;
 import java.util.function.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.objectweb.asm.Type;
@@ -71,6 +72,21 @@ public static String findNextWord(final int start, final String str) {
         return nextWord.toString();
     }
 
+    public static @Nullable String tryMatchPrefix(final String methodName, final List<String> possiblePrefixes) {
+        // skip any exact match
+        if (possiblePrefixes.contains(methodName)) {
+            return null;
+        }
+        @Nullable String prefix = null;
+        for (final String possiblePrefix : possiblePrefixes) {
+            if (hasPrefix(methodName, possiblePrefix)) {
+                prefix = possiblePrefix;
+                break;
+            }
+        }
+        return prefix;
+    }
+
     public static boolean isStringAllUppercase(final String input) {
         for (int i = 0; i < input.length(); i++) {
             final char ch = input.charAt(i);

diff --git a/src/main/java/io/papermc/codebook/lvt/suggestion/SingleVerbSuggester.java b/src/main/java/io/papermc/codebook/lvt/suggestion/SingleVerbSuggester.java
@@ -23,7 +23,7 @@
 package io.papermc.codebook.lvt.suggestion;
 
 import static io.papermc.codebook.lvt.LvtUtil.decapitalize;
-import static io.papermc.codebook.lvt.suggestion.SuggestionUtil.tryMatchPrefix;
+import static io.papermc.codebook.lvt.LvtUtil.tryMatchPrefix;
 
 import io.papermc.codebook.lvt.suggestion.context.ContainerContext;
 import io.papermc.codebook.lvt.suggestion.context.method.MethodCallContext;

diff --git a/src/main/java/io/papermc/codebook/lvt/suggestion/SuggestionUtil.java b/src/main/java/io/papermc/codebook/lvt/suggestion/SuggestionUtil.java
diff --git a/src/main/java/io/papermc/codebook/lvt/suggestion/VerbPrefixBooleanSuggester.java b/src/main/java/io/papermc/codebook/lvt/suggestion/VerbPrefixBooleanSuggester.java
@@ -22,7 +22,7 @@
 
 package io.papermc.codebook.lvt.suggestion;
 
-import static io.papermc.codebook.lvt.suggestion.SuggestionUtil.tryMatchPrefix;
+import static io.papermc.codebook.lvt.LvtUtil.tryMatchPrefix;
 
 import dev.denwav.hypo.model.data.types.PrimitiveType;
 import io.papermc.codebook.lvt.suggestion.context.ContainerContext;