ruby-next-parser 3.1.0.0 → 3.1.0.1

data/lib/parser/ruby-next/lexer.rl

@@ -938,7 +938,11 @@ class Next
         #   b"
         # must be parsed as "ab"
         current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
-      elsif current_literal.regexp? && @version < 31
+      elsif current_literal.regexp? && @version >= 31 && %w[c C m M].include?(escaped_char)
+        # Ruby >= 3.1 escapes \c- and \m chars, that's the only escape sequence
+        # supported by regexes so far, so it needs a separate branch.
+        current_literal.extend_string(@escape, @ts, @te)
+      elsif current_literal.regexp?
         # Regular expressions should include escape sequences in their
         # escaped form. On the other hand, escaped newlines are removed (in cases like "\\C-\\\n\\M-x")
         current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
@@ -1439,6 +1443,18 @@ class Next
       => { emit(:tLABEL, tok(@ts, @te - 2), @ts, @te - 1)
            fhold; fnext expr_labelarg; fbreak; };
 
+      '...' c_nl
+      => {
+        if @version >= 31
+          emit(:tBDOT3, '...'.freeze, @ts, @te - 1)
+          emit(:tNL, "\n".freeze, @te - 1, @te)
+          fnext expr_end; fbreak;
+        else
+          p -= 4;
+          fhold; fgoto expr_end;
+        end
+      };
+
       w_space_comment;
 
       c_any
@@ -2043,19 +2059,38 @@ class Next
         fnext expr_beg; fbreak;
       };
 
-      '...'
+      '...' c_nl?
       => {
+        # Here we scan and conditionally emit "\n":
+        # + if it's there
+        #   + and emitted we do nothing
+        #   + and not emitted we return `p` to "\n" to process it on the next scan
+        # + if it's not there we do nothing
+        followed_by_nl = @te - 1 == @newline_s
+        nl_emitted = false
+        dots_te = followed_by_nl ? @te - 1 : @te
+
         if @version >= 30
           if @lambda_stack.any? && @lambda_stack.last + 1 == @paren_nest
             # To reject `->(...)` like `->...`
-            emit(:tDOT3)
+            emit(:tDOT3, '...'.freeze, @ts, dots_te)
           else
-            emit(:tBDOT3)
+            emit(:tBDOT3, '...'.freeze, @ts, dots_te)
+
+            if @version >= 31 && followed_by_nl && @context.in_def_open_args?
+              emit(:tNL, @te - 1, @te)
+              nl_emitted = true
+            end
           end
         elsif @version >= 27
-          emit(:tBDOT3)
+          emit(:tBDOT3, '...'.freeze, @ts, dots_te)
         else
-          emit(:tDOT3)
+          emit(:tDOT3, '...'.freeze, @ts, dots_te)
+        end
+
+        if followed_by_nl && !nl_emitted
+          # return "\n" to process it on the next scan
+          fhold;
         end
 
         fnext expr_beg; fbreak;

data/lib/parser/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  NEXT_VERSION = "3.1.0.0"
+  NEXT_VERSION = "3.1.0.1"
 end