Backport lib/reline, and lib/irb for 3.0.1 3rd (#4228)

* [ruby/irb] Suppress error when File::ALT_SEPARATOR is nil

https://github.com/ruby/irb/commit/96accf3b95

* [ruby/irb] Suppress colorize on Windows tests

https://github.com/ruby/irb/commit/5be9354cf9

* [ruby/irb] The command "irb_info" should show RUBY_PLATFORM

https://github.com/ruby/irb/commit/39d1cd874f

* [ruby/irb] Fix inverse separator condition

https://github.com/ruby/irb/commit/33f933196f

* [ruby/reline] Return 1 when char width not found

This fixes ruby/reline#261.

https://github.com/ruby/reline/commit/3cf1213014

* [ruby/reline] Avoid tripping over nil prompt

https://github.com/ruby/reline/commit/d4d9d3e3d4

* [ruby/reline] Move script files for yamatanooroti tests

https://github.com/ruby/reline/commit/03031b885d

* [ruby/reline] Add a test for suppressing crash when dynamic prompt returns empty

ref. https://github.com/ruby/reline/pull/262

https://github.com/ruby/reline/commit/b98bc3c329

* [ruby/reline] We still need support new and legacy behavior.
Revert "Support for change in Windows-specific behavior at eol"

This reverts commit cad4de6ee841b43f3f0e441626f9415c3eda0f82.

https://github.com/ruby/reline/commit/646587fc2c

* [ruby/reline] check ENABLE_VIRTUAL_TERMINAL_PROCESSING flag and switch eof processing

https://github.com/ruby/reline/commit/3535676689

* [ruby/reline] Use UTF-8 only for width calc, rest uses original encoding

I confirmed that libvterm supports only which are UTF-8, US ASCII, UK, and
DEC graphics by reading source code, so can't test this patch by
yamatanoorogi gem through vterm gem for now.

This fixes ruby/irb#190.

https://github.com/ruby/reline/commit/44596c0cc7

* [ruby/reline] fix Reline::Windows.getconsolemode buffer

use double quotes to properly convert the \000 escape sequence.

https://github.com/ruby/reline/commit/236dfe5683

* [ruby/irb] Version 1.3.4

https://github.com/ruby/irb/commit/ab9852ccc5

* [ruby/reline] Version 0.2.4

https://github.com/ruby/reline/commit/462f971bd3

Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
Co-authored-by: Eamonn Webster <eamonn.webster@gmail.com>
Co-authored-by: Yoshinao Muramatu <ysno@ac.auone-net.jp>
Co-authored-by: cremno <cremno@mail.ru>

4 files changed, 6 insertions, 5 deletions

diff --git a/lib/irb/cmd/info.rb b/lib/irb/cmd/info.rb
index 53ec71d754..d122c88b77 100644
--- a/lib/irb/cmd/info.rb
+++ b/lib/irb/cmd/info.rb
@@ -13,6 +13,7 @@ module IRB
             str += "IRB version: #{IRB.version}\n"
             str += "InputMethod: #{IRB.CurrentContext.io.inspect}\n"
             str += ".irbrc path: #{IRB.rc_file}\n" if File.exist?(IRB.rc_file)
+            str += "RUBY_PLATFORM: #{RUBY_PLATFORM}\n"
             str
           end
           alias_method :to_s, :inspect
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 90dcd70bd0..af028996e7 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -38,9 +38,9 @@ module IRB # :nodoc:
     else
       separator =
         if File::ALT_SEPARATOR
-          File::SEPARATOR
-        else
           "[#{Regexp.quote(File::SEPARATOR + File::ALT_SEPARATOR)}]"
+        else
+          File::SEPARATOR
         end
       ABSOLUTE_PATH_PATTERN = # :nodoc:
         case Dir.pwd
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index a715293b34..0a4a1bb922 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2021-02-07"
+  @LAST_UPDATE_DATE = "2021-02-25"
 end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index c6c328e7b5..78d434d106 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -175,7 +175,7 @@ EOF
       body = (start_pos..end_pos).map do |current_pos|
         sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
       end.join("")
-      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear}\n"
+      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear if use_colorize}\n"
     end
 
     def IRB.delete_caller