diff options
| -rw-r--r-- | parse.y | 6 | ||||
| -rw-r--r-- | test/ripper/test_lexer.rb | 20 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 35 insertions, 1 deletions
@@ -6808,6 +6808,12 @@ parser_here_document(struct parser_params *parser, NODE *here) newtok(); if (c == '#') { int t = parser_peek_variable_name(parser); + if (heredoc_line_indent != -1) { + if (heredoc_indent > heredoc_line_indent) { + heredoc_indent = heredoc_line_indent; + } + heredoc_line_indent = -1; + } if (t) return t; tokadd('#'); c = nextc(); diff --git a/test/ripper/test_lexer.rb b/test/ripper/test_lexer.rb index 72b7f1b5fd..03b64cce8f 100644 --- a/test/ripper/test_lexer.rb +++ b/test/ripper/test_lexer.rb @@ -32,4 +32,24 @@ class TestRipper::Lexer < Test::Unit::TestCase E assert_equal(str, Ripper.tokenize(str).join(""), bug) end + + def test_expr_at_beginning_in_heredoc + src = <<~'E' + <<~B + a + #{1} + B + E + expect = %I[ + on_heredoc_beg + on_nl + on_tstring_content + on_embexpr_beg + on_int + on_embexpr_end + on_tstring_content + on_heredoc_end + ] + assert_equal expect, Ripper.lex(src).map {|e| e[1]} + end end diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 749574f625..f9e27be33e 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -659,6 +659,14 @@ e" end end + def test_dedented_heredoc_expr_at_beginning + result = " a\n" \ + '#{1}'"\n" + expected = " a\n" \ + '#{1}'"\n" + assert_dedented_heredoc(expected, result) + end + def test_lineno_after_heredoc bug7559 = '[ruby-dev:46737]' expected, _, actual = __LINE__, <<eom, __LINE__ @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-02-03" -#define RUBY_PATCHLEVEL 231 +#define RUBY_PATCHLEVEL 232 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 |