Merge remote-tracking branch 'origin/master'

vsch · vsch · commit b19de4ef9df1 · 2018-07-25T16:10:43.000-04:00
diff --git a/flexmark-jira-converter/src/main/java/com/vladsch/flexmark/jira/converter/internal/JiraConverterNodeRenderer.java b/flexmark-jira-converter/src/main/java/com/vladsch/flexmark/jira/converter/internal/JiraConverterNodeRenderer.java
@@ -418,7 +418,11 @@ private void render(Link node, NodeRendererContext context, HtmlWriter html) {
             ResolvedLink resolvedLink = context.resolveLink(LinkType.LINK, node.getUrl().unescape(), null);
             html.raw("[");
             context.renderChildren(node);
-            html.raw("|").raw(resolvedLink.getUrl()).raw("]");
+            html.raw("|").raw(resolvedLink.getUrl());
+            if (node.getTitle() != null && !node.getTitle().isEmpty()) {
+                html.raw("|").raw(node.getTitle());
+            }
+            html.raw("]");
         }
     }
 
diff --git a/flexmark-jira-converter/src/test/resources/jira_converter_ast_spec.md b/flexmark-jira-converter/src/test/resources/jira_converter_ast_spec.md
@@ -144,6 +144,19 @@ Document[0, 122]
 ````````````````````````````````
 
 
+```````````````````````````````` example Text formatting: 4
+[inline link with title](http://google.com "Google")
+.
+[inline link with title|http://google.com|Google]
+
+.
+Document[0, 53]
+  Paragraph[0, 53]
+    Link[0, 52] textOpen:[0, 1, "["] text:[1, 23, "inline link with title"] textClose:[23, 24, "]"] linkOpen:[24, 25, "("] url:[25, 42, "http://google.com"] pageRef:[25, 42, "http://google.com"] titleOpen:[43, 44, "\""] title:[44, 50, "Google"] titleClose:[50, 51, "\""] linkClose:[51, 52, ")"]
+      Text[1, 23] chars:[1, 23, "inlin … title"]
+````````````````````````````````
+
+
 ### Block quotes
 
 Single line block quote

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,11 @@ private void render(Link node, NodeRendererContext context, HtmlWriter html) {`
`418`	`418`	`ResolvedLink resolvedLink = context.resolveLink(LinkType.LINK, node.getUrl().unescape(), null);`
`419`	`419`	`html.raw("[");`
`420`	`420`	`context.renderChildren(node);`
`421`		`- html.raw("\|").raw(resolvedLink.getUrl()).raw("]");`
	`421`	`+ html.raw("\|").raw(resolvedLink.getUrl());`
	`422`	`+ if (node.getTitle() != null && !node.getTitle().isEmpty()) {`
	`423`	`+ html.raw("\|").raw(node.getTitle());`
	`424`	`+ }`
	`425`	`+ html.raw("]");`
`422`	`426`	`}`
`423`	`427`	`}`
`424`	`428`