Combine duplicated code state check into method

Author: tompng

lib/irb/ruby-lex.rb

@@ -69,9 +69,7 @@ def configure_io(io)
           # Accept any single-line input for symbol aliases or commands that transform args
           next true if single_line_command?(code)
 
-          code.gsub!(/\s*\z/, '').concat("\n")
-          tokens = self.class.ripper_lex_without_warning(code, context: @context)
-          ltype, indent, continue, code_block_open = check_state(code, tokens)
+          ltype, indent, continue, code_block_open = check_code_state(code)
           if ltype or indent > 0 or continue or code_block_open
             false
           else
@@ -209,6 +207,12 @@ def check_state(code, tokens)
     [ltype, indent, continue, code_block_open]
   end
 
+  def check_code_state(code)
+    check_target_code = code.gsub(/\s*\z/, '').concat("\n")
+    tokens = self.class.ripper_lex_without_warning(check_target_code, context: @context)
+    check_state(check_target_code, tokens)
+  end
+
   def save_prompt_to_context_io(ltype, indent, continue, line_num_offset)
     # Implicitly saves prompt string to `@context.io.prompt`. This will be used in the next `@input.call`.
     @prompt.call(ltype, indent, continue, @line_no + line_num_offset)
@@ -233,9 +237,7 @@ def readmultiline
       # Accept any single-line input for symbol aliases or commands that transform args
       return code if single_line_command?(code)
 
-      check_target_code = code.gsub(/\s*\z/, '').concat("\n")
-      tokens = self.class.ripper_lex_without_warning(check_target_code, context: @context)
-      ltype, indent, continue, code_block_open = check_state(check_target_code, tokens)
+      ltype, indent, continue, code_block_open = check_code_state(code)
       return code unless ltype or indent > 0 or continue or code_block_open
 
       line_offset += 1

test/irb/test_ruby_lex.rb

@@ -96,10 +96,8 @@ def assert_code_block_open(lines, expected, local_variables: [])
 
     def check_state(lines, local_variables: [])
       context = build_context(local_variables)
-      code = lines.join("\n")
-      tokens = RubyLex.ripper_lex_without_warning(code, context: context)
       ruby_lex = RubyLex.new(context)
-      _ltype, indent, _continue, code_block_open = ruby_lex.check_state(code, tokens)
+      _ltype, indent, _continue, code_block_open = ruby_lex.check_code_state(lines.join("\n"))
       [indent, code_block_open]
     end