reline 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05acbc99c317aaa7f46d205bf73a13cc482bcfba9f6f05562f189f91082b4fd7
-  data.tar.gz: d785c8da605eba1b1440110ccbf197b1c5c654cce78dd18b17192e6686aa62f6
+  metadata.gz: a9a8719e2dd161d4d3493907d730981e19b685854247d1da4e8a107a9af88f98
+  data.tar.gz: 57c468696aecaa1752bf0ebacafbb9595ec8810c0dd406beb9bd95f31b8e2d05
 SHA512:
-  metadata.gz: 4d964d8b085973dd17da51e8359c93377c5356b01db720258b3a0a27c3b03b34e77c099d290f2f2fa41d2f8f6da1dd5cdcdcca4f7a18e1bbb199e9a755f6caca
-  data.tar.gz: 8c93e1e261d29ff6e27f0544bf6ddfe3eb41ac573111c59cc68869f508363a109880909c2893ebdc9b281b50d78fe795925667f63a7b4e5e1e26a91f93019adf
+  metadata.gz: 47f940b15f36eb7e410bf9951916258c268375fffadb661766fca64a421cc4e7aeb701a919c0b47dd03ea9b4aa1110c7c5b870328bad704c40f8e6d945a90ba2
+  data.tar.gz: 271926159d49eaa2b6572cc5d3640c81d82cfbc42d03a7320b0731fec276575a96c7491ab192023125a02e44d0a1cf38ee3ffa5045ac29e93f18e83ab9478071

data/lib/reline.rb

@@ -16,12 +16,6 @@ module Reline
   CursorPos = Struct.new(:x, :y)
 
   class Core
-    if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      IS_WINDOWS = true
-    else
-      IS_WINDOWS = false
-    end
-
     ATTR_READER_NAMES = %i(
       completion_append_character
       basic_word_break_characters
@@ -90,22 +84,22 @@ module Reline
     end
 
     def completion_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @completion_proc = p
     end
 
     def output_modifier_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @output_modifier_proc = p
     end
 
     def prompt_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @prompt_proc = p
     end
 
     def auto_indent_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @auto_indent_proc = p
     end
 
@@ -114,7 +108,7 @@ module Reline
     end
 
     def dig_perfect_match_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @dig_perfect_match_proc = p
     end
 
@@ -400,9 +394,15 @@ module Reline
   HISTORY = History.new(core.config)
 end
 
-if Reline::Core::IS_WINDOWS
+if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
   require 'reline/windows'
-  Reline::IOGate = Reline::Windows
+  if Reline::Windows.get_screen_size == [0, 0]
+    # Maybe Mintty on Cygwin
+    require 'reline/ansi'
+    Reline::IOGate = Reline::ANSI
+  else
+    Reline::IOGate = Reline::Windows
+  end
 else
   require 'reline/ansi'
   Reline::IOGate = Reline::ANSI

data/lib/reline/ansi.rb

@@ -7,6 +7,8 @@ class Reline::ANSI
     [27, 91, 51, 126] => :key_delete,     # Del
     [27, 91, 49, 126] => :ed_move_to_beg, # Home
     [27, 91, 52, 126] => :ed_move_to_end, # End
+    [27, 91, 72] => :ed_move_to_beg,      # Home
+    [27, 91, 70] => :ed_move_to_end,      # End
     [27, 32] => :em_set_mark,             # M-<space>
     [24, 24] => :em_exchange_mark,        # C-x C-x TODO also add Windows
   }
@@ -135,7 +137,7 @@ class Reline::ANSI
 
   def self.deprep(otio)
     int_handle = Signal.trap('INT', 'IGNORE')
-    `stty #{otio}`
+    system("stty #{otio}", err: File::NULL)
     Signal.trap('INT', int_handle)
     Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end

data/lib/reline/line_editor.rb

@@ -766,7 +766,7 @@ class Reline::LineEditor
   end
 
   def input_key(key)
-    if key.nil? or key.char.nil?
+    if key.char.nil?
       if @first_char
         @line = nil
       end
@@ -806,6 +806,26 @@ class Reline::LineEditor
 
   private def process_auto_indent
     return if not @check_new_auto_indent and @previous_line_index # move cursor up or down
+    if @check_new_auto_indent and @previous_line_index and @previous_line_index > 0 and @line_index > @previous_line_index
+      # Fix indent of a line when a newline is inserted to the next
+      new_lines = whole_lines(index: @previous_line_index, line: @line)
+      new_indent = @auto_indent_proc.(new_lines[0..-3].push(''), @line_index - 1, 0, true)
+      md = @line.match(/\A */)
+      prev_indent = md[0].count(' ')
+      @line = ' ' * new_indent + @line.lstrip
+
+      new_indent = nil
+      (new_lines[-2].size + 1).times do |n|
+        result = @auto_indent_proc.(new_lines[0..-2], @line_index - 1, n, false)
+        if result
+          new_indent = result
+          break
+        end
+      end
+      if new_indent&.>= 0
+        @line = ' ' * new_indent + @line.lstrip
+      end
+    end
     if @previous_line_index
       new_lines = whole_lines(index: @previous_line_index, line: @line)
     else

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.