diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index f4f1566cb..e23b3c164 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -729,37 +729,47 @@ public class GuiScriptTextArea extends GuiNpcTextField { }); // UNDO: Restore last edit from undo list + // Works in search bar. KEYS.UNDO.setTask(e -> { - if (!e.isPress() || !isActive.get()) + if (!e.isPress() || !isActive.get() && !searchBar.isVisible()) return; - if (undoList.isEmpty()) - return; - undoing = true; - redoList.add(new UndoData(this.text, selection.getCursorPosition())); - UndoData data = undoList.remove(undoList.size() - 1); - setText(data.text); - selection.reset(data.cursorPosition); - undoing = false; - scrollToCursor(); - searchBar.updateMatches(); + if (searchBar.hasFocus()) { + searchBar.undo(); + } else { + if (undoList.isEmpty()) + return; + undoing = true; + redoList.add(new UndoData(this.text, selection.getCursorPosition())); + UndoData data = undoList.remove(undoList.size() - 1); + setText(data.text); + selection.reset(data.cursorPosition); + undoing = false; + scrollToCursor(); + searchBar.updateMatches(); + } }); // REDO: Restore last undone edit from redo list + // Works in search bar. KEYS.REDO.setTask(e -> { - if (!e.isPress() || !isActive.get()) + if (!e.isPress() || !isActive.get() && !searchBar.isVisible()) return; - if (redoList.isEmpty()) - return; - undoing = true; - undoList.add(new UndoData(this.text, selection.getCursorPosition())); - UndoData data = redoList.remove(redoList.size() - 1); - setText(data.text); - selection.reset(data.cursorPosition); - undoing = false; - scrollToCursor(); - searchBar.updateMatches(); + if (searchBar.hasFocus()) { + searchBar.redo(); + } else { + if (redoList.isEmpty()) + return; + undoing = true; + undoList.add(new UndoData(this.text, selection.getCursorPosition())); + UndoData data = redoList.remove(redoList.size() - 1); + setText(data.text); + selection.reset(data.cursorPosition); + undoing = false; + scrollToCursor(); + searchBar.updateMatches(); + } }); // FORMAT: Format/indent code @@ -1812,7 +1822,7 @@ public class GuiScriptTextArea extends GuiNpcTextField { // ==================== INNER CLASSES ==================== - class UndoData { + public static class UndoData { public String text; public int cursorPosition; diff --git a/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java b/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java index 72f5c52ac..f2fefd544 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java @@ -15,6 +15,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import noppes.npcs.client.gui.util.GuiScriptTextArea.UndoData; + /** * Search and Replace bar component for the script editor. * Provides IntelliJ-like search functionality with: @@ -64,6 +66,12 @@ public class SearchReplaceBar { private int searchScrollOffset = 0; private int replaceScrollOffset = 0; + // ==================== UNDO/REDO ==================== + private List searchUndoList = new ArrayList<>(); + private List searchRedoList = new ArrayList<>(); + private List replaceUndoList = new ArrayList<>(); + private List replaceRedoList = new ArrayList<>(); + // ==================== MATCHES ==================== private List matches = new ArrayList<>(); private int currentMatchIndex = -1; @@ -176,6 +184,92 @@ public class SearchReplaceBar { replaceFieldFocused = false; } + /** + * Save current state to undo list before making changes + */ + private void saveState(boolean isSearchField) { + if (isSearchField) { + searchUndoList.add(new UndoData(searchText, searchCursor)); + searchRedoList.clear(); // Clear redo on new change + } else { + replaceUndoList.add(new UndoData(replaceText, replaceCursor)); + replaceRedoList.clear(); + } + } + + /** + * Undo last change in focused field + */ + public void undo() { + if (searchFieldFocused && !searchUndoList.isEmpty()) { + UndoData data = searchUndoList.remove(searchUndoList.size() - 1); + searchRedoList.add(new UndoData(searchText, searchCursor)); + searchText = data.text; + searchCursor = data.cursorPosition; + searchSelectionStart = searchCursor; + searchSelectionEnd = searchCursor; + updateScrollOffset(true); + updateMatches(); + } else if (replaceFieldFocused && !replaceUndoList.isEmpty()) { + UndoData data = replaceUndoList.remove(replaceUndoList.size() - 1); + replaceRedoList.add(new UndoData(replaceText, replaceCursor)); + replaceText = data.text; + replaceCursor = data.cursorPosition; + replaceSelectionStart = replaceCursor; + replaceSelectionEnd = replaceCursor; + updateScrollOffset(false); + } + } + + /** + * Redo last undone change in focused field + */ + public void redo() { + if (searchFieldFocused && !searchRedoList.isEmpty()) { + UndoData data = searchRedoList.remove(searchRedoList.size() - 1); + searchUndoList.add(new UndoData(searchText, searchCursor)); + searchText = data.text; + searchCursor = data.cursorPosition; + searchSelectionStart = searchCursor; + searchSelectionEnd = searchCursor; + updateScrollOffset(true); + updateMatches(); + } else if (replaceFieldFocused && !replaceRedoList.isEmpty()) { + UndoData data = replaceRedoList.remove(replaceRedoList.size() - 1); + replaceUndoList.add(new UndoData(replaceText, replaceCursor)); + replaceText = data.text; + replaceCursor = data.cursorPosition; + replaceSelectionStart = replaceCursor; + replaceSelectionEnd = replaceCursor; + updateScrollOffset(false); + } + } + + /** + * Update scroll offset for text field to keep cursor visible + */ + private void updateScrollOffset(boolean isSearchField) { + int fieldWidth = textFieldWidth - 8; + String text = isSearchField ? searchText : replaceText; + int cursor = isSearchField ? searchCursor : replaceCursor; + String beforeCursor = cursor > 0 ? text.substring(0, cursor) : ""; + int cursorX = font.getStringWidth(beforeCursor); + int scrollOffset = isSearchField ? searchScrollOffset : replaceScrollOffset; + + // Scroll to keep cursor visible + if (cursorX - scrollOffset * 6 > fieldWidth) { + scrollOffset = Math.max(0, cursor - fieldWidth / 6); + } else if (cursor < scrollOffset) { + scrollOffset = cursor; + } + + if (isSearchField) { + searchScrollOffset = scrollOffset; + } else { + replaceScrollOffset = scrollOffset; + } + } + /** * Toggle visibility */ @@ -805,11 +899,6 @@ public class SearchReplaceBar { * @return true if input was consumed */ public boolean keyTyped(char c, int keyCode) { - if (keyCode == Keyboard.KEY_ESCAPE && visible) { - close(); - return true; - } - if (!visible || (!searchFieldFocused && !replaceFieldFocused)) return false; // Check modifier keys - don't let them trigger first-match issue @@ -824,6 +913,10 @@ public class SearchReplaceBar { return true; // Consume but don't process } + if (keyCode == Keyboard.KEY_ESCAPE) { + close(); + return true; + } if (keyCode == Keyboard.KEY_TAB && showReplace) { searchFieldFocused = !searchFieldFocused; @@ -891,6 +984,7 @@ public class SearchReplaceBar { if (hasSelection) { String selected = text.substring(Math.min(selStart, selEnd), Math.max(selStart, selEnd)); setClipboard(selected); + saveState(isSearchField); text = text.substring(0, Math.min(selStart, selEnd)) + text.substring(Math.max(selStart, selEnd)); cursor = Math.min(selStart, selEnd); selStart = selEnd = cursor; @@ -900,6 +994,7 @@ public class SearchReplaceBar { String clipboard = getClipboard(); if (clipboard != null) { clipboard = clipboard.replace("\n", "").replace("\r", ""); + saveState(isSearchField); if (hasSelection) { text = text.substring(0, Math.min(selStart, selEnd)) + clipboard + text.substring(Math.max(selStart, selEnd)); cursor = Math.min(selStart, selEnd) + clipboard.length(); @@ -911,6 +1006,7 @@ public class SearchReplaceBar { } } else if (keyCode == Keyboard.KEY_BACK) { + saveState(isSearchField); if (hasSelection) { text = text.substring(0, Math.min(selStart, selEnd)) + text.substring(Math.max(selStart, selEnd)); cursor = Math.min(selStart, selEnd); @@ -921,6 +1017,7 @@ public class SearchReplaceBar { selStart = selEnd = cursor; } else if (keyCode == Keyboard.KEY_DELETE) { + saveState(isSearchField); if (hasSelection) { text = text.substring(0, Math.min(selStart, selEnd)) + text.substring(Math.max(selStart, selEnd)); cursor = Math.min(selStart, selEnd); @@ -992,6 +1089,7 @@ public class SearchReplaceBar { cursor = text.length(); } else if (ChatAllowedCharacters.isAllowedCharacter(c)) { + saveState(isSearchField); if (hasSelection) { text = text.substring(0, Math.min(selStart, selEnd)) + c + text.substring(Math.max(selStart, selEnd)); cursor = Math.min(selStart, selEnd) + 1;