Address feedback

ruby · Dec 13, 2023 · e02f06e · e02f06e
1 parent 218f22b
commit e02f06e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/irb.rb b/lib/irb.rb
@@ -1106,12 +1106,12 @@ def each_top_level_statement
     end
 
     COMMAND_FLAG_REGEXP = /(?<cmd_flag>-[a-zA-Z]+( +\S+)*)/
-    COMMAND_ARG_REGEXP = /(?<cmd_arg>[^-]\S*)/
+    COMMAND_ARG_REGEXP = /(?<cmd_arg>[^- ]\S*)/
     COMMAND_NAME_REGEXP = /(?<cmd_name>\S+)/
-    SIMPLE_COMMAND_REGEXP = /^#{COMMAND_NAME_REGEXP}$/
-    COMMAND_WITH_ARGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_ARG_REGEXP}$/
-    COMMAND_WITH_FLAGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_FLAG_REGEXP}$/
-    COMMAND_WITH_ARGS_AND_FLAGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_ARG_REGEXP} +#{COMMAND_FLAG_REGEXP}$/
+    SIMPLE_COMMAND_REGEXP = /^#{COMMAND_NAME_REGEXP}\z/
+    COMMAND_WITH_ARGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_ARG_REGEXP}\z/
+    COMMAND_WITH_FLAGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_FLAG_REGEXP}\z/
+    COMMAND_WITH_ARGS_AND_FLAGS_REGEXP = /^#{COMMAND_NAME_REGEXP} +#{COMMAND_ARG_REGEXP} +#{COMMAND_FLAG_REGEXP}\z/
 
     COMMAND_REGEXP = Regexp.union(
       SIMPLE_COMMAND_REGEXP,

diff --git a/test/irb/test_irb.rb b/test/irb/test_irb.rb
@@ -820,7 +820,8 @@ def test_irb_distinguihes_commands_and_non_commands_correctly
         "info if foo",
         "info ? foo : bar",
         "info ; foo",
-        "info ,other = expr"
+        "info ,other = expr",
+        "info  -" # when an input is not a command nor Ruby code, we want to make it Ruby so it raises syntax error
       ].each do |input|
         statement = irb.build_statement(input)
         assert_equal(IRB::Statement::Expression, statement.class, "Expected #{input} to not be a command")