Restore URL-in-sentences matching behavior

Previously with the {BrowseableURI} change, URLs ending in
dots would not include the dot, even though the dot is a
valid URI character. Restore this behavior with a new mode
of appendLink().

Author: idodeclare

src/org/opensolaris/opengrok/analysis/JFlexXref.java

@@ -42,6 +42,7 @@
 import org.opensolaris.opengrok.configuration.Project;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.history.Annotation;
+import org.opensolaris.opengrok.util.StringUtils;
 import org.opensolaris.opengrok.web.Util;
 
 /**
@@ -202,7 +203,41 @@ protected void appendProject() throws IOException {
         }
     }
 
+    /**
+     * Calls {@link #appendLink(java.lang.String, boolean) with false to
+     * disable {@code doPushback} handling.
+     * @param url the URL to append
+     * @throws IOException if an error occurs while appending
+     */
     protected void appendLink(String url) throws IOException {
+        appendLink(url, false);
+    }
+
+    /**
+     * Appends the {@code url} to the active {@link Writer}. If
+     * {@code doPushback} is true, then any characters counted by
+     * {@link StringUtils#countURIEndingPushback(java.lang.String)} are
+     * handled by {@link #yypushback(int)} with {@code url} only partially
+     * written.
+     * <p>If the count is equal to the length of {@code url}, then it is
+     * simply written, and nothing is pushed back.
+     * @param url the URL to append
+     * @param doPushback a value indicating whether to test the {@code url}
+     * with {@link StringUtils#countURIEndingPushback(java.lang.String)}.
+     * @throws IOException if an error occurs while appending
+     */
+    protected void appendLink(String url, boolean doPushback)
+        throws IOException {
+
+        if (doPushback) {
+            int n = StringUtils.countURIEndingPushback(url);
+            // Push back if positive, but not if equal to the current length,
+            // or else the pushback might cause a neverending loop.
+            if (n > 0 && n < url.length()) {
+                yypushback(n);
+                url = url.substring(0, url.length() - n);
+            }
+        }
         out.write("<a href=\"");
         out.write(Util.formQuoteEscape(url));
         out.write("\">");
@@ -297,6 +332,14 @@ public Scopes getScopes() {
      */
     public abstract void yybegin(int newState);
 
+    /**
+     * Pushes {@code number} characters of the matched text back into the
+     * input stream per the documented JFlex behavior.
+     * @param number a value greater than or equal to zero and less than or
+     * equal to the length of the matched text.
+     */
+    public abstract void yypushback(int number);
+
     /**
      * returns current state of analysis
      * @return id of state

src/org/opensolaris/opengrok/analysis/ada/AdaProductions.lexh

@@ -223,7 +223,7 @@ File = [a-zA-Z]{FNameChar}* "." {FileExt}
 
     {BrowseableURI}    {
         if (takeAllContent()) {
-            appendLink(yytext());
+            appendLink(yytext(), true);
         }
     }
 

src/org/opensolaris/opengrok/analysis/ada/AdaSymbolTokenizer.lex

@@ -118,7 +118,7 @@ import org.opensolaris.opengrok.web.Util;
 
     protected void appendProject() { /* noop */ }
 
-    protected void appendLink(String s) { /* noop */ }
+    protected void appendLink(String s, boolean b) { /* noop */ }
 
     protected void writeEMailAddress(String s) { /* noop */ }
 %}

src/org/opensolaris/opengrok/analysis/c/CXref.lex

@@ -149,7 +149,7 @@ Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[1-9][0-9]*)(([eE][+-]?[0-9]+)?[ufdlU
         out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/c/CxxXref.lex

@@ -146,7 +146,7 @@ Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[1-9][0-9]*)(([eE][+-]?[0-9]+)?[ufdlU
         out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/clojure/ClojureXref.lex

@@ -138,7 +138,7 @@ Number = ([0-9]+\.[0-9]+|[0-9][0-9]*|"#" [boxBOX] [0-9a-fA-F]+)
         out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/csharp/CSharpXref.lex

@@ -158,7 +158,7 @@ Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[0-9]+)(([eE][+-]?[0-9]+)?[ufdlUFDL]*
         out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/erlang/ErlangXref.lex

@@ -146,7 +146,7 @@ Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[0-9]+)(([eE][+-]?[0-9]+)?[loxbLOXBjJ
         out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/fortran/FortranXref.lex

@@ -151,7 +151,7 @@ Number = ([0-9]+\.[0-9]+|[0-9][0-9]*|"0x" [0-9a-fA-F]+ )([udl]+)?
         out.write(path);out.write("</a>");}
 
 {BrowseableURI}    {
-          appendLink(yytext());
+          appendLink(yytext(), true);
         }
 
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+

src/org/opensolaris/opengrok/analysis/golang/GolangXref.lex

@@ -128,7 +128,7 @@ Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[0-9][0-9_]*)([eE][+-]?[0-9]+)?
         out.write("</a>");
     }
     {BrowseableURI}    {
-        appendLink(yytext());
+        appendLink(yytext(), true);
     }
     {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+ { writeEMailAddress(yytext()); }
 }