mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 01:54:00 +02:00

* Get rid of inconsistent dll linkages against vcpkg readline * [ruby/irb] Enhance colored inspect outputdffcdb5269
* [ruby/irb] Add color_printer.rb to gemspecb4df0fd8b2
* [ruby/irb] Fix failing tests7723ade899
* 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
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>8d13df22ee
* [ruby/irb] Newline in oneliner def doesn't reset indent This closes ruby/irb#132.43456dcf5e
* [ruby/irb] Escape invalid byte sequence in Exception This fixes ruby/irb#141.0815317d42
* [ruby/irb] Handle indentations related to keyword "do" correctly This fixes ruby/irb#158.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/2429704808dfd
* [ruby/irb] Use Ripper::Lexer#scan to take broken tokens ref. https://github.com/ruby/reline/pull/24254f90cb6c9
* [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.9fa39a7cf3
* [ruby/irb] Ensure to restore $VERBOSEcef474a76a
* 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`d09d3c3d68
* [ruby/irb] do not escape a predicate method for doc namespace * Fixes #88d431a30af4
* [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`9d112fab8e
* [ruby/irb] Use Exception#full_message to show backtrace in the correct order [Bug #17466]1c76845cca
* [ruby/irb] Fix BACK_TRACE_LIMIT logic30dc5d43fe
* 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.3e3c89d00b
* [ruby/reline] Correct var names in Reline were different from vi-*-mode-string8255fc93b9
* [ruby/reline] Remove debug printd7fbaedc6a
* [ruby/reline] Suppress crashing when auto_indent_proc returns broken indent info Co-authored-by: Juanito Fatas <me@juanitofatas.com>7c24276275
* [ruby/reline] Suppress crashing when dynamic_prompt_proc returns a broken prompt list Co-authored-by: Juanito Fatas <me@juanitofatas.com>558f7be168
* [ruby/reline] Suppress auto indent for adding newlines in pasting Co-authored-by: Juanito Fatas <me@juanitofatas.com>074bb017a7
* [ruby/reline] Add acknowledgments and license for rb-readline19df59b916
* [ruby/irb] Fix comment, irb gem supports 2.5.0 or older36118015ba
* 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 ```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"`.4c74c7d84c
* Suppress constant redefinition warnings * Fix the failing test with XDG_CONFIG_HOME * [ruby/irb] Version 1.3.1c230d08911
* [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.a3df4343b3
* [ruby/reline] Move the cursor correctly when deleting at eol This fixes ruby/reline#246.07a73ba601
* [ruby/reline] Version 0.2.1a3b3c6ee60
* [ruby/reline] Initialize a variable just in case29b10f6e98
* [ruby/reline] Tests with yamatanooroti don't need chdir Because of chdir, log files ware created in temporary directries on Windows.200b469a68
* [ruby/reline] Windows needs more times to wait rendering53ff2b09c7
* [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.cad4de6ee8
* [ruby/reline] Reline::Windows.erase_after_cursor erases attributes too68b961dfc7
* [ruby/irb] [ruby/irb] [ruby/reline] Version 0.2.2dfb710946f
1a1cdf9628
fe99faf8bd
* [ruby/irb] handle `__ENCODING__` as a keyword as wella6a33d908f
* [ruby/irb] handle repeated exception separatelyfcf6b34bc5
* [ruby/irb] skip a failling test on TruffleRuby * due to the difference of backtrace pointed out by @aycabta5e00a0ae61
* [ruby/irb] Version 1.3.2a7699026cc
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>
304 lines
9.6 KiB
Ruby
304 lines
9.6 KiB
Ruby
require 'fiddle/import'
|
|
|
|
class Reline::Windows
|
|
def self.encoding
|
|
Encoding::UTF_8
|
|
end
|
|
|
|
def self.win?
|
|
true
|
|
end
|
|
|
|
RAW_KEYSTROKE_CONFIG = {
|
|
[224, 72] => :ed_prev_history, # ↑
|
|
[224, 80] => :ed_next_history, # ↓
|
|
[224, 77] => :ed_next_char, # →
|
|
[224, 75] => :ed_prev_char, # ←
|
|
[224, 83] => :key_delete, # Del
|
|
[224, 71] => :ed_move_to_beg, # Home
|
|
[224, 79] => :ed_move_to_end, # End
|
|
[ 0, 41] => :ed_unassigned, # input method on/off
|
|
[ 0, 72] => :ed_prev_history, # ↑
|
|
[ 0, 80] => :ed_next_history, # ↓
|
|
[ 0, 77] => :ed_next_char, # →
|
|
[ 0, 75] => :ed_prev_char, # ←
|
|
[ 0, 83] => :key_delete, # Del
|
|
[ 0, 71] => :ed_move_to_beg, # Home
|
|
[ 0, 79] => :ed_move_to_end # End
|
|
}
|
|
|
|
if defined? JRUBY_VERSION
|
|
require 'win32api'
|
|
else
|
|
class Win32API
|
|
DLL = {}
|
|
TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
|
|
POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
|
|
|
|
WIN32_TYPES = "VPpNnLlIi"
|
|
DL_TYPES = "0SSI"
|
|
|
|
def initialize(dllname, func, import, export = "0", calltype = :stdcall)
|
|
@proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
|
|
import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
|
|
export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
|
|
calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
|
|
|
|
handle = DLL[dllname] ||=
|
|
begin
|
|
Fiddle.dlopen(dllname)
|
|
rescue Fiddle::DLError
|
|
raise unless File.extname(dllname).empty?
|
|
Fiddle.dlopen(dllname + ".dll")
|
|
end
|
|
|
|
@func = Fiddle::Function.new(handle[func], import, export, calltype)
|
|
rescue Fiddle::DLError => e
|
|
raise LoadError, e.message, e.backtrace
|
|
end
|
|
|
|
def call(*args)
|
|
import = @proto.split("")
|
|
args.each_with_index do |x, i|
|
|
args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
|
|
args[i], = [x].pack("I").unpack("i") if import[i] == "I"
|
|
end
|
|
ret, = @func.call(*args)
|
|
return ret || 0
|
|
end
|
|
end
|
|
end
|
|
|
|
VK_MENU = 0x12
|
|
VK_LMENU = 0xA4
|
|
VK_CONTROL = 0x11
|
|
VK_SHIFT = 0x10
|
|
STD_INPUT_HANDLE = -10
|
|
STD_OUTPUT_HANDLE = -11
|
|
WINDOW_BUFFER_SIZE_EVENT = 0x04
|
|
FILE_TYPE_PIPE = 0x0003
|
|
FILE_NAME_INFO = 2
|
|
@@getwch = Win32API.new('msvcrt', '_getwch', [], 'I')
|
|
@@kbhit = Win32API.new('msvcrt', '_kbhit', [], 'I')
|
|
@@GetKeyState = Win32API.new('user32', 'GetKeyState', ['L'], 'L')
|
|
@@GetConsoleScreenBufferInfo = Win32API.new('kernel32', 'GetConsoleScreenBufferInfo', ['L', 'P'], 'L')
|
|
@@SetConsoleCursorPosition = Win32API.new('kernel32', 'SetConsoleCursorPosition', ['L', 'L'], 'L')
|
|
@@GetStdHandle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
|
|
@@FillConsoleOutputCharacter = Win32API.new('kernel32', 'FillConsoleOutputCharacter', ['L', 'L', 'L', 'L', 'P'], 'L')
|
|
@@ScrollConsoleScreenBuffer = Win32API.new('kernel32', 'ScrollConsoleScreenBuffer', ['L', 'P', 'P', 'L', 'P'], 'L')
|
|
@@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
|
|
@@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
|
|
@@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
|
|
@@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
|
|
@@GetFileType = Win32API.new('kernel32', 'GetFileType', ['L'], 'L')
|
|
@@GetFileInformationByHandleEx = Win32API.new('kernel32', 'GetFileInformationByHandleEx', ['L', 'I', 'P', 'L'], 'I')
|
|
@@FillConsoleOutputAttribute = Win32API.new('kernel32', 'FillConsoleOutputAttribute', ['L', 'L', 'L', 'L', 'P'], 'L')
|
|
|
|
@@input_buf = []
|
|
@@output_buf = []
|
|
|
|
def self.msys_tty?(io=@@hConsoleInputHandle)
|
|
# check if fd is a pipe
|
|
if @@GetFileType.call(io) != FILE_TYPE_PIPE
|
|
return false
|
|
end
|
|
|
|
bufsize = 1024
|
|
p_buffer = "\0" * bufsize
|
|
res = @@GetFileInformationByHandleEx.call(io, FILE_NAME_INFO, p_buffer, bufsize - 2)
|
|
return false if res == 0
|
|
|
|
# get pipe name: p_buffer layout is:
|
|
# struct _FILE_NAME_INFO {
|
|
# DWORD FileNameLength;
|
|
# WCHAR FileName[1];
|
|
# } FILE_NAME_INFO
|
|
len = p_buffer[0, 4].unpack("L")[0]
|
|
name = p_buffer[4, len].encode(Encoding::UTF_8, Encoding::UTF_16LE, invalid: :replace)
|
|
|
|
# Check if this could be a MSYS2 pty pipe ('\msys-XXXX-ptyN-XX')
|
|
# or a cygwin pty pipe ('\cygwin-XXXX-ptyN-XX')
|
|
name =~ /(msys-|cygwin-).*-pty/ ? true : false
|
|
end
|
|
|
|
def self.getwch
|
|
unless @@input_buf.empty?
|
|
return @@input_buf.shift
|
|
end
|
|
while @@kbhit.call == 0
|
|
sleep(0.001)
|
|
end
|
|
until @@kbhit.call == 0
|
|
ret = @@getwch.call
|
|
if ret == 0 or ret == 0xE0
|
|
@@input_buf << ret
|
|
ret = @@getwch.call
|
|
@@input_buf << ret
|
|
return @@input_buf.shift
|
|
end
|
|
begin
|
|
bytes = ret.chr(Encoding::UTF_8).bytes
|
|
@@input_buf.push(*bytes)
|
|
rescue Encoding::UndefinedConversionError
|
|
@@input_buf << ret
|
|
@@input_buf << @@getwch.call if ret == 224
|
|
end
|
|
end
|
|
@@input_buf.shift
|
|
end
|
|
|
|
def self.getc
|
|
num_of_events = 0.chr * 8
|
|
while @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) != 0 and num_of_events.unpack('L').first > 0
|
|
input_record = 0.chr * 18
|
|
read_event = 0.chr * 4
|
|
if @@ReadConsoleInput.(@@hConsoleInputHandle, input_record, 1, read_event) != 0
|
|
event = input_record[0, 2].unpack('s*').first
|
|
if event == WINDOW_BUFFER_SIZE_EVENT
|
|
@@winch_handler.()
|
|
end
|
|
end
|
|
end
|
|
unless @@output_buf.empty?
|
|
return @@output_buf.shift
|
|
end
|
|
input = getwch
|
|
meta = (@@GetKeyState.call(VK_LMENU) & 0x80) != 0
|
|
control = (@@GetKeyState.call(VK_CONTROL) & 0x80) != 0
|
|
shift = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0
|
|
force_enter = !input.instance_of?(Array) && (control or shift) && input == 0x0D
|
|
if force_enter
|
|
# It's treated as Meta+Enter on Windows
|
|
@@output_buf.push("\e".ord)
|
|
@@output_buf.push(input)
|
|
else
|
|
case input
|
|
when 0x00
|
|
meta = false
|
|
@@output_buf.push(input)
|
|
input = getwch
|
|
@@output_buf.push(*input)
|
|
when 0xE0
|
|
@@output_buf.push(input)
|
|
input = getwch
|
|
@@output_buf.push(*input)
|
|
when 0x03
|
|
@@output_buf.push(input)
|
|
else
|
|
@@output_buf.push(input)
|
|
end
|
|
end
|
|
if meta
|
|
"\e".ord
|
|
else
|
|
@@output_buf.shift
|
|
end
|
|
end
|
|
|
|
def self.ungetc(c)
|
|
@@output_buf.unshift(c)
|
|
end
|
|
|
|
def self.in_pasting?
|
|
not self.empty_buffer?
|
|
end
|
|
|
|
def self.empty_buffer?
|
|
if not @@input_buf.empty?
|
|
false
|
|
elsif @@kbhit.call == 0
|
|
true
|
|
else
|
|
false
|
|
end
|
|
end
|
|
|
|
def self.get_screen_size
|
|
csbi = 0.chr * 22
|
|
@@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
|
|
csbi[0, 4].unpack('SS').reverse
|
|
end
|
|
|
|
def self.cursor_pos
|
|
csbi = 0.chr * 22
|
|
@@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
|
|
x = csbi[4, 2].unpack('s*').first
|
|
y = csbi[6, 2].unpack('s*').first
|
|
Reline::CursorPos.new(x, y)
|
|
end
|
|
|
|
def self.move_cursor_column(val)
|
|
@@SetConsoleCursorPosition.call(@@hConsoleHandle, cursor_pos.y * 65536 + val)
|
|
end
|
|
|
|
def self.move_cursor_up(val)
|
|
if val > 0
|
|
y = cursor_pos.y - val
|
|
y = 0 if y < 0
|
|
@@SetConsoleCursorPosition.call(@@hConsoleHandle, y * 65536 + cursor_pos.x)
|
|
elsif val < 0
|
|
move_cursor_down(-val)
|
|
end
|
|
end
|
|
|
|
def self.move_cursor_down(val)
|
|
if val > 0
|
|
screen_height = get_screen_size.first
|
|
y = cursor_pos.y + val
|
|
y = screen_height - 1 if y > (screen_height - 1)
|
|
@@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y + val) * 65536 + cursor_pos.x)
|
|
elsif val < 0
|
|
move_cursor_up(-val)
|
|
end
|
|
end
|
|
|
|
def self.erase_after_cursor
|
|
csbi = 0.chr * 24
|
|
@@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
|
|
cursor = csbi[4, 4].unpack('L').first
|
|
written = 0.chr * 4
|
|
@@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
|
|
@@FillConsoleOutputAttribute.call(@@hConsoleHandle, 0, get_screen_size.last - cursor_pos.x, cursor, written)
|
|
end
|
|
|
|
def self.scroll_down(val)
|
|
return if val.zero?
|
|
screen_height = get_screen_size.first
|
|
val = screen_height - 1 if val > (screen_height - 1)
|
|
scroll_rectangle = [0, val, get_screen_size.last, get_screen_size.first].pack('s4')
|
|
destination_origin = 0 # y * 65536 + x
|
|
fill = [' '.ord, 0].pack('SS')
|
|
@@ScrollConsoleScreenBuffer.call(@@hConsoleHandle, scroll_rectangle, nil, destination_origin, fill)
|
|
end
|
|
|
|
def self.clear_screen
|
|
csbi = 0.chr * 22
|
|
return if @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi) == 0
|
|
buffer_width = csbi[0, 2].unpack('S').first
|
|
attributes = csbi[8, 2].unpack('S').first
|
|
_window_left, window_top, _window_right, window_bottom = *csbi[10,8].unpack('S*')
|
|
fill_length = buffer_width * (window_bottom - window_top + 1)
|
|
screen_topleft = window_top * 65536
|
|
written = 0.chr * 4
|
|
@@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, fill_length, screen_topleft, written)
|
|
@@FillConsoleOutputAttribute.call(@@hConsoleHandle, attributes, fill_length, screen_topleft, written)
|
|
@@SetConsoleCursorPosition.call(@@hConsoleHandle, screen_topleft)
|
|
end
|
|
|
|
def self.set_screen_size(rows, columns)
|
|
raise NotImplementedError
|
|
end
|
|
|
|
def self.set_winch_handler(&handler)
|
|
@@winch_handler = handler
|
|
end
|
|
|
|
def self.prep
|
|
# do nothing
|
|
nil
|
|
end
|
|
|
|
def self.deprep(otio)
|
|
# do nothing
|
|
end
|
|
end
|