From a37dd308a12e08288ece91667fe06fcb952428a0 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 11 Mar 2026 03:12:23 +0200 Subject: [PATCH 1/2] Turned off debug printlns --- .../interpreter/js_parser/DtsModScanner.java | 4 ++-- .../interpreter/js_parser/JSTypeRegistry.java | 24 +++++++++---------- .../script/interpreter/method/MethodInfo.java | 8 +++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DtsModScanner.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DtsModScanner.java index d30503e8b..938e334b1 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DtsModScanner.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DtsModScanner.java @@ -47,9 +47,9 @@ final class DtsModScanner { for (DtsFileRef ref : dtsFiles) { domainCounts.put(ref.getDomain(), domainCounts.getOrDefault(ref.getDomain(), 0) + 1); } - System.out.println("[JSTypeRegistry] Found " + dtsFiles.size() + " .d.ts files across " + domainCounts.size() + " domains"); +// System.out.println("[JSTypeRegistry] Found " + dtsFiles.size() + " .d.ts files across " + domainCounts.size() + " domains"); for (Map.Entry entry : domainCounts.entrySet()) { - System.out.println("[JSTypeRegistry] Domain " + entry.getKey() + ": " + entry.getValue() + " files"); +// System.out.println("[JSTypeRegistry] Domain " + entry.getKey() + ": " + entry.getValue() + " files"); } } diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/JSTypeRegistry.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/JSTypeRegistry.java index 83e11d317..c08711051 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/JSTypeRegistry.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/JSTypeRegistry.java @@ -93,7 +93,7 @@ public class JSTypeRegistry { if (dtsFiles.isEmpty()) { Set fallbackFiles = findAllDtsFilesInResources("assets/customnpcs/api"); - System.out.println("[JSTypeRegistry] Found " + fallbackFiles.size() + " .d.ts files in resources"); + // System.out.println("[JSTypeRegistry] Found " + fallbackFiles.size() + " .d.ts files in resources"); if (fallbackFiles.contains("hooks.d.ts")) { loadResourceFile(parser, "hooks.d.ts"); @@ -126,7 +126,7 @@ public class JSTypeRegistry { registerES5Builtins(); initialized = true; - System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks from resources"); + // System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks from resources"); } catch (Exception e) { System.err.println("[JSTypeRegistry] Failed to load type definitions from resources: " + e.getMessage()); e.printStackTrace(); @@ -276,7 +276,7 @@ public class JSTypeRegistry { } } catch (Exception e) { // File might not exist, that's ok - System.out.println("[JSTypeRegistry] Could not load " + fileName + ": " + e.getMessage()); + // System.out.println("[JSTypeRegistry] Could not load " + fileName + ": " + e.getMessage()); } } @@ -294,7 +294,7 @@ public class JSTypeRegistry { resolveAllJSDocTypes(); resolveInheritance(); initialized = true; - System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks"); + // System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks"); } catch (IOException e) { System.err.println("[JSTypeRegistry] Failed to load type definitions: " + e.getMessage()); e.printStackTrace(); @@ -315,7 +315,7 @@ public class JSTypeRegistry { resolveAllJSDocTypes(); resolveInheritance(); initialized = true; - System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks from VSIX"); + // System.out.println("[JSTypeRegistry] Loaded " + types.size() + " types, " + hooks.size() + " hooks from VSIX"); } catch (IOException e) { System.err.println("[JSTypeRegistry] Failed to load VSIX: " + e.getMessage()); e.printStackTrace(); @@ -360,7 +360,7 @@ public class JSTypeRegistry { if (!typesByJavaFqn.containsKey(javaFqn)) { typesByJavaFqn.put(javaFqn, type); } else { - System.out.println("[JSTypeRegistry] Duplicate javaFqn " + javaFqn + " from " + getCurrentSource()); + // System.out.println("[JSTypeRegistry] Duplicate javaFqn " + javaFqn + " from " + getCurrentSource()); } } } @@ -1048,13 +1048,13 @@ public class JSTypeRegistry { private void logTypeCollision(String fullName, String incomingSource) { String existingSource = typeOrigins.getOrDefault(fullName, "unknown"); - System.out.println("[JSTypeRegistry] Duplicate type " + fullName + " from " + incomingSource + " (kept " + existingSource + ")"); + // System.out.println("[JSTypeRegistry] Duplicate type " + fullName + " from " + incomingSource + " (kept " + existingSource + ")"); } private void logAliasCollision(String alias, String existingType, String incomingType, String incomingSource) { String existingSource = aliasOrigins.getOrDefault(alias, "unknown"); - System.out.println("[JSTypeRegistry] Duplicate alias " + alias + " from " + incomingSource + " (kept " + existingSource + ")"); - System.out.println("[JSTypeRegistry] Alias " + alias + " existing=" + existingType + " incoming=" + incomingType); + // System.out.println("[JSTypeRegistry] Duplicate alias " + alias + " from " + incomingSource + " (kept " + existingSource + ")"); + // System.out.println("[JSTypeRegistry] Alias " + alias + " existing=" + existingType + " incoming=" + incomingType); } /** @@ -1162,9 +1162,9 @@ public class JSTypeRegistry { } // Log merge details - System.out.println("[JSTypeRegistry] Merged type " + existing.getFullName() + - " with " + methodsMerged + " methods, " + fieldsMerged + - " fields from " + incomingSource); + // System.out.println("[JSTypeRegistry] Merged type " + existing.getFullName() + + // " with " + methodsMerged + " methods, " + fieldsMerged + + // " fields from " + incomingSource); } /** diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodInfo.java index a16943e4b..ccfc347c5 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/method/MethodInfo.java @@ -163,10 +163,10 @@ public final class MethodInfo { if (reflectedReturn.isAssignableFrom(overrideClass)) { if (reflectedReturn != overrideClass) { returnType = overrideReturnType; - System.out.println("[DtsJavaBridge] Overrode return type for " - + method.getDeclaringClass().getName() + "." + name - + "(" + method.getParameterCount() + ") from " - + reflectedReturn.getName() + " to " + overrideClass.getName()); +// System.out.println("[DtsJavaBridge] Overrode return type for " +// + method.getDeclaringClass().getName() + "." + name +// + "(" + method.getParameterCount() + ") from " +// + reflectedReturn.getName() + " to " + overrideClass.getName()); } } } From cddd6cfe57727355c7a954720acbda1c7ac9b9e2 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 11 Mar 2026 04:09:47 +0200 Subject: [PATCH 2/2] Fixed: 1) Nested Brace Auto-Completion 2) Backspace on Empty Lines 3) Shift+Tab Mid-Line --- .../client/gui/util/GuiScriptTextArea.java | 88 +++++++++---------- 1 file changed, 43 insertions(+), 45 deletions(-) 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 e7798ff5a..3e29f71a4 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -2050,15 +2050,30 @@ public class GuiScriptTextArea extends GuiNpcTextField { String childIndent = indent + " "; String after = getSelectionAfterText(); - // If the next non-whitespace char is '}', don't insert another closer. + // If the next non-whitespace char is '}', check if it matches OUR indent level. + // A '}' that belongs to a parent block (different indent) should NOT suppress + // auto-insertion of our closing brace. int nextNonWs = 0; while (nextNonWs < after.length() && Character.isWhitespace(after.charAt(nextNonWs))) { nextNonWs++; } if (nextNonWs < after.length() && after.charAt(nextNonWs) == '}') { - addText("\n" + childIndent); - scrollToCursor(); - return true; + // Find the indent of the line containing this '}' + int closeBraceLineStart = after.lastIndexOf('\n', nextNonWs); + closeBraceLineStart = closeBraceLineStart < 0 ? 0 : closeBraceLineStart + 1; + int closeBraceIndent = 0; + for (int ci = closeBraceLineStart; ci < nextNonWs; ci++) { + char cc = after.charAt(ci); + if (cc == ' ' || cc == '\t') closeBraceIndent++; + else break; + } + if (closeBraceIndent == indent.length()) { + // The '}' matches our indent level — it's our matching close + addText("\n" + childIndent); + scrollToCursor(); + return true; + } + // Otherwise, the '}' belongs to a parent block — fall through to insert our own } int firstNewline = after.indexOf('\n'); @@ -2302,15 +2317,17 @@ public class GuiScriptTextArea extends GuiNpcTextField { return true; } - // If the current line is whitespace-only, delete the whole line - // (including the trailing newline if present). This makes Backspace - // intuitive on blank/indented lines outside any recognized scope. + // If the current line is whitespace-only, remove it by deleting the + // preceding newline and the line's content, but preserve any trailing + // newline so the following line (e.g. a closing brace) stays in place. LineData currCheck = selection.findCurrentLine(container.lines); if (currCheck != null && currCheck.text.trim().length() == 0) { - String before = text.substring(0, ValueUtil.clamp(currCheck.start - 1, 0, text.length())); - String after = text.substring(Math.min(currCheck.end, text.length())); - setText(before + after, true); // Use atomic undo - int newCursor = Math.max(0, currCheck.start - 1); + int removeStart = ValueUtil.clamp(currCheck.start - 1, 0, text.length()); + int contentEnd = Math.min(currCheck.start + currCheck.text.length(), text.length()); + String before = text.substring(0, removeStart); + String after = text.substring(contentEnd); + setText(before + after, true); + int newCursor = Math.max(0, removeStart); selection.reset(newCursor); scrollToCursor(); return true; @@ -2862,41 +2879,22 @@ public class GuiScriptTextArea extends GuiNpcTextField { return; int tab = getTabSize(); int indentLen = IndentHelper.getLineIndent(currentLine.text); - int textStartPos = currentLine.start + indentLen; - if (selection.getCursorPosition() <= textStartPos) { - // Cursor before any text: reduce leading indent to previous tab stop - int targetIndent = Math.max(0, ((indentLen - 1) / tab) * tab); - String newIndent = repeatSpace(targetIndent); - String rest = currentLine.text.substring(indentLen); - String before = text.substring(0, currentLine.start); - int contentEnd = Math.min(currentLine.start + currentLine.text.length(), text.length()); - int sepEnd = Math.min(currentLine.end, text.length()); - String sep = contentEnd < sepEnd ? text.substring(contentEnd, sepEnd) : ""; - String after = text.substring(sepEnd); - setText(before + newIndent + rest + sep + after); - int newCursor = currentLine.start + targetIndent; - selection.reset(Math.min(newCursor, this.text.length())); - } else { - // Cursor after start of text: remove up to previous tab stop worth of spaces immediately before cursor - int column = selection.getCursorPosition() - currentLine.start; - int mod = column % tab; - int toRemove = mod == 0 ? tab : mod; - int removed = 0; - int pos = selection.getCursorPosition() - 1; - while (pos >= currentLine.start && removed < toRemove && text.charAt(pos) == ' ') { - pos--; - removed++; - } - if (removed > 0) { - int removeStart = pos + 1; - String before = text.substring(0, removeStart); - String after = text.substring(selection.getCursorPosition()); - setText(before + after); - int newCursor = removeStart; - selection.reset(Math.min(newCursor, this.text.length())); - } - } + if (indentLen == 0) + return; + + int targetIndent = Math.max(0, ((indentLen - 1) / tab) * tab); + int removed = indentLen - targetIndent; + String newIndent = repeatSpace(targetIndent); + String rest = currentLine.text.substring(indentLen); + String before = text.substring(0, currentLine.start); + int contentEnd = Math.min(currentLine.start + currentLine.text.length(), text.length()); + int sepEnd = Math.min(currentLine.end, text.length()); + String sep = contentEnd < sepEnd ? text.substring(contentEnd, sepEnd) : ""; + String after = text.substring(sepEnd); + setText(before + newIndent + rest + sep + after); + int newCursor = Math.max(currentLine.start, selection.getCursorPosition() - removed); + selection.reset(Math.min(newCursor, this.text.length())); } // ==================== CURSOR MANAGEMENT ====================