ruvim 0.1.0 → 0.2.0

data/lib/ruvim/input.rb

@@ -4,7 +4,7 @@ module RuVim
       @stdin = stdin
     end
 
-    def read_key(timeout: nil, wakeup_ios: [])
+    def read_key(timeout: nil, wakeup_ios: [], esc_timeout: nil)
       ios = [@stdin, *wakeup_ios].compact
       readable = IO.select(ios, nil, nil, timeout)
       return nil unless readable
@@ -15,18 +15,25 @@ module RuVim
       return nil unless ready.include?(@stdin)
 
       ch = @stdin.getch
+      return :ctrl_b if ch == "\u0002"
       return :ctrl_c if ch == "\u0003"
+      return :ctrl_d if ch == "\u0004"
+      return :ctrl_e if ch == "\u0005"
+      return :ctrl_f if ch == "\u0006"
       return :ctrl_i if ch == "\u0009"
+      return :ctrl_l if ch == "\u000c"
       return :ctrl_n if ch == "\u000e"
       return :ctrl_o if ch == "\u000f"
       return :ctrl_p if ch == "\u0010"
       return :ctrl_r if ch == "\u0012"
+      return :ctrl_u if ch == "\u0015"
       return :ctrl_v if ch == "\u0016"
       return :ctrl_w if ch == "\u0017"
+      return :ctrl_y if ch == "\u0019"
       return :enter if ch == "\r" || ch == "\n"
       return :backspace if ch == "\u007f" || ch == "\b"
 
-      return read_escape_sequence if ch == "\e"
+      return read_escape_sequence(timeout: esc_timeout) if ch == "\e"
 
       ch
     end
@@ -41,23 +48,28 @@ module RuVim
       nil
     end
 
-    def read_escape_sequence
+    def read_escape_sequence(timeout: nil)
       extra = +""
+      recognized = {
+        "[A" => :up,
+        "[B" => :down,
+        "[C" => :right,
+        "[D" => :left,
+        "[5~" => :pageup,
+        "[6~" => :pagedown
+      }
+      wait = timeout.nil? ? 0.005 : [timeout.to_f, 0.0].max
       begin
-        while IO.select([@stdin], nil, nil, 0.005)
+        while IO.select([@stdin], nil, nil, wait)
           extra << @stdin.read_nonblock(1)
+          key = recognized[extra]
+          return key if key
         end
       rescue IO::WaitReadable, EOFError
       end
 
       case extra
       when "" then :escape
-      when "[A" then :up
-      when "[B" then :down
-      when "[C" then :right
-      when "[D" then :left
-      when "[5~" then :pageup
-      when "[6~" then :pagedown
       else
         [:escape_sequence, extra]
       end

data/lib/ruvim/keyword_chars.rb

@@ -0,0 +1,46 @@
+module RuVim
+  module KeywordChars
+    module_function
+
+    DEFAULT_CHAR_CLASS = "[:alnum:]_".freeze
+    DEFAULT_REGEX = /[[:alnum:]_]/.freeze
+
+    def char_class(raw)
+      spec = raw.to_s
+      return DEFAULT_CHAR_CLASS if spec.empty?
+
+      @char_class_cache ||= {}
+      return @char_class_cache[spec] if @char_class_cache.key?(spec)
+
+      extra = []
+      spec.split(",").each do |tok|
+        t = tok.strip
+        next if t.empty? || t == "@"
+
+        if t.length == 1
+          extra << Regexp.escape(t)
+        elsif t.match?(/\A\d+-\d+\z/)
+          a, b = t.split("-", 2).map(&:to_i)
+          lo, hi = [a, b].minmax
+          next if lo < 0 || hi > 255
+          extra << "#{Regexp.escape(lo.chr)}-#{Regexp.escape(hi.chr)}"
+        end
+      end
+
+      @char_class_cache[spec] = "#{DEFAULT_CHAR_CLASS}#{extra.join}".freeze
+    end
+
+    def regex(raw)
+      spec = raw.to_s
+      return DEFAULT_REGEX if spec.empty?
+
+      @regex_cache ||= {}
+      return @regex_cache[spec] if @regex_cache.key?(spec)
+
+      klass = char_class(spec)
+      @regex_cache[spec] = /[#{klass}]/
+    rescue RegexpError
+      DEFAULT_REGEX
+    end
+  end
+end