mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00

* Get rid of inconsistent dll linkages against vcpkg readline * [ruby/irb] Enhance colored inspect output https://github.com/ruby/irb/commit/dffcdb5269 * [ruby/irb] Add color_printer.rb to gemspec https://github.com/ruby/irb/commit/b4df0fd8b2 * [ruby/irb] Fix failing tests https://github.com/ruby/irb/commit/7723ade899 * irb: add more syntax errors colorizing support (#3967) * [ruby/irb] Do not colorize partially-correct inspect This is to prevent a yellow-mixed output for ActiveSupport::TimeWithZone. Follows up https://github.com/ruby/irb/pull/159 and https://github.com/ruby/ruby/pull/3967.a5804c3560
* [ruby/irb] Remove unnecessary ignore_error in dispatch_seq Just forgotten ina5804c3560
https://github.com/ruby/irb/commit/e42e548793 * Increase timeout for reline with --jit-wait for failures like: http://ci.rvm.jp/logfiles/brlog.trunk-mjit-wait.20201229-130509 http://ci.rvm.jp/logfiles/brlog.trunk-mjit-wait.20201229-165132 http://ci.rvm.jp/logfiles/brlog.trunk-mjit-wait.20201228-015519 * [ruby/irb] Stringify when a non-object is passed to PP#text If a nested object is passed to #pp, it may be sometimes passed to the #text method as an object without being stringified. This is fixed on the Ruby main repository;433a3be86a
but it was a bug of Ripper so still needs this workaround for using irb as a gem on Ruby 3.0.0 or earlier. Co-authored-by: k0kubun <takashikkbn@gmail.com> https://github.com/ruby/irb/commit/8d13df22ee * [ruby/irb] Newline in oneliner def doesn't reset indent This closes ruby/irb#132. https://github.com/ruby/irb/commit/43456dcf5e * [ruby/irb] Escape invalid byte sequence in Exception This fixes ruby/irb#141. https://github.com/ruby/irb/commit/0815317d42 * [ruby/irb] Handle indentations related to keyword "do" correctly This fixes ruby/irb#158. https://github.com/ruby/irb/commit/964643400b * [ruby/irb] Heredoc may contain multiple newlines in a single token Use the start token as the indentation criteria so that it works properly in heredoc. ref. https://github.com/ruby/reline/pull/242 https://github.com/ruby/irb/commit/9704808dfd * [ruby/irb] Use Ripper::Lexer#scan to take broken tokens ref. https://github.com/ruby/reline/pull/242 https://github.com/ruby/irb/commit/54f90cb6c9 * [ruby/irb] Use error tokens if there are no correct tokens in the same place For example, the broken code "%www" will result in only one error token. https://github.com/ruby/irb/commit/9fa39a7cf3 * [ruby/irb] Ensure to restore $VERBOSE https://github.com/ruby/irb/commit/cef474a76a * 600x larger timeout for Reline I didn't notice it's msec. 2.5s is too short. http://ci.rvm.jp/results/trunk-mjit-wait@phosphorus-docker/3311385 * [ruby/irb] fix typo in `IRB::Irb#convert_invalid_byte_sequence` https://github.com/ruby/irb/commit/d09d3c3d68 * [ruby/irb] do not escape a predicate method for doc namespace * Fixes #88 https://github.com/ruby/irb/commit/d431a30af4 * [ruby/irb] refactoring an error handling in `IRB::Inspector` * moved rescue clause to `#inspect_value` to catch all failures in inspectors * test with all (currently five kind of) inspect modes - tweaked the input due to only `Marshal` can inspect(dump) a `BasicObject` https://github.com/ruby/irb/commit/9d112fab8e * [ruby/irb] Use Exception#full_message to show backtrace in the correct order [Bug #17466] https://github.com/ruby/irb/commit/1c76845cca * [ruby/irb] Fix BACK_TRACE_LIMIT logic https://github.com/ruby/irb/commit/30dc5d43fe * irb: Drop lines from backtrace for tests in Ruby repository * [ruby/reline] Update cursor correctly when just cursor moving This fixes ruby/reline#236 and ruby/reline#239. https://github.com/ruby/reline/commit/3e3c89d00b * [ruby/reline] Correct var names in Reline were different from vi-*-mode-string https://github.com/ruby/reline/commit/8255fc93b9 * [ruby/reline] Remove debug print https://github.com/ruby/reline/commit/d7fbaedc6a * [ruby/reline] Suppress crashing when auto_indent_proc returns broken indent info Co-authored-by: Juanito Fatas <me@juanitofatas.com> https://github.com/ruby/reline/commit/7c24276275 * [ruby/reline] Suppress crashing when dynamic_prompt_proc returns a broken prompt list Co-authored-by: Juanito Fatas <me@juanitofatas.com> https://github.com/ruby/reline/commit/558f7be168 * [ruby/reline] Suppress auto indent for adding newlines in pasting Co-authored-by: Juanito Fatas <me@juanitofatas.com> https://github.com/ruby/reline/commit/074bb017a7 * [ruby/reline] Add acknowledgments and license for rb-readline https://github.com/ruby/reline/commit/19df59b916 * [ruby/irb] Fix comment, irb gem supports 2.5.0 or older https://github.com/ruby/irb/commit/36118015ba * should use `assert_include` here. Random ordering test can introduce antoher candidate so it should be `assert_include`. * [ruby/irb] Add missing require This is useful if you want to use IRB::ColorPrinter as a library like: ``` begin require 'irb/color_printer' IRB::ColorPrinter.pp(obj) rescue LoadError pp(obj) end ``` https://github.com/ruby/irb/commit/f8461691c7 * [ruby/irb] Make IRB::ColorPrinter.pp compatible with PP.pp The incompatible interface is not helpful, again if you want to use it as a standalone library, falling it back to PP. Original PP.pp also ends with `out << "\n"`. https://github.com/ruby/irb/commit/4c74c7d84c * Suppress constant redefinition warnings * Fix the failing test with XDG_CONFIG_HOME * [ruby/irb] Version 1.3.1 https://github.com/ruby/irb/commit/c230d08911 * [ruby/reline] Handle ed_search_{prev,next}_history in multiline correctly The current line was being handled incorrectly when displaying the hit history, so it has been fixed to be correct. https://github.com/ruby/reline/commit/a3df4343b3 * [ruby/reline] Move the cursor correctly when deleting at eol This fixes ruby/reline#246. https://github.com/ruby/reline/commit/07a73ba601 * [ruby/reline] Version 0.2.1 https://github.com/ruby/reline/commit/a3b3c6ee60 * [ruby/reline] Initialize a variable just in case https://github.com/ruby/reline/commit/29b10f6e98 * [ruby/reline] Tests with yamatanooroti don't need chdir Because of chdir, log files ware created in temporary directries on Windows. https://github.com/ruby/reline/commit/200b469a68 * [ruby/reline] Windows needs more times to wait rendering https://github.com/ruby/reline/commit/53ff2b09c7 * [ruby/reline] Support for change in Windows-specific behavior at eol The behavior of automatically moving the cursor to the next line when displaying a char at the eol on Windows suddenly disappeared. https://github.com/ruby/reline/commit/cad4de6ee8 * [ruby/reline] Reline::Windows.erase_after_cursor erases attributes too https://github.com/ruby/reline/commit/68b961dfc7 * [ruby/irb] [ruby/irb] [ruby/reline] Version 0.2.2 https://github.com/ruby/reline/commit/dfb710946f https://github.com/ruby/irb/commit/1a1cdf9628 https://github.com/ruby/irb/commit/fe99faf8bd * [ruby/irb] handle `__ENCODING__` as a keyword as well https://github.com/ruby/irb/commit/a6a33d908f * [ruby/irb] handle repeated exception separately https://github.com/ruby/irb/commit/fcf6b34bc5 * [ruby/irb] skip a failling test on TruffleRuby * due to the difference of backtrace pointed out by @aycabta https://github.com/ruby/irb/commit/5e00a0ae61 * [ruby/irb] Version 1.3.2 https://github.com/ruby/irb/commit/a7699026cc Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org> Co-authored-by: Takashi Kokubun <takashikkbn@gmail.com> Co-authored-by: Nobuhiro IMAI <nov@yo.rim.or.jp> Co-authored-by: Koichi Sasada <ko1@atdot.net> Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
136 lines
3.8 KiB
Ruby
136 lines
3.8 KiB
Ruby
# frozen_string_literal: false
|
|
#
|
|
# irb/inspector.rb - inspect methods
|
|
# $Release Version: 0.9.6$
|
|
# $Revision: 1.19 $
|
|
# $Date: 2002/06/11 07:51:31 $
|
|
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
|
|
#
|
|
# --
|
|
#
|
|
#
|
|
#
|
|
|
|
module IRB # :nodoc:
|
|
|
|
|
|
# Convenience method to create a new Inspector, using the given +inspect+
|
|
# proc, and optional +init+ proc and passes them to Inspector.new
|
|
#
|
|
# irb(main):001:0> ins = IRB::Inspector(proc{ |v| "omg! #{v}" })
|
|
# irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
|
|
# irb(main):001:0> "what?" #=> omg! what?
|
|
#
|
|
def IRB::Inspector(inspect, init = nil)
|
|
Inspector.new(inspect, init)
|
|
end
|
|
|
|
# An irb inspector
|
|
#
|
|
# In order to create your own custom inspector there are two things you
|
|
# should be aware of:
|
|
#
|
|
# Inspector uses #inspect_value, or +inspect_proc+, for output of return values.
|
|
#
|
|
# This also allows for an optional #init+, or +init_proc+, which is called
|
|
# when the inspector is activated.
|
|
#
|
|
# Knowing this, you can create a rudimentary inspector as follows:
|
|
#
|
|
# irb(main):001:0> ins = IRB::Inspector.new(proc{ |v| "omg! #{v}" })
|
|
# irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
|
|
# irb(main):001:0> "what?" #=> omg! what?
|
|
#
|
|
class Inspector
|
|
# Default inspectors available to irb, this includes:
|
|
#
|
|
# +:pp+:: Using Kernel#pretty_inspect
|
|
# +:yaml+:: Using YAML.dump
|
|
# +:marshal+:: Using Marshal.dump
|
|
INSPECTORS = {}
|
|
|
|
# Determines the inspector to use where +inspector+ is one of the keys passed
|
|
# during inspector definition.
|
|
def self.keys_with_inspector(inspector)
|
|
INSPECTORS.select{|k,v| v == inspector}.collect{|k, v| k}
|
|
end
|
|
|
|
# Example
|
|
#
|
|
# Inspector.def_inspector(key, init_p=nil){|v| v.inspect}
|
|
# Inspector.def_inspector([key1,..], init_p=nil){|v| v.inspect}
|
|
# Inspector.def_inspector(key, inspector)
|
|
# Inspector.def_inspector([key1,...], inspector)
|
|
def self.def_inspector(key, arg=nil, &block)
|
|
if block_given?
|
|
inspector = IRB::Inspector(block, arg)
|
|
else
|
|
inspector = arg
|
|
end
|
|
|
|
case key
|
|
when Array
|
|
for k in key
|
|
def_inspector(k, inspector)
|
|
end
|
|
when Symbol
|
|
INSPECTORS[key] = inspector
|
|
INSPECTORS[key.to_s] = inspector
|
|
when String
|
|
INSPECTORS[key] = inspector
|
|
INSPECTORS[key.intern] = inspector
|
|
else
|
|
INSPECTORS[key] = inspector
|
|
end
|
|
end
|
|
|
|
# Creates a new inspector object, using the given +inspect_proc+ when
|
|
# output return values in irb.
|
|
def initialize(inspect_proc, init_proc = nil)
|
|
@init = init_proc
|
|
@inspect = inspect_proc
|
|
end
|
|
|
|
# Proc to call when the inspector is activated, good for requiring
|
|
# dependent libraries.
|
|
def init
|
|
@init.call if @init
|
|
end
|
|
|
|
# Proc to call when the input is evaluated and output in irb.
|
|
def inspect_value(v)
|
|
@inspect.call(v)
|
|
rescue
|
|
puts "(Object doesn't support #inspect)"
|
|
''
|
|
end
|
|
end
|
|
|
|
Inspector.def_inspector([false, :to_s, :raw]){|v| v.to_s}
|
|
Inspector.def_inspector([:p, :inspect]){|v|
|
|
result = v.inspect
|
|
if IRB.conf[:MAIN_CONTEXT]&.use_colorize? && Color.inspect_colorable?(v)
|
|
result = Color.colorize_code(result)
|
|
end
|
|
result
|
|
}
|
|
Inspector.def_inspector([true, :pp, :pretty_inspect], proc{require "irb/color_printer"}){|v|
|
|
if IRB.conf[:MAIN_CONTEXT]&.use_colorize?
|
|
IRB::ColorPrinter.pp(v, '').chomp
|
|
else
|
|
v.pretty_inspect.chomp
|
|
end
|
|
}
|
|
Inspector.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
|
|
begin
|
|
YAML.dump(v)
|
|
rescue
|
|
puts "(can't dump yaml. use inspect)"
|
|
v.inspect
|
|
end
|
|
}
|
|
|
|
Inspector.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v|
|
|
Marshal.dump(v)
|
|
}
|
|
end
|