Markdown: handle XML/HTML comments

universal-ctags · Jan 1, 2022 · 69be461 · 69be461
1 parent b1bd013
commit 69be461
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/Units/parser-markdown.r/xml-comment.d/args.ctags b/Units/parser-markdown.r/xml-comment.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-markdown.r/xml-comment.d/expected.tags b/Units/parser-markdown.r/xml-comment.d/expected.tags
@@ -0,0 +1 @@
+EXTRACT ME 1	input.md	/^# EXTRACT ME 1$/;"	c
diff --git a/Units/parser-markdown.r/xml-comment.d/input.md b/Units/parser-markdown.r/xml-comment.d/input.md
@@ -0,0 +1,7 @@
+<!--
+# SKIP ME 1
+-->
+
+<!-- # SKIP ME 2 -->
+
+# EXTRACT ME 1
diff --git a/parsers/markdown.c b/parsers/markdown.c
@@ -193,6 +193,7 @@ static void findMarkdownTags (void)
 	long startSourceLineNumber = 0;
 	long startLineNumber = 0;
 	bool inPreambule = false;
+	bool inComment = false;
 
 	nestingLevels = nestingLevelsNewFull (0, fillEndField);
 
@@ -246,9 +247,24 @@ static void findMarkdownTags (void)
 				lineProcessed = true;
 			}
 		}
+		/* XML comment start */
+		else if (lineLen >= pos + 4 && line[pos] == '<' && line[pos + 1] == '!' &&
+			line[pos + 2] == '-' && line[pos + 3] == '-')
+		{
+			if (strstr ((const char *)(line + pos + 4), "-->") == NULL)
+				inComment = true;
+			lineProcessed = true;
+		}
+		/* XML comment end */
+		else if (lineLen >= pos + 3 && line[pos] == '-' && line[pos + 1] == '-' &&
+			line[pos + 2] == '>')
+		{
+			inComment = false;
+			lineProcessed = true;
+		}
 
-		/* code block */
-		if (inCodeChar)
+		/* code block or comment */
+		if (inCodeChar || inComment)
 			lineProcessed = true;
 
 		/* code block using indent */