Make token separators configurable

Bios-Marcel · Jul 20, 2024 · af9359d · af9359d
1 parent df821f9
commit af9359d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/src/main/java/link/biosmarcel/baka/view/AutocompleteField.java b/src/main/java/link/biosmarcel/baka/view/AutocompleteField.java
@@ -9,8 +9,10 @@
 import java.util.function.Function;
 
 public class AutocompleteField extends AutocompleteInput {
-    public AutocompleteField(Function<String, List<String>> autocompleteGenerator) {
-        super(autocompleteGenerator);
+    public AutocompleteField(
+            final char[] tokenSeparators,
+            final Function<String, List<String>> autocompleteGenerator) {
+        super(tokenSeparators, autocompleteGenerator);
     }
 
     @Override

diff --git a/src/main/java/link/biosmarcel/baka/view/AutocompleteInput.java b/src/main/java/link/biosmarcel/baka/view/AutocompleteInput.java
@@ -22,13 +22,17 @@ public abstract class AutocompleteInput {
     private final Pane pane;
     private final ListView<String> completionList;
     private final Function<String, List<String>> autocompleteGenerator;
+    private final char[] tokenSeparators;
 
     protected final TextInputControl input;
 
-    public AutocompleteInput(final Function<String, List<String>> autocompleteGenerator) {
+    public AutocompleteInput(
+            final char[] tokenSeparators,
+            final Function<String, List<String>> autocompleteGenerator) {
         pane = new Pane();
         input = createInput();
         completionList = new ListView<>();
+        this.tokenSeparators = tokenSeparators;
         this.autocompleteGenerator = autocompleteGenerator;
 
         // This is what is the Z-Index on the web. It allows us to render our popup above everything else.
@@ -108,8 +112,6 @@ private boolean canShowPopup() {
         return input.isFocused() && !input.isDisabled();
     }
 
-    private static final char[] autocompleteAfterChars = new char[]{')', '(', ' ', '\n'};
-
     private void complete() {
         final String selectedItem = completionList.getSelectionModel().getSelectedItem();
         // selection is always nullable
@@ -121,7 +123,7 @@ private void complete() {
         final var textBeforeCaret = input.getText().substring(0, input.getCaretPosition());
 
         int autocompleteTo = -1;
-        for (final char c : autocompleteAfterChars) {
+        for (final char c : tokenSeparators) {
             autocompleteTo = Integer.max(textBeforeCaret.lastIndexOf(c), autocompleteTo);
         }
 

diff --git a/src/main/java/link/biosmarcel/baka/view/AutocompleteTextArea.java b/src/main/java/link/biosmarcel/baka/view/AutocompleteTextArea.java
@@ -9,8 +9,11 @@
 import java.util.function.Function;
 
 public class AutocompleteTextArea extends AutocompleteInput {
-    public AutocompleteTextArea(Function<String, List<String>> autocompleteGenerator) {
-        super(autocompleteGenerator);
+    public AutocompleteTextArea(
+            final char[] tokenSeparators,
+            final Function<String, List<String>> autocompleteGenerator
+    ) {
+        super(tokenSeparators, autocompleteGenerator);
     }
 
     @Override

diff --git a/src/main/java/link/biosmarcel/baka/view/ClassificationsView.java b/src/main/java/link/biosmarcel/baka/view/ClassificationsView.java
@@ -47,7 +47,10 @@ protected void updateItem(@Nullable ClassificationRuleFX item, boolean empty) {
         selectedRuleProperty = listView.getSelectionModel().selectedItemProperty();
         nameField = new TextField();
         tagField = new TextField();
-        queryField = new AutocompleteTextArea(new FilterAutocompleteGenerator(new PaymentFilter())::generate);
+        queryField = new AutocompleteTextArea(
+                new char[]{')', '(', ' ', '\n'},
+                new FilterAutocompleteGenerator(new PaymentFilter())::generate
+        );
 
         final BooleanBinding disableInputs = Bindings.createBooleanBinding(() -> selectedRuleProperty.getValue() == null, selectedRuleProperty);
         selectedRuleProperty.addListener((_, oldValue, newValue) -> {

diff --git a/src/main/java/link/biosmarcel/baka/view/PaymentsView.java b/src/main/java/link/biosmarcel/baka/view/PaymentsView.java
@@ -81,7 +81,10 @@ public PaymentsView(ApplicationState state) {
 
         details = new PaymentDetails(state);
 
-        final var filterField = new AutocompleteField(new FilterAutocompleteGenerator(new PaymentFilter())::generate);
+        final var filterField = new AutocompleteField(
+                new char[]{')', '(', ' ', '\n'},
+                new FilterAutocompleteGenerator(new PaymentFilter())::generate
+        );
         final var filter = new PaymentFilter();
         filterField.textProperty().addListener((_, _, newText) -> {
             try {