Merge pull request #1931 from idodeclare/bugfix/ruby_end_interp

Bugfix/ruby end interp

Author: tarzanek

src/org/opensolaris/opengrok/analysis/ruby/RubyLexHelper.java

@@ -39,6 +39,7 @@
  */
 interface RubyLexer extends JFlexJointLexer {
     void maybeIntraState();
+    void popHelper();
 }
 
 /**
@@ -188,6 +189,12 @@ public void qop(String op, int namelength, boolean nointerp)
      */
     public void qop(boolean doWrite, String capture, int namelength,
         boolean nointerp) throws IOException {
+
+        // N.b. the following will write anyway -- despite any `doWrite'
+        // setting -- if interpolation is truly ending, but that is OK as a
+        // quote-like operator is not starting in that case.
+        if (maybeEndInterpolation(capture)) return;
+
         // If namelength is positive, allow that a non-zero-width word boundary
         // character may have needed to be matched since jflex does not conform
         // with \b as a zero-width simple word boundary. Excise it into
@@ -272,6 +279,8 @@ private void setEndQuoteChar(char opener) {
      * to output.
      */
     public void hqopPunc(String capture) throws IOException {
+        if (maybeEndInterpolation(capture)) return;
+
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
@@ -293,6 +302,8 @@ public void hqopPunc(String capture) throws IOException {
      * parts to output.
      */
     public void hqopSymbol(String capture) throws IOException {
+        if (maybeEndInterpolation(capture)) return;
+
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
@@ -452,12 +463,19 @@ public void interpop() {
      * {@code nendbrace}.
      * @return true if the interpolation state should end
      */
-    public boolean maybeEndInterpolation(String capture) {
+    public boolean maybeEndInterpolation(String capture) throws IOException {
         if (nendbrace <= 0) {
             return false;
         }
         if (capture.startsWith("}")) {
             if (--nendbrace <= 0) {
+                int rem = capture.length() - 1;
+                String opener = capture.substring(0, 1);
+                lexer.popHelper();
+                lexer.yypop();
+                lexer.disjointSpan(HtmlConsts.STRING_CLASS);
+                lexer.offerNonword(opener);
+                if (rem > 0) lexer.yypushback(rem);
                 return true;
             }
         } else if (capture.startsWith("{")) {

src/org/opensolaris/opengrok/analysis/ruby/RubyProductions.lexh

@@ -324,12 +324,9 @@ Here_EOF3 = [\`][^\r\n\`]*[\`]
 
     [\{\}]    {
         String capture = yytext();
-        if (h.maybeEndInterpolation(capture)) {
-            popHelper();
-            yypop();
-            disjointSpan(HtmlConsts.STRING_CLASS);
+        if (!h.maybeEndInterpolation(capture)) {
+            offerNonword(capture);
         }
-        offerNonword(capture);
     }
 }
 

src/org/opensolaris/opengrok/analysis/ruby/RubySymbolTokenizer.lex

@@ -133,7 +133,7 @@ import org.opensolaris.opengrok.web.Util;
         h = getNewHelper();
     }
 
-    protected void popHelper() {
+    public void popHelper() {
         h = helpers.pop();
     }
 

src/org/opensolaris/opengrok/analysis/ruby/RubyXref.lex

@@ -121,7 +121,7 @@ import org.opensolaris.opengrok.web.Util;
         h = getNewHelper();
     }
 
-    protected void popHelper() {
+    public void popHelper() {
         h = helpers.pop();
     }
 

test/org/opensolaris/opengrok/analysis/ruby/RubyXrefTest.java

@@ -31,6 +31,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import org.junit.Test;
@@ -71,6 +72,26 @@ public void sampleTest() throws IOException {
         assertLinesEqual("Ruby xref", estr, ostr);
     }
 
+    @Test
+    public void colonQuoteAfterInterpolation() throws IOException {
+        final String RUBY_COLON_QUOTE =
+            "\"from #{logfn}:\"\n";
+        RubyXref xref = new RubyXref(new StringReader(RUBY_COLON_QUOTE));
+
+        StringWriter out = new StringWriter();
+        xref.write(out);
+        String xout = out.toString();
+
+        final String xexpected = "<a class=\"l\" name=\"1\" href=\"#1\">1</a>"
+                + "<span class=\"s\">&quot;from #{</span>"
+                + "<a href=\"/source/s?defs=logfn\" "
+                + "class=\"intelliWindow-symbol\" "
+                + "data-definition-place=\"undefined-in-file\">logfn</a>"
+                + "<span class=\"s\">}:&quot;</span>\n" +
+            "<a class=\"l\" name=\"2\" href=\"#2\">2</a>\n";
+        assertLinesEqual("Ruby colon-quote", xexpected, xout);
+    }
+
     private void writeRubyXref(InputStream iss, PrintStream oss)
         throws IOException {
         oss.print(getHtmlBegin());

test/org/opensolaris/opengrok/analysis/ruby/ruby_xrefres.html

@@ -183,5 +183,7 @@
 <a class="l" name="175" href="#175">175</a><b>end</b>
 <a class="l" name="176" href="#176">176</a><b>print</b> <span class="s">&quot;\n&quot;</span>
 <a class="l" name="177" href="#177">177</a><b>print</b> <span class="s">&apos;<a href="http://example.com">http://example.com</a>&apos;</span>
-<a class="l" name="178" href="#178">178</a></body>
+<a class="l" name="178" href="#178">178</a><b>puts</b> <span class="s">&quot;Last #{</span><a href="/source/s?defs=log_lines" class="intelliWindow-symbol" data-definition-place="undefined-in-file">log_lines</a><span class="s">} lines from #{</span><a href="/source/s?defs=logfn" class="intelliWindow-symbol" data-definition-place="undefined-in-file">logfn</a><span class="s">}:&quot;</span>
+<a class="l" name="179" href="#179">179</a><b>print</b> <span class="s">&quot;\n&quot;</span>
+<a class="hl" name="180" href="#180">180</a></body>
 </html>

test/org/opensolaris/opengrok/analysis/ruby/sample.rb

@@ -175,3 +175,5 @@ def right
 end
 print "\n"
 print 'http://example.com'
+puts "Last #{log_lines} lines from #{logfn}:"
+print "\n"

test/org/opensolaris/opengrok/analysis/ruby/samplesymbols.txt

@@ -184,3 +184,5 @@ over?
 STDIN
 bd
 reset
+log_lines	# 177:puts "Last #{log_lines} lines from #{logfn}:"
+logfn