Issue 70 - Update to pegdown-1.5.0

nbproject/project.xml

@@ -231,20 +231,20 @@
             </test-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/parboiled-java-1.1.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/parboiled-java-1.1.6.jar</binary-origin>
+                <runtime-relative-path>ext/parboiled-java-1.1.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/parboiled-java-1.1.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/pegdown-1.4.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/pegdown-1.4.2.jar</binary-origin>
+                <runtime-relative-path>ext/pegdown-1.5.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/pegdown-1.5.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/asm-util-4.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/asm-util-4.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/parboiled-core-1.1.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/parboiled-core-1.1.6.jar</binary-origin>
+                <runtime-relative-path>ext/parboiled-core-1.1.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/parboiled-core-1.1.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/asm-4.1.jar</runtime-relative-path>

src/flow/netbeans/markdown/PreviewLinkRenderer.java

@@ -1,4 +1,3 @@
-
 package flow.netbeans.markdown;
 
 import java.net.MalformedURLException;
@@ -12,14 +11,26 @@
 import org.pegdown.ast.WikiLinkNode;
 
 /**
+ * Turns pegdown AST link nodes into rendered links, optionally resolving relative URLs to
+ * absolute URLs using a given base URL.
  *
  * @author Holger Stenger
  */
 public class PreviewLinkRenderer extends LinkRenderer {
+
+    /** The base URL against which absolute URLs should be resolved. */
     private final URL baseUrl;
 
+    /** Indicates whether relative URLs should be resolved against the base URL. */
     private final boolean resolveLinkUrls;
 
+    /**
+     * Create a new link renderer that will optionally resolve relative URLs to absolute URLs.
+     *
+     * @param baseUrl the base URL against which relative URLs will be resolved.
+     * @param resolveLinkUrls if true, relative URLs in rendered links will be resolved to
+     *          absolute URLs with the given base URL.
+     */
     public PreviewLinkRenderer(URL baseUrl, boolean resolveLinkUrls) {
         super();
         this.baseUrl = baseUrl;
@@ -51,6 +62,14 @@ public LinkRenderer.Rendering render(RefLinkNode node, String url, String title,
         return transform(super.render(node, url, title, text));
     }
 
+    /**
+     * Resolves relative URLs against a base URL to return an absolute URL.
+     *
+     * @param uriText the possibly relative URL to resolve
+     * @return the absolute form of the provided relative URL; if the URL is already absolute, or if it
+     *          would otherwise result in an invalid URL when resolved against the base URL, then the
+     *          original string is returned unmodified
+     */
     private String resolveUrl(final String uriText) {
         try {
             return baseUrl.toURI().resolve(uriText).toURL().toExternalForm();
@@ -62,11 +81,26 @@ private String resolveUrl(final String uriText) {
         return uriText;
     }
 
+    /**
+     * Transforms the rendered link's href URL to its absolute form using a base URL,
+     * if URL resolution is turned on.
+     *
+     * @param rendering the previously rendered link
+     * @return if URL resolution is turned on and the link is relative, then the rendered
+     *          link with the href URL in its absolute form using the base URL provided to
+     *          this renderer; otherwise the original rendered link
+     */
     private LinkRenderer.Rendering transform(LinkRenderer.Rendering rendering) {
         if (resolveLinkUrls && (rendering.href != null)) {
-            rendering.href = resolveUrl(rendering.href);
+            LinkRenderer.Rendering resolvedRendering = new LinkRenderer.Rendering(
+                resolveUrl(rendering.href), rendering.text);
+            for (LinkRenderer.Attribute attr : rendering.attributes) {
+              resolvedRendering.withAttribute(attr);
+            }
+            return resolvedRendering;
+        } else {
+          return rendering;
         }
-        return rendering;
     }
 
 }

src/flow/netbeans/markdown/csl/MarkdownInlineVisitor.java

@@ -2,6 +2,7 @@
 package flow.netbeans.markdown.csl;
 
 import org.pegdown.ast.AbbreviationNode;
+import org.pegdown.ast.AnchorLinkNode;
 import org.pegdown.ast.AutoLinkNode;
 import org.pegdown.ast.BlockQuoteNode;
 import org.pegdown.ast.BulletListNode;
@@ -61,6 +62,11 @@ public void visit(AbbreviationNode node) {
         visitChildren(node);
     }
 
+    @Override
+    public void visit(AnchorLinkNode node) {
+        plainText.append(node.getText());
+    }
+
     @Override
     public void visit(AutoLinkNode node) {
         plainText.append(node.getText());
@@ -258,7 +264,7 @@ public void visit(SuperNode node) {
     public void visit(Node node) {
         visitChildren(node);
     }
-    
+
     @Override
     public void visit(StrikeNode node) {
         visitChildren(node);

src/flow/netbeans/markdown/csl/MarkdownTOCVisitor.java

@@ -6,6 +6,7 @@
 import org.netbeans.modules.csl.api.StructureItem;
 import org.openide.filesystems.FileObject;
 import org.pegdown.ast.AbbreviationNode;
+import org.pegdown.ast.AnchorLinkNode;
 import org.pegdown.ast.AutoLinkNode;
 import org.pegdown.ast.BlockQuoteNode;
 import org.pegdown.ast.BulletListNode;
@@ -68,6 +69,10 @@ public List<OffsetRange> getOffsetRanges() {
     public void visit(AbbreviationNode node) {
     }
 
+    @Override
+    public void visit(AnchorLinkNode node) {
+    }
+
     @Override
     public void visit(AutoLinkNode node) {
     }

src/flow/netbeans/markdown/highlighter/MarkdownLexerVisitor.java

@@ -1,6 +1,7 @@
 package flow.netbeans.markdown.highlighter;
 
 import org.pegdown.ast.AbbreviationNode;
+import org.pegdown.ast.AnchorLinkNode;
 import org.pegdown.ast.AutoLinkNode;
 import org.pegdown.ast.BlockQuoteNode;
 import org.pegdown.ast.BulletListNode;
@@ -90,6 +91,11 @@ public void visit(AbbreviationNode node) {
         endTreeToken();
     }
 
+    @Override
+    public void visit(AnchorLinkNode node) {
+        addLeafTreeToken(MarkdownTokenId.ANCHORLINK, node);
+    }
+
     @Override
     public void visit(AutoLinkNode node) {
         addLeafTreeToken(MarkdownTokenId.AUTOLINK, node);

src/flow/netbeans/markdown/highlighter/MarkdownTokenId.java

@@ -12,6 +12,7 @@
 public enum MarkdownTokenId implements TokenId {
 
     ABBREVIATION,
+    ANCHORLINK,
     AUTOLINK,
     BLOCKQUOTE,
     BULLETLIST,
@@ -45,7 +46,7 @@ public enum MarkdownTokenId implements TokenId {
     REF_LINK,
     WHITESPACE,
     STRIKETHROUGH;
-        
+
     private static final Language<MarkdownTokenId> LANGUAGE = new LanguageHierarchy<MarkdownTokenId>() {
 
         @Override