Fix dstr-laden dedents?

jruby · Apr 1, 2016 · f568b8d · f568b8d
1 parent 88ce89a
commit f568b8d
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -298,11 +298,12 @@ public void heredoc_dedent(Node root) {
         } else if (root instanceof ListNode) {
             ListNode list = (ListNode) root;
             int length = list.size();
-            // FIXME: I need a test case to see how this fails because MRI has bol (begin of line) boolean when
-            // it encounters non-str/dstr nodes but I am missing the knowledge to understand why it is needed
-            // and our layout is not as general as theirs so I cannot just nd->lit.
+            int currentLine = -1;
             for (int i = 0; i < length; i++) {
                 Node child = list.get(i);
+                if (currentLine == child.getLine()) continue;  // Only process first element on a line?
+
+                currentLine = child.getLine();                 // New line
 
                 if (child instanceof StrNode) {
                     dedent_string(((StrNode) child).getValue(), indent);

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
@@ -1,7 +1,6 @@
 exclude :test__END___cr, "needs investigation"
 exclude :test_constant_reassignment_nested, "needs investigation"
 exclude :test_constant_reassignment_toplevel, "needs investigation"
-exclude :test_dedented_heredoc_with_interpolated_string, "needs investigation"
 exclude :test_defined_empty_argument, "needs investigation"
 exclude :test_duplicated_when, "needs investigation"
 exclude :test_error_message_encoding, "#2127"