From ec885d5ddb87ee8a744e5244a769a35afa44eca1 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 7 Mar 2026 13:54:13 +0200 Subject: [PATCH] Removed comments from resolving expressions --- .../script/interpreter/ScriptDocument.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java index 43dbe6bfe..a2d670e83 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java @@ -4898,8 +4898,9 @@ public class ScriptDocument { */ public TypeInfo resolveExpressionType(String expr, int position) { expr = expr.trim(); - - if (expr.isEmpty()) { + expr = stripLineComments(expr); + + if (expr.isEmpty()) return null; } @@ -5336,6 +5337,26 @@ public class ScriptDocument { } } + /** + * + */ + private String stripLineComments(String expr) { + if (!expr.contains("//")) + return expr; + + String[] lines = expr.split("\n", -1); + StringBuilder result = new StringBuilder(); + for (String line : lines) { + int ci = line.indexOf("//"); + String part = (ci >= 0 ? line.substring(0, ci) : line).trim(); + if (!part.isEmpty()) { + if (result.length() > 0) result.append(' '); + result.append(part); + } + } + return result.toString().trim(); + } + /** * Extract the element type from an array type, using multiple fallback strategies. *