Merge pull request universal-ctags#3331 from jafl/javascript-always-p…

…arse-function-block JavaScript: always parse the contents of a function block
tartley · Apr 15, 2022 · 0d63a38 · 0d63a38
2 parents fc561fb + c77a1b9
commit 0d63a38
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/Units/parser-javascript.r/js-parse-function-block.d/args.ctags b/Units/parser-javascript.r/js-parse-function-block.d/args.ctags
@@ -0,0 +1 @@
+--fields=+K
diff --git a/Units/parser-javascript.r/js-parse-function-block.d/expected.tags b/Units/parser-javascript.r/js-parse-function-block.d/expected.tags
@@ -0,0 +1,3 @@
+AnonymousFunctionf0f039f00100	input.js	/^A.add('X', function(Y) {$/;"	function
+c	input.js	/^B.c = function(type, field)$/;"	function	function:B
+d	input.js	/^B.d = function(id)$/;"	function	function:B
diff --git a/Units/parser-javascript.r/js-parse-function-block.d/input.js b/Units/parser-javascript.r/js-parse-function-block.d/input.js
@@ -0,0 +1,13 @@
+A.add('X', function(Y) {
+
+B.c = function(type, field)
+{
+	var min = 5,
+		  is_int = (min != 'a');
+};
+
+B.d = function(id)
+{
+};
+
+});
diff --git a/parsers/jscript.c b/parsers/jscript.c
@@ -2284,7 +2284,6 @@ static bool parseStatement (tokenInfo *const token, bool is_inside_class)
 					makeJsTag (name, is_generator ? JSTAG_GENERATOR : JSTAG_METHOD, signature, NULL);
 					if ( vStringLength(secondary_name->string) > 0 )
 						makeFunctionTag (secondary_name, signature, is_generator);
-					parseBlock (token, name->string);
 				}
 				else
 				{
@@ -2307,6 +2306,7 @@ static bool parseStatement (tokenInfo *const token, bool is_inside_class)
 					if ( vStringLength(secondary_name->string) > 0 )
 						makeFunctionTag (secondary_name, signature, is_generator);
 				}
+				parseBlock (token, name->string);
 			}
 
 			vStringDelete (signature);