Dispatch invalid hex escape content too

2 files changed, 6 insertions, 4 deletions

diff --git a/parse.y b/parse.y
index 1e59e832ec..f767108181 100644
--- a/parse.y
+++ b/parse.y
@@ -7791,7 +7791,7 @@ tok_hex(struct parser_params *p, size_t *numlen)
     c = (int)ruby_scan_hex(p->lex.pcur, 2, numlen);
     if (!*numlen) {
         yyerror0("invalid hex escape");
-        token_flush(p);
+        dispatch_scan_event(p, tSTRING_CONTENT);
         return 0;
     }
     p->lex.pcur += *numlen;
diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb
index 9739cdb1eb..792f19ef1a 100644
--- a/test/ripper/test_scanner_events.rb
+++ b/test/ripper/test_scanner_events.rb
@@ -997,13 +997,15 @@ class TestRipper::ScannerEvents < Test::Unit::TestCase
     assert_equal [:on_parse_error, "Invalid escape character syntax", "\\C-\u{3042}"], err
   end
 
-  def test_invalid_hex_escape
+  def test_invalid_hex_escape_string
     err = nil
-    assert_equal ['U'], scan('tstring_content', '"\\xU"') {|*e| err = e}
+    assert_equal ['\\x', 'U'], scan('tstring_content', '"\\xU"') {|*e| err = e}
     assert_equal [:on_parse_error, "invalid hex escape", "\\x"], err
+  end
 
+  def test_invalid_hex_escape_regexp
     err = nil
-    assert_equal ['U'], scan('tstring_content', '/\\xU/') {|*e| err = e}
+    assert_equal ['\\x', 'U'], scan('tstring_content', '/\\xU/') {|*e| err = e}
     assert_equal [:on_parse_error, "invalid hex escape", "\\x"], err
   end