Fix to fine-tune URI link for Golang COMMENT,QSTRING

Author: idodeclare

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

@@ -27,12 +27,12 @@
  */
 
 package org.opensolaris.opengrok.analysis.golang;
+
 import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 
 /**
  * @author Patrick Lundquist
  */
-
 %%
 %public
 %class GolangSymbolTokenizer

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

@@ -27,14 +27,15 @@
  */
 
 package org.opensolaris.opengrok.analysis.golang;
+
 import org.opensolaris.opengrok.analysis.JFlexXrefSimple;
+import org.opensolaris.opengrok.util.StringUtils;
 import org.opensolaris.opengrok.web.HtmlConsts;
 import org.opensolaris.opengrok.web.Util;
 
 /**
  * @author Patrick Lundquist
  */
-
 %%
 %public
 %class GolangXref
@@ -152,8 +153,23 @@ File = [a-zA-Z]{FNameChar}* "." ([Gg][Oo] | [Tt][Xx][Tt] | [Hh][Tt][Mm][Ll]? |
         out.write(path);
         out.write("</a>");
     }
+    {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+ { writeEMailAddress(yytext()); }
+}
+
+<STRING, SCOMMENT> {
     {BrowseableURI}    {
         appendLink(yytext(), true);
     }
-    {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+ { writeEMailAddress(yytext()); }
+}
+
+<COMMENT> {
+    {BrowseableURI}    {
+        appendLink(yytext(), true, StringUtils.END_C_COMMENT);
+    }
+}
+
+<QSTRING> {
+    {BrowseableURI}    {
+        appendLink(yytext(), true, StringUtils.APOS_NO_BSESC);
+    }
 }

test/org/opensolaris/opengrok/analysis/golang/sample.go

@@ -137,3 +137,5 @@ func (r *Reader) readFromCommand(shell string, cmd string) bool {
 	r.feed(out)
 	return listCommand.Wait() == nil
 }
+/*http://example.com*/
+import ('http://example.com')

test/org/opensolaris/opengrok/analysis/golang/sample_xref.html

@@ -145,5 +145,7 @@
 <a class="l" name="137" href="#137">137</a>	<a href="/source/s?defs=r" class="intelliWindow-symbol" data-definition-place="undefined-in-file">r</a>.<a class="d intelliWindow-symbol" href="#feed" data-definition-place="defined-in-file">feed</a>(<a href="/source/s?defs=out" class="intelliWindow-symbol" data-definition-place="undefined-in-file">out</a>)
 <a class="l" name="138" href="#138">138</a>	<b>return</b> <a href="/source/s?defs=listCommand" class="intelliWindow-symbol" data-definition-place="undefined-in-file">listCommand</a>.<a href="/source/s?defs=Wait" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Wait</a>() == <b>nil</b>
 <a class="l" name="139" href="#139">139</a>}
-<a class="hl" name="140" href="#140">140</a></body>
+<a class="hl" name="140" href="#140">140</a><span class="c">/*<a href="http://example.com">http://example.com</a>*/</span>
+<a class="l" name="141" href="#141">141</a><b>import</b> (<span class="s">&apos;<a href="http://example.com">http://example.com</a>&apos;</span>)
+<a class="l" name="142" href="#142">142</a></body>
 </html>