From 420d3f476b8794b48cce3d572325f98b56a0abbb Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Fri, 26 Apr 2024 18:29:17 +0100
Subject: [PATCH] Suppress command return values

Since commands can't be chained with methods, their return values are
not intended to be used. But if IRB keeps storing command return values
as the last value, and print them, users may rely on such implicit
behaviour.

So to avoid such confusion, this commit suppresses command's
return values. It also updates some commands that currently rely on
this implicit behaviour.
---
 lib/irb/command/chws.rb   |  5 +++--
 lib/irb/command/subirb.rb |  5 ++++-
 lib/irb/context.rb        |  7 ++++---
 test/irb/test_command.rb  | 14 ++++++--------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/irb/command/chws.rb b/lib/irb/command/chws.rb
index e0a406885..ef456d096 100644
--- a/lib/irb/command/chws.rb
+++ b/lib/irb/command/chws.rb
@@ -15,7 +15,7 @@ class CurrentWorkingWorkspace < Base
       description "Show the current workspace."
 
       def execute(_arg)
-        irb_context.main
+        puts "Current workspace: #{irb_context.main}"
       end
     end
 
@@ -30,7 +30,8 @@ def execute(arg)
           obj = eval(arg, irb_context.workspace.binding)
           irb_context.change_workspace(obj)
         end
-        irb_context.main
+
+        puts "Current workspace: #{irb_context.main}"
       end
     end
   end
diff --git a/lib/irb/command/subirb.rb b/lib/irb/command/subirb.rb
index 138d61c93..85af28c1a 100644
--- a/lib/irb/command/subirb.rb
+++ b/lib/irb/command/subirb.rb
@@ -49,6 +49,7 @@ def execute_internal(*obj)
 
         extend_irb_context
         IRB.irb(nil, *obj)
+        puts IRB.JobManager.inspect
       end
     end
 
@@ -65,7 +66,7 @@ def execute(_arg)
         end
 
         extend_irb_context
-        IRB.JobManager
+        puts IRB.JobManager.inspect
       end
     end
 
@@ -90,6 +91,7 @@ def execute_internal(key = nil)
 
         raise CommandArgumentError.new("Please specify the id of target IRB job (listed in the `jobs` command).") unless key
         IRB.JobManager.switch(key)
+        puts IRB.JobManager.inspect
       end
     end
 
@@ -112,6 +114,7 @@ def execute_internal(*keys)
 
         extend_irb_context
         IRB.JobManager.kill(*keys)
+        puts IRB.JobManager.inspect
       end
     end
   end
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 836b8d262..22e855f1e 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -587,18 +587,19 @@ def inspect_mode=(opt)
 
     def evaluate(statement, line_no) # :nodoc:
       @line_no = line_no
-      result = nil
 
       case statement
       when Statement::EmptyInput
         return
       when Statement::Expression
         result = evaluate_expression(statement.code, line_no)
+        set_last_value(result)
       when Statement::Command
-        result = statement.command_class.execute(self, statement.arg)
+        statement.command_class.execute(self, statement.arg)
+        set_last_value(nil)
       end
 
-      set_last_value(result)
+      nil
     end
 
     def evaluate_expression(code, line_no) # :nodoc:
diff --git a/test/irb/test_command.rb b/test/irb/test_command.rb
index 76789216c..8cb8928ad 100644
--- a/test/irb/test_command.rb
+++ b/test/irb/test_command.rb
@@ -485,12 +485,11 @@ class Foo; end
   class CwwsTest < WorkspaceCommandTestCase
     def test_cwws_returns_the_current_workspace_object
       out, err = execute_lines(
-        "cwws",
-        "self.class"
+        "cwws"
       )
 
       assert_empty err
-      assert_include(out, self.class.name)
+      assert_include(out, "Current workspace: #{self}")
     end
   end
 
@@ -556,7 +555,7 @@ def test_popws_replaces_the_current_workspace_with_the_previous_one
         "pushws Foo.new\n",
         "popws\n",
         "cwws\n",
-        "_.class",
+        "self.class",
       )
       assert_empty err
       assert_include(out, "=> #{self.class}")
@@ -576,20 +575,19 @@ def test_chws_replaces_the_current_workspace
       out, err = execute_lines(
         "chws #{self.class}::Foo.new\n",
         "cwws\n",
-        "_.class",
+        "self.class\n"
       )
       assert_empty err
+      assert_include(out, "Current workspace: #<#{self.class.name}::Foo")
       assert_include(out, "=> #{self.class}::Foo")
     end
 
     def test_chws_does_nothing_when_receiving_no_argument
       out, err = execute_lines(
         "chws\n",
-        "cwws\n",
-        "_.class",
       )
       assert_empty err
-      assert_include(out, "=> #{self.class}")
+      assert_include(out, "Current workspace: #{self}")
     end
   end