From: Michael James Gratton <mike@vee.net>
Date: Tue, 9 Jan 2018 01:36:43 +0000 (+1100)
Subject: libvaladoc: Allow @link tags to be split over multiple lines
X-Git-Tag: 0.38.5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f40447623f5baecc86743da0adff04cde4394e3;p=thirdparty%2Fvala.git

libvaladoc: Allow @link tags to be split over multiple lines

* libvaladoc/documentation/documentationparser.vala
  (DocumentationParser.init_valadoc_rules): Allow both SP and NL in
  general tag rule to separate tag name and body.

* libvaladoc/taglets/tagletlink.vala (Link): Allow multiple further SP
  and NL chars before the link.

https://bugzilla.gnome.org/show_bug.cgi?id=646982
---

diff --git a/libvaladoc/documentation/documentationparser.vala b/libvaladoc/documentation/documentationparser.vala
index b42453e07..a03480c73 100644
--- a/libvaladoc/documentation/documentationparser.vala
+++ b/libvaladoc/documentation/documentationparser.vala
@@ -395,7 +395,15 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
 						push (taglet);
 						Rule? taglet_rule = taglet.get_parser_rule (multiline_run);
 						if (taglet_rule != null) {
-							_parser.push_rule (Rule.seq ({ TokenType.SPACE, taglet_rule }));
+							_parser.push_rule (
+								Rule.seq ({
+									Rule.one_of({
+										TokenType.SPACE,
+										TokenType.EOL
+									}),
+									taglet_rule
+								})
+							);
 						}
 					}),
 					TokenType.CLOSED_BRACE
diff --git a/libvaladoc/taglets/tagletlink.vala b/libvaladoc/taglets/tagletlink.vala
index 799bec6e0..e14436fb8 100644
--- a/libvaladoc/taglets/tagletlink.vala
+++ b/libvaladoc/taglets/tagletlink.vala
@@ -51,7 +51,14 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 
 	public override Rule? get_parser_rule (Rule run_rule) {
 		return Rule.seq ({
-			Rule.option ({ Rule.many ({ TokenType.SPACE }) }),
+			Rule.option ({
+				Rule.many ({
+					Rule.one_of({
+						TokenType.SPACE,
+						TokenType.EOL
+					}),
+				}),
+			}),
 			TokenType.any_word ().action ((token) => { symbol_name = token.to_string (); }),
 			Rule.option ({
 				Rule.many ({