WIP fixed backspace behavior

Author: garfieldnate

…ualsoar/components/AutocompleteData.java …soar/components/AutocompleteContext.javasrc/main/java/edu/umich/soar/visualsoar/components/AutocompleteData.java renamed to src/main/java/edu/umich/soar/visualsoar/components/AutocompleteContext.java src/main/java/edu/umich/soar/visualsoar/components/AutocompleteData.java renamed to src/main/java/edu/umich/soar/visualsoar/components/AutocompleteContext.java

@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/** Manage the suggestion list for auto-completion of a user's typing. */
-public class AutocompleteData {
+/** Manages the suggestion list for auto-completion of a user's typing. */
+public class AutocompleteContext {
   private String currentInput;
   private final List<String> allSuggestions;
   private List<String> currentSuggestions = Collections.emptyList();
@@ -16,15 +16,15 @@ public class AutocompleteData {
    * @param currentInput The user's input so far this auto-completion.
    * @param allSuggestions All suggestions to be filtered down by the user's input
    */
-  public AutocompleteData(@NotNull String currentInput, @NotNull List<String> allSuggestions) {
+  public AutocompleteContext(@NotNull String currentInput, @NotNull List<String> allSuggestions) {
     this.currentInput = currentInput;
     this.allSuggestions = allSuggestions;
     updateSuggestions();
   }
 
   /**
-   * Append to current input string and re-filter the suggestion list to those matching the
-   * current input.
+   * Append to current input string and re-filter the suggestion list to those matching the current
+   * input.
    *
    * @param newInput character to append to the current input
    */
@@ -69,6 +69,10 @@ public List<String> filteredSuggestions() {
     return currentSuggestions;
   }
 
+  /**
+   * @param index Index of selection in current filtered suggestions
+   * @return completion using that index and the current input
+   */
   public String getCompletion(int index) {
     String selection = currentSuggestions.get(index);
     return selection.substring(currentInput.length());

src/main/java/edu/umich/soar/visualsoar/components/AutocompletePopup.java

@@ -36,7 +36,7 @@ public class AutocompletePopup extends JPopupMenu {
           KeyEvent.VK_HOME,
           KeyEvent.VK_END);
   private final JList<String> suggestionList = new JList<>();
-  private final AutocompleteData autocompleteData;
+  private final AutocompleteContext autocompleteContext;
 
   public AutocompletePopup(
       @NotNull JTextComponent parent,
@@ -45,7 +45,7 @@ public AutocompletePopup(
       @NotNull List<String> suggestions,
       @NotNull Consumer<String> onCompletion) {
     super();
-    this.autocompleteData = new AutocompleteData(inputSoFar, suggestions);
+    this.autocompleteContext = new AutocompleteContext(inputSoFar, suggestions);
 
     int maxVisibleRows = Math.min(suggestions.size(), 10); // Limit to 10 rows max
     updateSuggestionList();
@@ -59,7 +59,7 @@ public AutocompletePopup(
           public void mouseClicked(MouseEvent e) {
             int index = suggestionList.locationToIndex(e.getPoint());
             if (index >= 0) {
-              String selected = autocompleteData.getCompletion(index);
+              String selected = autocompleteContext.getCompletion(index);
               onCompletion.accept(selected);
               setVisible(false);
             }
@@ -82,10 +82,22 @@ public void mouseMoved(MouseEvent e) {
         new KeyAdapter() {
           @Override
           public void keyPressed(KeyEvent e) {
+            if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
+
+              if (autocompleteContext.canDelete()) {
+                autocompleteContext.deleteInput();
+                updateSuggestionList();
+              } else{
+                setVisible(false);
+              }
+
+              parent.dispatchEvent(e);
+              return;
+            }
             if (e.getKeyCode() == KeyEvent.VK_ENTER) {
               int index = suggestionList.getSelectedIndex();
               if (index >= 0) {
-                String selected = autocompleteData.getCompletion(index);
+                String selected = autocompleteContext.getCompletion(index);
                 onCompletion.accept(selected);
                 setVisible(false);
                 e.consume();
@@ -115,24 +127,18 @@ public void keyPressed(KeyEvent e) {
             // popup
             if (CURSOR_MOVEMENT_PASSTHROUGH_KEYS.contains(e.getKeyCode())) {
               setVisible(false);
-              parent.dispatchEvent(e); // / TODO: is this needed?
+              parent.dispatchEvent(e);
               return;
             }
           }
 
           @Override
           public void keyTyped(KeyEvent e) {
             char typedChar = e.getKeyChar();
-            if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
-              if (!autocompleteData.canDelete()) {
-                setVisible(false);
-                return;
-              }
-              autocompleteData.deleteInput();
-            } else {
-              autocompleteData.appendInput(typedChar);
+            if (Character.isDefined(typedChar) && !Character.isISOControl(typedChar)) {
+              autocompleteContext.appendInput(typedChar);
             }
-            if (autocompleteData.filteredSuggestions().isEmpty()) {
+            if (autocompleteContext.filteredSuggestions().isEmpty()) {
               // Close the popup if no suggestions match
               setVisible(false);
             }
@@ -174,7 +180,7 @@ public void keyTyped(KeyEvent e) {
   }
 
   private void updateSuggestionList() {
-    suggestionList.setListData(new Vector<>(autocompleteData.filteredSuggestions()));
+    suggestionList.setListData(new Vector<>(autocompleteContext.filteredSuggestions()));
     suggestionList.setSelectedIndex(0);
   }
 

src/main/java/edu/umich/soar/visualsoar/ruleeditor/RuleEditor.java

@@ -1883,28 +1883,6 @@ private void insertCompletion(String completion) {
     }
   }
 
-  private void updatePopupMenu(int pos, String initialUserType) {
-    if (autocompletePopup == null) {
-      return; // No active popup to update
-    }
-
-    try {
-      int caretPos = editorPane.getCaretPosition();
-      String text = editorPane.getText(0, caretPos);
-      int lastSeparator = Math.max(text.lastIndexOf(" "), text.lastIndexOf("."));
-      String currentUserType = text.substring(lastSeparator + 1);
-
-      List<String> filteredMatches = getMatchingStrings(currentUserType, text);
-      if (filteredMatches.isEmpty()) {
-        hideAutocompletePopup();
-      } else {
-        showAutocompletePopup(pos, currentUserType, filteredMatches);
-      }
-    } catch (BadLocationException ex) {
-      ex.printStackTrace();
-    }
-  }
-
     /**
      * getMatchingStrings
      * <p>