merge revision(s) 5de38c41ae7bf17ae599fdfa9f8face87f16d8bb: [Backport #17644]

	ripper: fix a bug of Ripper::Lexer with syntax error and heredoc [Bug
	 #17644]

	---
	 ext/ripper/lib/ripper/lexer.rb |  2 +-
	 test/ripper/test_lexer.rb      | 12 ++++++++++++
	 2 files changed, 13 insertions(+), 1 deletion(-)

1 files changed, 12 insertions, 0 deletions

diff --git a/test/ripper/test_lexer.rb b/test/ripper/test_lexer.rb
index 3eaeb8fefa..975976a381 100644
--- a/test/ripper/test_lexer.rb
+++ b/test/ripper/test_lexer.rb
@@ -215,4 +215,16 @@ class TestRipper::Lexer < Test::Unit::TestCase
       end
     end
   end
+
+  def test_lex_with_syntax_error_and_heredo
+    bug = '[Bug #17644]'
+    s = <<~EOF
+        foo
+      end
+      <<~EOS
+        bar
+      EOS
+    EOF
+    assert_equal([[5, 0], :on_heredoc_end, "EOS\n", state(:EXPR_BEG)], Ripper.lex(s).last, bug)
+  end
 end