yap-rawline 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e26721726b5b17c08f75808f5ecec3973f372d
-  data.tar.gz: 0447b1df3bb95f8af568416037514e16f4ca78c0
+  metadata.gz: ce2b5e0011a3641eea68691491f1e0b5e81344ea
+  data.tar.gz: aba178fb5a2528664eb9447e3138b51b85fa392c
 SHA512:
-  metadata.gz: 666f67533fc55e170cb5831c96fb11160dd7fd0ea80b196ab385f37f2fc382c386b61a213a01e8bb20bee03a5c0a7e08b8e3697ce1cb6f7a2bb29dc94ea9b152
-  data.tar.gz: 21a383d655e8d302133603fa727a6ebf7f0580f66376a1aa379bcb0404bfec147db52aa4e45da87bdace60f2ec9032c6d298f9144fb31e18d380d18c7a5f9e67
+  metadata.gz: c323b27b18f30f62f19124d58a8b9005f003c70c732298d5bdafb999e7ce1ec24954a077e0205b48f0eda181d40f0ff74cbc24eb03d14ee9a22c7816d783e38b
+  data.tar.gz: ee29e835913c429fcf8399fd00fae9d65cc566df6b6d5805e782db0cc271875d7e051cbc76bde2914b7b6d0bc7191e3baf68335f9124cff16c29527fb51a2822

data/lib/rawline/completer.rb

@@ -28,64 +28,107 @@ module RawLine
       # E.g. holding down the tab key or arrow keys
       bytes = bytes.uniq
 
-      if bytes.map(&:ord) == @keys[:left_arrow]
-        @completion_matches.forward
-        match = @completion_matches.get
-        @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
-      elsif bytes.map(&:ord) == @keys[:right_arrow]
-        @completion_matches.back
-        match = @completion_matches.get
-        @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
-      elsif bytes.map(&:ord) != @completion_char
-        @done_proc.call(bytes)
-      elsif @first_time
-        unless !@completion_proc || @completion_proc == []
-          word = @line.text[@line.word[:start]..@line.position-1] || ""
-          words = @line.text
-            .split(/\s+/)
-            .delete_if(&:empty?)
-          word_index = words.index(word)
-          Treefell['editor'].puts "completer, looking for completions word=#{word.inspect} words=#{words.inspect} word_index=#{word_index}"
-          matches = @completion_proc.call(
-            word,
-            words,
-            word_index
-          )
-        end
-        matches = matches.to_a.compact.sort.reverse
-
-        if matches.any?
-          @completion_matches.resize(matches.length)
-          matches.each { |w| @completion_matches << w }
-        end
+      if @first_time
+        matches = fetch_completions
+        resize(matches)
 
         if matches.length == 1
-          Treefell['editor'].puts "completer, exactly one possible completion found: #{matches.inspect}"
-          @completion_selected_proc.call(@completion_matches.first)
-          @done_proc.call
+          handle_one_match
         elsif matches.length > 1
-          Treefell['editor'].puts "completer, more than one possible completion found: #{matches.inspect}"
-
-          # Get first match
-          @completion_matches.back
-          match = @completion_matches.get
-
-          # completion matches is a history implementation and its in reverse order from what
-          # a user would expect
-          @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
+          handle_more_than_one_match
         else
-          Treefell['editor'].puts "completer, no possible completions found"
-          @completion_not_found_proc.call
-          @done_proc.call
+          handle_no_completions
         end
+
         @first_time = false
+      elsif bytes.map(&:ord) == @keys[:left_arrow]
+        select_previous
+      elsif bytes.map(&:ord) == @keys[:right_arrow]
+        select_next
+      elsif bytes.map(&:ord) == @completion_char
+        select_next
       else
-        @completion_matches.back
-        match = @completion_matches.get
+        Treefell['editor'].puts "completer, done with leftover bytes: #{bytes.inspect}"
+        @done_proc.call(bytes)
+      end
+    end
 
-        @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
+    private
+
+    def fetch_completions
+      if @completion_proc && @completion_proc.respond_to?(:call)
+        word = @line.text[@line.word[:start]..@line.position-1] || ""
+        words = @line.text
+          .split(/\s+/)
+          .delete_if(&:empty?)
+        word_index = words.index(word)
+        Treefell['editor'].puts "completer, looking for completions word=#{word.inspect} words=#{words.inspect} word_index=#{word_index}"
+        matches = @completion_proc.call(
+          word,
+          words,
+          word_index
+        )
       end
+
+      # Always return an array so the caller doesn't have
+      # to worry about nil
+      matches.to_a.compact
+    end
+
+    def handle_one_match
+      Treefell['editor'].puts "completer, exactly one possible completion found: #{matches.inspect}"
+      @completion_selected_proc.call(@completion_matches.first)
+
+      Treefell['editor'].puts "completer, done"
+      @done_proc.call
     end
-  end
 
+    def handle_more_than_one_match
+      Treefell['editor'].puts "completer, more than one possible completion"
+
+      # Get first match
+      @completion_matches.back
+      match = @completion_matches.get
+
+      Treefell['editor'].puts "completer: first completion: #{match} possible: #{possible_completions.inspect}"
+      @completion_found_proc.call(completion: match, possible_completions: possible_completions)
+    end
+
+    def handle_no_completions
+      Treefell['editor'].puts "completer, no possible completions found"
+      @completion_not_found_proc.call
+
+      Treefell['editor'].puts "completer, done"
+      @done_proc.call
+    end
+
+    def possible_completions
+      # completion matches is a history implementation and its in reverse order from what
+      # a user would expect
+      @completion_matches.reverse
+    end
+
+    def resize(matches)
+      if matches.any?
+        @completion_matches.resize(matches.length)
+        matches.each { |w| @completion_matches << w }
+      end
+    end
+
+    def select_next
+      @completion_matches.back
+      match = @completion_matches.get
+
+      Treefell['editor'].puts "completer, selecting next match=#{match.inspect} possible_completions=#{possible_completions.inspect}"
+      @completion_found_proc.call(completion: match, possible_completions: possible_completions)
+    end
+
+    def select_previous
+      @completion_matches.forward
+      match = @completion_matches.get
+
+      Treefell['editor'].puts "completer, selecting previous match=#{match.inspect} possible_completions=#{possible_completions.inspect}"
+      @completion_found_proc.call(completion: match, possible_completions: possible_completions)
+    end
+  end
 end

data/lib/rawline/editor.rb

@@ -684,13 +684,13 @@ module RawLine
     end
 
     def completion_selected(completion)
-      Treefell['editor'].puts "word-completion-selected #{completion}"
+      Treefell['editor'].puts "word-completion-selected #{completion.inspect}"
       move_to_position @line.word[:end]
       delete_n_characters(@line.word[:end] - @line.word[:start], true)
       write completion.to_s
 
       if @on_word_completion_selected
-        Treefell['editor'].puts "word-completion-selected callback called with #{completion}"
+        Treefell['editor'].puts "word-completion-selected callback called with #{completioni}"
         @on_word_completion_selected.call(name: "word-completion-selected", payload: { completion: completion })
       end
     end
@@ -871,10 +871,12 @@ module RawLine
       @event_loop = Rawline::EventLoop.new(registry: @event_registry)
 
       @dom.on(:child_changed) do |*args|
+        Treefell['editor'].puts 'DOM child changed, re-rendering'
         @event_loop.add_event name: "render", source: @dom#, target: event[:target]
       end
 
       @dom.on :position_changed do |*args|
+        Treefell['editor'].puts 'DOM position changed, rendering cursor'
         @renderer.render_cursor(@dom.input_box)
       end
 

data/lib/rawline/version.rb

@@ -1,3 +1,3 @@
 module RawLine
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap-rawline
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Fabio Cevasco