summaryrefslogtreecommitdiff
path: root/lib/irb.rb
diff options
context:
space:
mode:
authorSteven Willis <onlynone@gmail.com>2019-03-20 14:50:05 -0400
committeraycabta <aycabta@gmail.com>2019-08-16 06:02:45 +0900
commit9d2fed2ccd1724d1cf42a3075c20dcc418082761 (patch)
tree6d0b39971266514a879afea3560606e82c1bb443 /lib/irb.rb
parent74726691bada2f2061c57169f4c36a50a9f500ab (diff)
Don't echo results of assignment expressions
Diffstat (limited to 'lib/irb.rb')
-rw-r--r--lib/irb.rb44
1 files changed, 43 insertions, 1 deletions
diff --git a/lib/irb.rb b/lib/irb.rb
index a08aa87..a41d4e1 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -10,6 +10,7 @@
#
#
require "e2mmap"
+require "ripper"
require "irb/init"
require "irb/context"
@@ -410,6 +411,35 @@ module IRB
end
class Irb
+ ASSIGNMENT_NODE_TYPES = [
+ # Local, instance, global, class, constant, instance, and index assignment:
+ # "foo = bar",
+ # "@foo = bar",
+ # "$foo = bar",
+ # "@@foo = bar",
+ # "::Foo = bar",
+ # "a::Foo = bar",
+ # "Foo = bar"
+ # "foo.bar = 1"
+ # "foo[1] = bar"
+ :assign,
+
+ # Operation assignment:
+ # "foo += bar"
+ # "foo -= bar"
+ # "foo ||= bar"
+ # "foo &&= bar"
+ :opassign,
+
+ # Multiple assignment:
+ # "foo, bar = 1, 2
+ :massign,
+ ]
+ # Note: instance and index assignment expressions could also be written like:
+ # "foo.bar=(1)" and "foo.[]=(1, bar)", when expressed that way, the former
+ # be parsed as :assign and echo will be suppressed, but the latter is
+ # parsed as a :method_add_arg and the output won't be suppressed
+
# Creates a new irb session
def initialize(workspace = nil, input_method = nil, output_method = nil)
@context = Context.new(self, workspace, input_method, output_method)
@@ -498,7 +528,7 @@ module IRB
begin
line.untaint
@context.evaluate(line, line_no, exception: exc)
- output_value if @context.echo?
+ output_value if @context.echo? && (@context.echo_on_assignment? || !assignment_expression?(line))
rescue Interrupt => exc
rescue SystemExit, SignalException
raise
@@ -717,6 +747,18 @@ module IRB
format("#<%s: %s>", self.class, ary.join(", "))
end
+ def assignment_expression?(line)
+ # Try to parse the line and check if the last of possibly multiple
+ # expressions is an assignment type.
+
+ # If the expression is invalid, Ripper.sexp should return nil which will
+ # result in false being returned. Any valid expression should return an
+ # s-expression where the second selement of the top level array is an
+ # array of parsed expressions. The first element of each expression is the
+ # expression's type.
+ ASSIGNMENT_NODE_TYPES.include?(Ripper.sexp(line)&.dig(1,-1,0))
+ end
+
ATTR_TTY = "\e[%sm"
def ATTR_TTY.[](*a) self % a.join(";"); end
ATTR_PLAIN = ""