yap-rawline 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e019af1718610030a1909eaa6b6cccd791deac
-  data.tar.gz: a2a4750436f2ca64c92cf2247c8b346edad09851
+  metadata.gz: e7e26721726b5b17c08f75808f5ecec3973f372d
+  data.tar.gz: 0447b1df3bb95f8af568416037514e16f4ca78c0
 SHA512:
-  metadata.gz: 537734d01e3ad9b469aa93a935431670884021c2ac67e4452231e5b5348ea87968efafc475632fe8129de6ea9dfce450a44ebe35ceac5a3150189e11f7d965ca
-  data.tar.gz: 84b25ae0384f6c1874fb3b0ca34e176f07d52a90964fd0b77999257b287ce47201c7f9dee4dd896f90e4a09fffa223cef2cb8542d5c7fcfe18807808aa7920c8
+  metadata.gz: 666f67533fc55e170cb5831c96fb11160dd7fd0ea80b196ab385f37f2fc382c386b61a213a01e8bb20bee03a5c0a7e08b8e3697ce1cb6f7a2bb29dc94ea9b152
+  data.tar.gz: 21a383d655e8d302133603fa727a6ebf7f0580f66376a1aa379bcb0404bfec147db52aa4e45da87bdace60f2ec9032c6d298f9144fb31e18d380d18c7a5f9e67

data/lib/rawline/completer.rb

@@ -1,12 +1,13 @@
 module RawLine
 
   class Completer
-    def initialize(char:, line:, completion:, completion_found:, completion_not_found:, done:, keys:)
+    def initialize(char:, line:, completion:, completion_found:, completion_not_found:, completion_selected:, done:, keys:)
       @completion_char = char
       @line = line
       @completion_proc = completion
       @completion_found_proc = completion_found
       @completion_not_found_proc = completion_not_found
+      @completion_selected_proc = completion_selected
       @done_proc = done
       @keys = keys
 
@@ -44,6 +45,7 @@ module RawLine
             .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,
@@ -55,6 +57,14 @@ module RawLine
         if matches.any?
           @completion_matches.resize(matches.length)
           matches.each { |w| @completion_matches << w }
+        end
+
+        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
+        elsif matches.length > 1
+          Treefell['editor'].puts "completer, more than one possible completion found: #{matches.inspect}"
 
           # Get first match
           @completion_matches.back
@@ -64,6 +74,7 @@ module RawLine
           # a user would expect
           @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
         else
+          Treefell['editor'].puts "completer, no possible completions found"
           @completion_not_found_proc.call
           @done_proc.call
         end

data/lib/rawline/editor.rb

@@ -152,6 +152,9 @@ module RawLine
     attr_reader :keyboard_input_processors
 
     def env ; @env_stack.last ; end
+    def new_env ; Environment.new ; end
+    def push_env(env) ; @env_stack.push env ; end
+    def pop_env(env) ; @env_stack.pop ; end
 
     def completion_class ; env.completion_class ; end
     def history ; env.history ; end
@@ -651,6 +654,9 @@ module RawLine
         completion_not_found: -> {
           completion_not_found
         },
+        completion_selected: -> (completion) {
+          completion_selected(completion)
+        },
         done: -> (*leftover_bytes){
           completion_done
           leftover_bytes = leftover_bytes.flatten
@@ -667,43 +673,70 @@ module RawLine
     end
 
     def completion_found(completion:, possible_completions:)
+      Treefell['editor'].puts "word-completion-found: #{completion.inspect} possible_completions: #{possible_completions.inspect}"
       if @on_word_complete
         word = @line.word[:text]
         sub_word = @line.text[@line.word[:start]..@line.position-1] || ""
         @on_word_complete.call(name: "word-completion", payload: { sub_word: sub_word, word: word, completion: completion, possible_completions: possible_completions })
       end
 
+      completion_selected(completion)
+    end
+
+    def completion_selected(completion)
+      Treefell['editor'].puts "word-completion-selected #{completion}"
       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}"
+        @on_word_completion_selected.call(name: "word-completion-selected", payload: { completion: completion })
+      end
     end
 
     def completion_not_found
+      Treefell['editor'].puts 'word-completion-not-found'
       if @on_word_complete_no_match
         word = @line.word[:text]
         sub_word = @line.text[@line.word[:start]..@line.position-1] || ""
-        @on_word_complete_no_match.call(name: "word-completion-no-match", payload: { sub_word: sub_word, word: word })
+        payload = { sub_word: sub_word, word: word }
+        Treefell['editor'].puts "word-completion-not-found calling callback with payload: #{payload.inspect}"
+        @on_word_complete_no_match.call(name: "word-completion-no-match", payload: payload)
+      else
+        Treefell['editor'].puts 'word-completion-not-found no on_word_complete_no_match callback to call'
       end
     end
 
     def completion_done
       if @on_word_complete_done
+        Treefell['editor'].puts "word-completion-done calling on_word_complete_done callback"
         @on_word_complete_done.call
+      else
+        Treefell['editor'].puts 'word-completion-done no on_word_complete_done callback to call'
       end
     end
 
     def on_word_complete(&blk)
+      Treefell['editor'].puts "setting on_word_complete callback"
       @on_word_complete = blk
     end
 
     def on_word_complete_no_match(&blk)
+      Treefell['editor'].puts "setting on_word_complete_no_match callback"
       @on_word_complete_no_match = blk
     end
 
     def on_word_complete_done(&blk)
+      Treefell['editor'].puts "setting on_word_complete_done callback"
       @on_word_complete_done = blk
     end
 
+    def on_word_completion_selected(&blk)
+      Treefell['editor'].puts "setting on_word_completion_selected callback"
+      @on_word_completion_selected = blk
+    end
+
     #
     # Complete file and directory names.
     # Hidden files and directories are matched only if <tt>@match_hidden_files</tt> is true.
@@ -735,7 +768,11 @@ module RawLine
     def show_history
       pos = @line.position
       text = @line.text
-      history.each {|l| puts "- [#{l}]"}
+      max_index_width = history.length.to_s.length
+      history.each_with_index do |item, i|
+        @terminal.puts sprintf("%-#{max_index_width}d %s\n", i+1, item)
+      end
+      render(reset: true)
       overwrite_line(text, pos)
     end
 

data/lib/rawline/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap-rawline
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fabio Cevasco
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: treefell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement