JSON: emit full qualified tags

Close universal-ctags#4164 The test input is taken from universal-ctags#4164 submitted by Karol Jakusz-Gostomski.
masatake · Dec 30, 2024 · 53a7aeb · 53a7aeb
1 parent a1fdd1f
commit 53a7aeb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/Units/parser-json.r/fq-tags.d/args.ctags b/Units/parser-json.r/fq-tags.d/args.ctags
@@ -0,0 +1,2 @@
+--sort=no
+--extras=+q
diff --git a/Units/parser-json.r/fq-tags.d/expected.tags b/Units/parser-json.r/fq-tags.d/expected.tags
@@ -0,0 +1,5 @@
+c	input.json	/^      "c": "hello {{.Name}}"$/;"	s	object:welcome.x
+welcome.x.c	input.json	/^      "c": "hello {{.Name}}"$/;"	s	object:welcome.x
+x	input.json	/^    "x": {$/;"	o	object:welcome
+welcome.x	input.json	/^    "x": {$/;"	o	object:welcome
+welcome	input.json	/^  "welcome": {$/;"	o
diff --git a/Units/parser-json.r/fq-tags.d/input.json b/Units/parser-json.r/fq-tags.d/input.json
@@ -0,0 +1,7 @@
+{
+  "welcome": {
+    "x": {
+      "c": "hello {{.Name}}"
+    }
+  }
+}
diff --git a/parsers/json.c b/parsers/json.c
@@ -139,6 +139,17 @@ static void makeJsonTag (tokenInfo *const token, const jsonKind kind)
 	}
 
 	makeTagEntry (&e);
+
+	if (!vStringIsEmpty (token->scope) && isXtagEnabled (XTAG_QUALIFIED_TAGS))
+	{
+		vString *qname = vStringNewCopy(token->scope);
+		vStringPut(qname, '.');
+		vStringCat(qname, token->string);
+		e.name = vStringValue(qname);
+		markTagExtraBit(&e, XTAG_QUALIFIED_TAGS);
+		makeTagEntry (&e);
+		vStringDelete (qname);
+	}
 }
 
 #define DEPTH_LIMIT 512