Fixes #5210. Haml on JRuby 9.2.0.0 throws error evaluating interpolated element attribute with #

enebo · enebo · commit 84dcb314d42f · 2018-06-12T11:00:21.000-05:00
Seemingly innocuous else which did seem reasonable but apparently the pushback
of '#' was needed so parseStringIntoBuffer would see the '#' a second time to
know that we should not read in the second '#...'.
diff --git a/core/src/main/java/org/jruby/ext/ripper/StringTerm.java b/core/src/main/java/org/jruby/ext/ripper/StringTerm.java
@@ -161,9 +161,9 @@ public int parseString(RipperLexer lexer, LexerSource src) throws IOException {
             } else {
                 buffer.append(c);
             }
-        } else {
-            lexer.pushback(c);
         }
+        lexer.pushback(c);
+
         Encoding enc[] = new Encoding[1];
         enc[0] = lexer.getEncoding();
 

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,9 @@ public int parseString(RipperLexer lexer, LexerSource src) throws IOException {`
`161`	`161`	`} else {`
`162`	`162`	`buffer.append(c);`
`163`	`163`	`}`
`164`		`- } else {`
`165`		`- lexer.pushback(c);`
`166`	`164`	`}`
	`165`	`+ lexer.pushback(c);`
	`166`	`+`
`167`	`167`	`Encoding enc[] = new Encoding[1];`
`168`	`168`	`enc[0] = lexer.getEncoding();`
`169`	`169`