Penalised keyword items in autocomplete suggestions

src/main/java/noppes/npcs/client/gui/util/script/autocomplete/JavaAutocompleteProvider.java

@@ -368,6 +368,7 @@ public class JavaAutocompleteProvider implements AutocompleteProvider {
                 applyUsageBoost(item, tracker, ownerFullName);
                 applyStaticPenalty(item, isMemberAccess, isStaticContext);
                 applyObjectMethodPenalty(item);
+                applyKeywordPenalty(item, prefix);
             }
             return;
         }
@@ -387,6 +388,7 @@ public class JavaAutocompleteProvider implements AutocompleteProvider {
                 applyUsageBoost(item, tracker, ownerFullName);
                 applyStaticPenalty(item, isMemberAccess, isStaticContext);
                 applyObjectMethodPenalty(item);
+                applyKeywordPenalty(item, prefix);
             }
         }
     }
@@ -454,6 +456,19 @@ public class JavaAutocompleteProvider implements AutocompleteProvider {
             item.addScoreBoost(-10000);
         }
     }
+
+    /**
+     * Push keywords below non-keywords unless user typed a longer prefix.
+     */
+    protected void applyKeywordPenalty(AutocompleteItem item, String prefix) {
+        if (item.getKind() != AutocompleteItem.Kind.KEYWORD) {
+            return;
+        }
+
+        if (prefix == null || prefix.length() < 2) {
+            item.addScoreBoost(-10000);
+        }
+    }
     
     /**
      * Builder class for AutocompleteItem to handle cases without source data.