From f7ce0d4ac253a219bcac1556725720f66fe64da2 Mon Sep 17 00:00:00 2001 From: irekg Date: Thu, 23 Jan 2020 10:07:22 +0100 Subject: [PATCH] Improve logic for finding default values --- jsdoc_parser.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/jsdoc_parser.js b/jsdoc_parser.js index 87949e5..c498724 100644 --- a/jsdoc_parser.js +++ b/jsdoc_parser.js @@ -128,14 +128,8 @@ function jsdocParser(text, parsers, options) { // Additional operations on tag.name if (tag.name) { // Figure out if tag type have default value - const part1 = commentString.split(tag.name)[1] - const part2 = part1.split(/\s/)[0] - const sliceIndex = part2.indexOf('=') - if (sliceIndex !== -1) - tag.name = tag.name + '=' + part2 - .slice(sliceIndex + 1, part2.length) - .replace(']', '') - .trim() + const part = commentString.split(new RegExp(`@.+{.+}.+${tag.name}\s?=\s?`))[1] + if (part) tag.name = tag.name + '=' + part.split(/\s/)[0].replace(']', '') // Optional tag name if (tag.type.type === 'OptionalType') tag.name = `[${tag.name}]` -- GitLab