Fix to fine-tune URI link for Erlang QATOM

Author: idodeclare

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

@@ -27,10 +27,8 @@
  */
 
 package org.opensolaris.opengrok.analysis.erlang;
-import java.io.IOException;
-import java.io.Reader;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 
+import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 %%
 %public
 %class ErlangSymbolTokenizer

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

@@ -27,13 +27,11 @@
  */
 
 package org.opensolaris.opengrok.analysis.erlang;
+
 import org.opensolaris.opengrok.analysis.JFlexXrefSimple;
-import java.io.IOException;
-import java.io.Writer;
-import java.io.Reader;
+import org.opensolaris.opengrok.util.StringUtils;
 import org.opensolaris.opengrok.web.HtmlConsts;
 import org.opensolaris.opengrok.web.Util;
-
 %%
 %public
 %class ErlangXref
@@ -157,7 +155,7 @@ File = [a-zA-Z]{FNameChar}* "." ([Ee][Rr][Ll] | [Hh][Rr][Ll] | [Aa][Pp][Pp] |
  [^]    { writeUnicodeChar(yycharat(0)); }
 }
 
-<STRING, COMMENT, STRING, QATOM> {
+<STRING, COMMENT, QATOM> {
 {FPath}
         { out.write(Util.breadcrumbPath(urlPrefix+"path=",yytext(),'/'));}
 
@@ -171,12 +169,20 @@ File = [a-zA-Z]{FNameChar}* "." ([Ee][Rr][Ll] | [Hh][Rr][Ll] | [Aa][Pp][Pp] |
         out.write(path);
         out.write("</a>");}
 
-{BrowseableURI}    {
-          appendLink(yytext(), true);
-        }
-
 {FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+
         {
           writeEMailAddress(yytext());
         }
 }
+
+<STRING, COMMENT> {
+    {BrowseableURI}    {
+        appendLink(yytext(), true);
+    }
+}
+
+<QATOM> {
+    {BrowseableURI}    {
+        appendLink(yytext(), true, StringUtils.APOS_NO_BSESC);
+    }
+}

test/org/opensolaris/opengrok/analysis/erlang/sample.erl

@@ -57,3 +57,4 @@ flush() ->
 	after 0 ->
 		ok
 	end.
+'http://example.com?a='

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

@@ -65,5 +65,6 @@
 <a class="l" name="57" href="#57">57</a>	<b>after</b> <span class="n">0</span> -&gt;
 <a class="l" name="58" href="#58">58</a>		<a href="/source/s?defs=ok" class="intelliWindow-symbol" data-definition-place="undefined-in-file">ok</a>
 <a class="l" name="59" href="#59">59</a>	<b>end</b>.
-<a class="hl" name="60" href="#60">60</a></body>
+<a class="hl" name="60" href="#60">60</a><span class="s">&apos;<a href="http://example.com?a=">http://example.com?a=</a>&apos;</span>
+<a class="l" name="61" href="#61">61</a></body>
 </html>