ruby-changes:64949
From: aycabta <ko1@a...>
Date: Tue, 19 Jan 2021 13:27:53 +0900 (JST)
Subject: [ruby-changes:64949] 58509767d1 (ruby_3_0): Backport lib/reline, ext/readline, and lib/irb for 3.0.1 (#4085)
https://git.ruby-lang.org/ruby.git/commit/?id=58509767d1 From 58509767d17f7d4c6002f1159cefc0e038bbd629 Mon Sep 17 00:00:00 2001 From: aycabta <aycabta@g...> Date: Tue, 19 Jan 2021 13:01:31 +0900 Subject: Backport lib/reline, ext/readline, and lib/irb for 3.0.1 (#4085) * 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. https://github.com/ruby/irb/commit/a5804c3560bb1de3ea8e40002635bff87f6a2825 * [ruby/irb] Remove unnecessary ignore_error in dispatch_seq Just forgotten in https://github.com/ruby/irb/commit/a5804c3560bb1de3ea8e40002635bff87f6a2825 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; https://github.com/ruby/ruby/commit/433a3be86a811de0b4adbb92e054ee3a6fc6b4d8 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@g...> 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@j...> 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@j...> https://github.com/ruby/reline/commit/558f7be168 * [ruby/reline] Suppress auto indent for adding newlines in pasting Co-authored-by: Juanito Fatas <me@j...> 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@r...> Co-authored-by: Takashi Kokubun <takashikkbn@g...> Co-authored-by: Nobuhiro IMAI <nov@y...> Co-authored-by: Koichi Sasada <ko1@a...> Co-authored-by: Hiroshi SHIBATA <hsbt@r...> diff --git a/ext/readline/readline.c b/ext/readline/readline.c index ae68cf7..9f76f90 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -78,7 +78,7 @@ static ID id_special_prefixes; https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L78 #ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION # define rl_username_completion_function username_completion_function #else -char *rl_username_completion_function(const char *, int); +RUBY_EXTERN char *rl_username_completion_function(const char *, int); #endif #ifndef HAVE_RL_COMPLETION_MATCHES # define rl_completion_matches completion_matches @@ -689,7 +689,7 @@ readline_s_insert_text(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L689 #endif #if defined(HAVE_RL_DELETE_TEXT) -int rl_delete_text(int, int); +RUBY_EXTERN int rl_delete_text(int, int); static const char * str_subpos(const char *ptr, const char *end, long beg, long *sublen, rb_encoding *enc) { @@ -1148,7 +1148,7 @@ readline_s_get_screen_size(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1148 #endif #ifdef HAVE_RL_VI_EDITING_MODE -int rl_vi_editing_mode(int, int); +RUBY_EXTERN int rl_vi_editing_mode(int, int); /* * call-seq: * Readline.vi_editing_mode -> nil @@ -1187,7 +1187,7 @@ readline_s_vi_editing_mode_p(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1187 #endif #ifdef HAVE_RL_EMACS_EDITING_MODE -int rl_emacs_editing_mode(int, int); +RUBY_EXTERN int rl_emacs_editing_mode(int, int); /* * call-seq: * Readline.emacs_editing_mode -> nil @@ -1672,7 +1672,7 @@ readline_s_get_filename_quote_characters(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L1672 #endif #ifdef HAVE_RL_REFRESH_LINE -int rl_refresh_line(int, int); +RUBY_EXTERN int rl_refresh_line(int, int); /* * call-seq: * Readline. (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/