From 8799e08c17d5d54c71353b8cbdac5f4ec45d9e96 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 24 Jan 2026 02:23:59 +0200 Subject: [PATCH] Expanded scope of DTSJSDocParser type/param patterns so they are more forgiving --- .../interpreter/hover/TokenHoverInfo.java | 10 +++++--- .../interpreter/js_parser/DTSJSDocParser.java | 24 +++++++++++++++---- .../script/interpreter/jsdoc/JSDocInfo.java | 3 ++- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java index 216a9102d..b6a1ebbdc 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java @@ -1166,10 +1166,14 @@ public class TokenHoverInfo { // Indent and parameter name String paramName = paramTag.getParamName(); - boolean paramExists = methodParams != null && methodParams.stream() + if (paramName == null || paramName.isEmpty()) { + paramLine.addSegment("param", TokenType.JSDOC_TAG.getHexColor()); + } else { + boolean paramExists = methodParams != null && methodParams.stream() .anyMatch(p -> p.getName().equals(paramName)); - paramLine.addSegment(paramName, - paramExists ? TokenType.PARAMETER.getHexColor() : TokenType.UNDEFINED_VAR.getHexColor()); + paramLine.addSegment(paramName, + paramExists ? TokenType.PARAMETER.getHexColor() : TokenType.UNDEFINED_VAR.getHexColor()); + } // Type if available if (paramTag.hasType()) { diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DTSJSDocParser.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DTSJSDocParser.java index ecf41f240..e3c1dd8bb 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DTSJSDocParser.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/js_parser/DTSJSDocParser.java @@ -16,13 +16,13 @@ public class DTSJSDocParser { "@(\\w+)(?:\\s+(.*))?"); private static final Pattern PARAM_PATTERN = Pattern.compile( - "@param\\s+(?:\\{([^}]+)\\}\\s+)?(\\w+)(?:\\s+(.*))?"); + "@param(?:\\s+\\{([^}]+)\\})?(?:\\s+(\\w+))?(?:\\s+(.*))?"); private static final Pattern RETURN_PATTERN = Pattern.compile( "@returns?\\s+(?:\\{([^}]+)\\}\\s*)?(.*)"); private static final Pattern TYPE_PATTERN = Pattern.compile( - "@type\\s+\\{([^}]+)\\}(?:\\s+(.*))?"); + "@type(?:\\s+\\{([^}]+)\\})?(?:\\s+(.*))?"); public static JSDocInfo parseJSDocBlock(String jsDocContent) { if (jsDocContent == null || jsDocContent.isEmpty()) { @@ -85,8 +85,18 @@ public class DTSJSDocParser { String type = paramMatcher.group(1); String name = paramMatcher.group(2); String desc = paramMatcher.group(3); + if (desc == null && type == null && name != null) { + desc = name; + name = null; + } + if (desc != null) { + desc = desc.trim(); + if (desc.isEmpty()) { + desc = null; + } + } JSDocParamTag tag = JSDocParamTag.create(-1, -1, -1, - type, null, -1, -1, name, -1, -1, desc != null ? desc.trim() : null); + type, null, -1, -1, name, -1, -1, desc); info.addParamTag(tag); return tag; } @@ -111,8 +121,14 @@ public class DTSJSDocParser { if (typeMatcher.find()) { String type = typeMatcher.group(1); String desc = typeMatcher.group(2); + if (desc != null) { + desc = desc.trim(); + if (desc.isEmpty()) { + desc = null; + } + } JSDocTypeTag tag = JSDocTypeTag.create(-1, -1, -1, - type, null, -1, -1, desc != null ? desc.trim() : null); + type, null, -1, -1, desc); info.setTypeTag(tag); return tag; } diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/jsdoc/JSDocInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/jsdoc/JSDocInfo.java index 9591ca958..b497da434 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/jsdoc/JSDocInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/jsdoc/JSDocInfo.java @@ -87,7 +87,8 @@ public class JSDocInfo { public JSDocParamTag getParamTag(String paramName) { for (JSDocParamTag tag : paramTags) { - if (tag.getParamName().equals(paramName)) { + String tagName = tag.getParamName(); + if (tagName != null && tagName.equals(paramName)) { return tag; } }