Fix dangling VB span by subclassing JFlexXrefSimple

Also:
- Fix to recognize proper VB escaping of quotation-marks.
- Fix to close and reopen spans for line-spanning strings.
- Escape all HTML special characters in VBXref.
- Use Common.xref in VBSymbolTokenizer.

Author: idodeclare

src/org/opensolaris/opengrok/analysis/vb/VBSymbolTokenizer.lex

@@ -23,14 +23,12 @@
  */
 
 /*
- * Gets Java symbols - ignores comments, strings, keywords
+ * Gets VB symbols - ignores comments, strings, keywords
  */
 
 package org.opensolaris.opengrok.analysis.vb;
-import java.io.IOException;
-import java.io.Reader;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 
+import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 %%
 %public
 %class VBSymbolTokenizer
@@ -46,6 +44,7 @@ super(in);
 
 %state STRING COMMENT
 
+%include Common.lexh
 %include VB.lexh
 %%
 
@@ -64,12 +63,13 @@ super(in);
 }
 
 <STRING> {
+   \"\"    {}
    \"     { yybegin(YYINITIAL); }
-\\\\ | \\\"     {}
 }
 
 <COMMENT> {
-\n      { yybegin(YYINITIAL);}
+{WhiteSpace}    {}
+{EOL}     { yybegin(YYINITIAL);}
 }
 
 <YYINITIAL, STRING, COMMENT> {

src/org/opensolaris/opengrok/analysis/vb/VBXref.lex

@@ -23,20 +23,18 @@
  */
 
 /*
- * Cross reference a Java file
+ * Cross reference a VB file
  */
 
 package org.opensolaris.opengrok.analysis.vb;
-import org.opensolaris.opengrok.analysis.JFlexXref;
-import java.io.IOException;
-import java.io.Writer;
-import java.io.Reader;
-import org.opensolaris.opengrok.web.Util;
 
+import org.opensolaris.opengrok.analysis.JFlexXrefSimple;
+import org.opensolaris.opengrok.web.HtmlConsts;
+import org.opensolaris.opengrok.web.Util;
 %%
 %public
 %class VBXref
-%extends JFlexXref
+%extends JFlexXrefSimple
 %unicode
 %ignorecase
 %int
@@ -85,32 +83,46 @@ File = [a-zA-Z]{FNameChar}* "." ("vb"|"cls"|"frm"|"vbs"|"bas"|"ctl")
 /*{Hier}
         { out.write(Util.breadcrumbPath(urlPrefix+"defs=",yytext(),'.'));}
 */
-{Number}        { out.write("<span class=\"n\">"); out.write(yytext()); out.write("</span>"); }
-
- \"   { yybegin(STRING);out.write("<span class=\"s\">\"");}
- \'   { yybegin(COMMENT);out.write("<span class=\"c\">\'");}
+ {Number}        {
+    disjointSpan(HtmlConsts.NUMBER_CLASS);
+    out.write(yytext());
+    disjointSpan(null);
+ }
+
+ \"   {
+    pushSpan(STRING, HtmlConsts.STRING_CLASS);
+    out.write(htmlize(yytext()));
+ }
+ \'   {
+    pushSpan(COMMENT, HtmlConsts.COMMENT_CLASS);
+    out.write(htmlize(yytext()));
+ }
 }
 
 <STRING> {
- \" {WhiteSpace} \"  { out.write(yytext());}
-  \"     { yybegin(YYINITIAL); out.write("\"</span>"); }
-  \\\\   { out.write("\\\\"); }
- \\\"   { yybegin(YYINITIAL); out.write("\\\"</span>"); }
- 
+ \"\" |
+ \" {WhiteSpace} \"    { out.write(htmlize(yytext())); }
+ \"     {
+    out.write(htmlize(yytext()));
+    yypop();
+ }
+ {WhspChar}*{EOL}    {
+    disjointSpan(null);
+    startNewLine();
+    disjointSpan(HtmlConsts.STRING_CLASS);
+ }
 }
 
 <COMMENT> {
   {WhspChar}*{EOL} {
-    yybegin(YYINITIAL); out.write("</span>");
+    yypop();
     startNewLine();
   }
 }
 
 
 <YYINITIAL, STRING, COMMENT> {
-"&"     {out.write( "&amp;");}
-"<"     {out.write( "&lt;");}
-">"     {out.write( "&gt;");}
+[&<>\'\"]    { out.write(htmlize(yytext())); }
 {WhspChar}*{EOL}      { startNewLine(); }
  {WhiteSpace}   { out.write(yytext()); }
  [!-~]  { out.write(yycharat(0)); }

test/org/opensolaris/opengrok/analysis/vb/sample.cls

@@ -429,3 +429,9 @@ Private Sub Class_Initialize()
     Set Headers = New Collection
     Set Cookies = New Collection
 End Sub
+
+Private Sub Test_strings()
+    Dim foo1() As String
+    Set foo1 = " testing    
+    1-2-3"
+End Sub