vimamsa 0.1.14 → 0.1.15

data/lib/vimamsa/key_actions.rb

@@ -28,6 +28,8 @@ def is_visual_mode()
   return 0
 end
 
+reg_act(:command_to_buf, proc { command_to_buf }, "Execute command, output to buffer")
+
 reg_act(:lsp_debug, proc { vma.buf.lsp_get_def }, "LSP get definition")
 reg_act(:lsp_jump_to_definition, proc { vma.buf.lsp_jump_to_def }, "LSP jump to definition")
 
@@ -38,8 +40,6 @@ reg_act(:easy_jump, proc { EasyJump.start }, "Easy jump")
 reg_act(:gui_ensure_cursor_visible, proc { vma.gui.view.ensure_cursor_visible }, "Scroll to current cursor position")
 reg_act(:gui_refresh_cursor, proc { vma.buf.refresh_cursor }, "Refresh cursor")
 
-
-
 reg_act(:savedebug, "savedebug", "Save debug info", { :group => :debug })
 reg_act(:open_file_dialog, "open_file_dialog", "Open file", { :group => :file })
 reg_act(:create_new_file, "create_new_file", "Create new file", { :group => :file })
@@ -62,7 +62,7 @@ reg_act(:put_file_ref_to_clipboard, proc { buf.put_file_ref_to_clipboard }, "Put
 reg_act(:encrypt_file, proc { encrypt_cur_buffer }, "Set current file to encrypt on save")
 reg_act(:set_unencrypted, proc { buf.set_unencrypted }, "Set current file to save unencrypted")
 reg_act(:set_executable, proc { buf.set_executable }, "Set current file permissions to executable")
-reg_act(:close_all_buffers, proc { bufs.close_all_buffers() }, "Close all buffers")
+# reg_act(:close_all_buffers, proc { bufs.close_all_buffers() }, "Close all buffers")
 reg_act(:close_current_buffer, proc { bufs.close_current_buffer(true) }, "Close current buffer")
 reg_act(:comment_selection, proc { buf.comment_selection }, "")
 reg_act(:delete_char_forward, proc { buf.delete(CURRENT_CHAR_FORWARD) }, "Delete char forward", { :group => [:edit, :basic] })
@@ -94,15 +94,23 @@ reg_act :update_file_index, proc { FileFinder.update_index }, "Update file index
 reg_act :delete_to_word_end, proc { buf.delete2(:to_word_end) }, "Delete to file end", { :group => [:edit, :basic] }
 reg_act :delete_to_next_word_start, proc { buf.delete2(:to_next_word) }, "Delete to start of next word", { :group => [:edit, :basic] }
 reg_act :delete_to_line_start, proc { buf.delete2(:to_line_start) }, "Delete to line start", { :group => [:edit, :basic] }
-reg_act :start_browse_mode, proc { $kbd.set_mode(:browse); $kbd.set_default_mode(:browse) }, "Start browse mode"
+
+reg_act :start_browse_mode, proc {
+  vma.kbd.set_mode(:browse)
+  bufs.reset_navigation
+}, "Start browse mode"
+reg_act :kbd_dump_state, proc { vma.kbd.dump_state }, "Dump keyboard tree state"
+
 reg_act :exit_browse_mode, proc {
-  bufs.add_current_buf_to_history; 
-  vma.kbd.set_mode_stack([vma.buf.default_mode])
-  vma.kbd.set_mode_to_default
+  bufs.add_current_buf_to_history
+  # Load previously saved buffer specific mode stack
+  buf.restore_kbd_mode
 }, "Exit browse mode"
 
-reg_act :page_down, proc { page_down }, "Page down", :group => [:move, :basic]
-reg_act :page_up, proc { page_up }, "Page up", :group => [:move, :basic]
+# reg_act :page_down, proc { page_down }, "Page down", :group => [:move, :basic]
+reg_act :page_down, proc { vma.gui.page_down }, "Page down", :group => [:move, :basic]
+
+reg_act :page_up, proc { vma.gui.page_up }, "Page up", :group => [:move, :basic]
 reg_act :jump_to_start_of_buffer, proc { buf.jump(START_OF_BUFFER) }, "Jump to start of buffer"
 reg_act :jump_to_end_of_buffer, proc { buf.jump(END_OF_BUFFER) }, "Jump to end of buffer"
 reg_act(:auto_indent_buffer, proc { buf.indent }, "Auto format buffer")
@@ -164,7 +172,7 @@ act_list = {
   :toggle_active_window => { :proc => proc { vma.gui.toggle_active_window },
                              :desc => "Toggle active window", :group => :search },
 
-  :toggle_two_column => { :proc => proc { vma.gui.set_two_column },
+  :toggle_two_column => { :proc => proc { vma.gui.toggle_two_column },
                           :desc => "Set two column mode", :group => :search },
 
   :content_search => { :proc => proc { FileContentSearch.start_gui },
@@ -179,6 +187,17 @@ act_list = {
   :debug_buf_hex => { :proc => proc { puts "SHA256: " + (Digest::SHA2.hexdigest vma.buf.to_s) },
                       :desc => "Output SHA256 hex digest of curent buffer" },
 
+  :start_autocomplete => { :proc => proc { vma.buf.view.start_autocomplete },
+                      :desc => "Start autocomplete" },
+                      
+  :show_autocomplete => { :proc => proc { 
+  # vma.buf.view.signal_emit("show-completion")
+  # vma.buf.view.show_completion
+  vma.buf.view.show_completions
+   },
+                      :desc => "Show autocomplete" },
+                     
+
 }
 
 for k, v in act_list

data/lib/vimamsa/key_binding_tree.rb

@@ -23,12 +23,13 @@ setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc",
 
 class State
   attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes, :level, :cursor_type
-  attr_reader :cur_mode
+  attr_reader :cur_mode, :scope
 
-  def initialize(key_name, eval_rule = "", ctype = :command)
+  def initialize(key_name, eval_rule = "", ctype = :command, scope: :buffer)
     @key_name = key_name
     @eval_rule = eval_rule
     @children = []
+    @scope = scope
     @major_modes = []
     @action = nil
     @level = 0
@@ -41,7 +42,7 @@ class State
 end
 
 class KeyBindingTree
-  attr_accessor :C, :I, :cur_state, :root, :match_state, :last_action, :cur_action, :modifiers, :next_command_count, :method_handles_repeat
+  attr_accessor :C, :I, :cur_state, :root, :match_state, :last_action, :cur_action, :modifiers, :next_command_count, :method_handles_repeat, :default_mode
   attr_reader :mode_root_state, :state_trail, :act_bindings, :default_mode_stack
 
   def initialize()
@@ -65,34 +66,62 @@ class KeyBindingTree
     @act_bindings = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
   end
 
-  def set_default_mode(label)
+  def set_mode(label)
     @match_state = [@modes[label]] # used for matching input
     @mode_root_state = @modes[label]
-    @default_mode = label
+    # @default_mode = label
     @default_mode_stack << label
+
+    __set_mode(label)
     if !vma.buf.nil?
       # vma.buf.mode_stack = @default_mode_stack.clone
     end
   end
 
+  def set_default_mode(label)
+    @match_state = [@modes[label]]
+    @mode_root_state = @modes[label]
+    @default_mode = label
+    set_mode_stack [label]
+  end
+
   def set_mode_stack(ms)
+    debug "set_mode_stack(#{ms})", 2
+    show_caller if cnf.debug? # TODO: remove 
     @default_mode_stack = ms
+    label = @default_mode_stack[-1]
+    @match_state = [@modes[label]]
+    @mode_root_state = @modes[label]
+  end
+
+  def dump_state
+    debug "dump_state", 2
+    pp ["@default_mode_stack", @default_mode_stack]
+    pp ["@default_mode", @default_mode]
+    pp ["vma.buf.mode_stack", vma.buf.mode_stack]
+    pp ["scope", self.get_scope]
+    # pp ["@mode_root_state", @mode_root_state]
+    # pp ["@match_state", @match_state]
   end
 
   def set_mode_to_default()
     # set_mode(@default_mode)
-    set_mode(@default_mode_stack[-1])
+    set_mode_stack [@default_mode_stack[0]]
+    __set_mode(@default_mode_stack[0])
   end
 
   def to_previous_mode()
+    debug "to_previous_mode",2
+    pp @default_mode_stack
     if @default_mode_stack.size > 1
       @default_mode_stack.pop
     end
-    set_mode_to_default()
+    pp @default_mode_stack
+    __set_mode(@default_mode_stack[-1])
   end
 
-  def add_mode(id, label, cursortype = :command, name: nil)
-    mode = State.new(id, "", cursortype)
+  def add_mode(id, label, cursortype = :command, name: nil, scope: :buffer)
+    mode = State.new(id, "", cursortype, scope: scope)
     mode.level = 1
     @modes[label] = mode
     @root.children << mode
@@ -105,6 +134,10 @@ class KeyBindingTree
   def add_minor_mode(id, label, major_mode_label)
     mode = State.new(id)
     @modes[label] = mode
+    if @root.nil?
+      show_caller
+      Ripl.start :binding => binding
+    end
     @root.children << mode
     mode.major_modes << major_mode_label
   end
@@ -166,7 +199,8 @@ class KeyBindingTree
     vma.gui.statnfo.markup = "<span weight='ultrabold'>#{st}</span>"
   end
 
-  def set_mode(label)
+  def __set_mode(label)
+    debug "__set_mode(#{label})"
     @mode_history << @mode_root_state
 
     # Check if label in form :label
@@ -183,11 +217,19 @@ class KeyBindingTree
     end
     @cur_mode = label
 
+    if self.get_scope != :editor and !vma.buf.nil?
+      vma.buf.mode_stack = @default_mode_stack.clone
+    end
+
     if !vma.gui.view.nil?
       vma.gui.view.draw_cursor()  #TODO: handle outside this class
     end
   end
 
+  def get_scope
+    @mode_root_state.scope
+  end
+
   def cur_mode_str()
     return @mode_root_state.key_name
   end
@@ -410,6 +452,8 @@ class KeyBindingTree
 
   def bindkey(key, action)
     if key.class != Array
+      # Handle syntax like :
+      # "X esc || X ctrl!" => "vma.kbd.to_previous_mode",
       key = key.split("||")
     end
 
@@ -440,10 +484,19 @@ class KeyBindingTree
     end
 
     m = key.match(/^(\S+)\s(\S.*)$/)
+    # Match/split e.g. "VC , , s" to "VC" and ", , s"
     if m
       modetmp = m[1]
       debug [key, modetmp, m].inspect
+
+      # If all of first word are uppercase, e.g. in
+      # "VCIX left" => "buf.move(BACKWARD_CHAR)",
+      # interpret as each char representing a mode
       modes = modetmp.split("") if modetmp.match(/^\p{Lu}+$/) # Uppercase
+
+      # If all of first word is down case, like in:
+      # bindkey "audio space", :audio_stop
+      # interpret as whole word representing a mode.
       modes = [modetmp] if modetmp.match(/^\p{Ll}+$/) # Lowercase
       keydef = m[2]
     else
@@ -456,7 +509,15 @@ class KeyBindingTree
     }
   end
 
+  # Binds a keyboard key combination to an action,
+  # for a given keyboard mode like insert ("I") or command ("C")
   def mode_bind_key(mode_id, keydef, action)
+    # debug "mode_bind_key #{mode_id.inspect}, #{keydef.inspect}, #{action.inspect}", 2
+    # Example:
+    # bindkey "C , f", :gui_file_finder
+    # mode_id = "C", keydef = ", f"
+    # and action = :gui_file_finder
+
     set_state(mode_id, "") # TODO: check is ok?
     start_state = @cur_state
 
@@ -464,23 +525,32 @@ class KeyBindingTree
 
     prev_state = nil
     s1 = start_state
-    k_arr.each { |i|
+
+    k_arr.each_with_index { |k, idx|
       # check if key has rules for context like q has in
       # "C q(cntx.recording_macro==true)"
-      match = /(.+)\((.*)\)/.match(i)
+      last_item = false
+      if k_arr.size - 1 == idx
+        last_item = true
+      end
+      match = /(.+)\((.*)\)/.match(k)
       eval_rule = ""
       if match
         key_name = match[1]
         eval_rule = match[2]
       else
-        key_name = i
+        key_name = k
       end
 
       prev_state = s1
       # Create a new state for key if it doesn't exist
       s1 = find_state(key_name, eval_rule)
-      if s1 == nil
+      if s1 == nil or last_item
         new_state = State.new(key_name, eval_rule)
+        if last_item
+          # Override existing key definition
+          @cur_state.children.delete(s1)
+        end
         s1 = new_state
         @cur_state.children << new_state
       end

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -4,10 +4,10 @@ vma.kbd.add_mode("V", :visual, :visual)
 vma.kbd.add_mode("M", :minibuffer) #TODO: needed?
 vma.kbd.add_mode("R", :readchar)
 vma.kbd.add_minor_mode("audio", :audio, :command)
-vma.kbd.add_mode("B", :browse, :command)
+vma.kbd.add_mode("B", :browse, :command, scope: :editor)
 vma.kbd.add_mode("X", :replace, :command, name: "Replace")
 vma.kbd.set_default_mode(:command)
-vma.kbd.set_mode(:command)
+vma.kbd.__set_mode(:command) #TODO:needed?
 # vma.kbd.show_state_trail
 
 
@@ -17,7 +17,6 @@ bindkey "VC s", :easy_jump
 bindkey "VC , m f", [:find_macro_gui, proc { vma.macro.find_macro_gui }, "Find named macro"]
 bindkey "C , m n", [:gui_name_macro, proc { vma.macro.gui_name_macro }, "Name last macro"]
 bindkey "C , j r", :jump_to_random
-bindkey "I enter", :insert_new_line
 bindkey "C , ; s k", :show_key_bindings #TODO: better binding
 bindkey "C , , c b", :put_file_path_to_clipboard #TODO: better binding or remove?
 bindkey "C , , e", :encrypt_file #TODO: better binding
@@ -58,7 +57,7 @@ bindkey "audio f || audio right", [:audio_forward, proc { Audio.seek_forward },
 bindkey "audio left", [:audio_backward, proc { Audio.seek_forward(-5.0) }, "Seek backward in audio stream"]
 
 bindkey "audio space", :audio_stop
-bindkey "audio q || audio esc", "vma.kbd.set_mode_to_default"
+bindkey "audio q || audio esc", "vma.kbd.to_previous_mode"
 
 # bindkey "C , f o", :open_file_dialog
 bindkey "CI ctrl-o", :open_file_dialog
@@ -79,8 +78,9 @@ bindkey "B z", "center_on_current_line();call_action(:exit_browse_mode)"
 bindkey "B enter || B return || B esc || B j || B ctrl!", :exit_browse_mode
 bindkey "B s", :page_up
 bindkey "B d", :page_down
-bindkey "B s", :page_up
-bindkey "B d", :page_down
+bindkey "B r", proc { vma.gui.page_down(multip:0.25)}
+bindkey "B e", proc { vma.gui.page_up(multip:0.25)}
+
 bindkey "B i", :jump_to_start_of_buffer
 bindkey "B o", :jump_to_end_of_buffer
 bindkey "B c", :close_current_buffer
@@ -105,7 +105,7 @@ default_keys = {
   "C ctrl-s" => :buf_save,
 
   # Buffer handling
-  "C B" => "bufs.switch",
+  # "C B" => "bufs.switch",
   "C tab" => "bufs.switch_to_last_buf",
   #    'C , s'=> 'gui_select_buffer',
   "C , r v b" => :buf_revert,
@@ -117,11 +117,22 @@ default_keys = {
   # MOVING
   #    'VC h' => 'buf.move(BACKWARD_CHAR)',
   "VC l" => "buf.move(FORWARD_CHAR)",
-  "VC j" => "buf.move(FORWARD_LINE)",
-  "VC k" => "buf.move(BACKWARD_LINE)",
+  # "VC j" => "buf.move(FORWARD_LINE)",
+  # "VC k" => "buf.move(BACKWARD_LINE)",
+
+  "VC pagedown" => :page_down,
+  "VC pageup" => :page_up,
 
-  "VC pagedown" => "page_down",
-  "VC pageup" => "page_up",
+  "I down(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_next",
+  "I tab(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_next",
+  "I up(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_previous",
+  "I shift-tab(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select_previous",
+  "I enter(vma.buf.view.autocp_active)" => "vma.buf.view.autocp_select",
+  
+  "I tab" => 'buf.insert_tab',
+  "I shift-tab" => 'buf.unindent',
+  
+  "I enter" => :insert_new_line,
 
   "VCIX left" => "buf.move(BACKWARD_CHAR)",
   "VCIX right" => "buf.move(FORWARD_CHAR)",
@@ -172,6 +183,7 @@ default_keys = {
   "C , d b" => "debug_print_buffer",
   "C , d c" => "debug_dump_clipboard",
   "C , d d" => "debug_dump_deltas",
+  "C , d m" => :kbd_dump_state,
   
   "VC O" => "buf.jump(END_OF_LINE)",
   "VC $" => "buf.jump(END_OF_LINE)",
@@ -189,7 +201,6 @@ default_keys = {
 
   # Command mode only:
   "C ctrl-r" => "buf.redo()", # TODO:???
-  "C R" => "buf.redo()",
   "C v" => "buf.start_visual_mode",
   "C P" => "buf.paste(BEFORE)", # TODO: implement as replace for visual mode
   "C space <char>" => "buf.insert_txt(<char>)",
@@ -246,16 +257,13 @@ default_keys = {
   'CV \' <char>' => "buf.jump_to_mark(<char>)",
   # "CV ''" =>'jump_to_mark(NEXT_MARK)', #TODO
 
-  # Switch to other mode
+  # Switch to another mode
   "C i" => "vma.kbd.set_mode(:insert)",
   "C R" => "vma.kbd.set_mode(:replace)",
   "C ctrl!" => "vma.kbd.set_mode(:insert)",
-  "C ctrl!" => "vma.kbd.set_mode(:insert)",
   
-
-  # "R esc || R ctrl!" => "vma.kbd.set_mode(:command)",
-  "X esc" => "vma.kbd.set_mode(:command)",
-  "X ctrl!" => "vma.kbd.set_mode(:command)",
+  # Replace mode
+  "X esc || X ctrl!" => "vma.kbd.to_previous_mode",
   "X <char>" => "buf.replace_with_char(<char>);buf.move(FORWARD_CHAR)",
 
   # Macros
@@ -280,7 +288,7 @@ default_keys = {
   # "I ctrl!" => "vma.kbd.to_previous_mode",
   "C shift!" => "buf.save",
   "I <char>" => "buf.insert_txt(<char>)",
-  "I esc || I ctrl!" => "vma.kbd.set_mode_to_default",
+  "I esc || I ctrl!" => "vma.kbd.to_previous_mode",
 
   "I ctrl-d" => "buf.delete2(:to_word_end)",
 
@@ -294,8 +302,10 @@ default_keys = {
   "IX alt-f" => "buf.jump_word(FORWARD,WORD_START)",
   "IX alt-b" => "buf.jump_word(BACKWARD,WORD_START)",
 
-  "I tab" => 'buf.insert_tab',
-  "I shift-tab" => 'buf.unindent',
+  "I ctrl-h" => :show_autocomplete,
+  "I ctrl-j" => "vma.buf.view.hide_completions",
+  
+
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
 }

data/lib/vimamsa/langservp.rb

@@ -19,13 +19,31 @@ class LangSrv
 
   def initialize(lang)
     @error = true
-    clsp = conf(:custom_lsp)
 
     # Use LSP server specified by user if available
     @lang = lang
-    lspconf = clsp[lang]
+
+    lspconf = nil
+    ret = cnf.lsp.server?.find { |k, v| v[:languages].include?(@lang) }
+    lspconf = ret[1] unless ret.nil?
+
     if !lspconf.nil?
-      @io = IO.popen(lspconf[:command], "r+")
+      error = false
+      begin
+        @io = IO.popen(lspconf[:command], "r+")
+      rescue Errno::ENOENT => e
+        pp e
+        error = true
+      rescue StandardError => e
+        debug "StandardError @io = IO.popen(lspconf[:command] ...", 2
+        pp e
+        error = true
+      end
+      if error or @io.nil?
+        message("Could not start lsp server #{lspconf[:name]}")
+        error = true
+        return nil
+      end
     else
       return nil
     end
@@ -37,6 +55,8 @@ class LangSrv
     for c in conf(:workspace_folders)
       wf << LSP::Interface::WorkspaceFolder.new(uri: c[:uri], name: c[:name])
     end
+    debug "WORKSPACE FOLDERS", 2
+    debug wf.inspect, 2
 
     pid = Process.pid
 

data/lib/vimamsa/main.rb

@@ -32,6 +32,10 @@ def buf()
   return vma.buf
 end
 
+def hook
+  return vma.hook
+end
+
 def bufs()
   return vma.buffers
 end

data/lib/vimamsa/rbvma.rb

@@ -32,6 +32,7 @@ require "vimamsa/gui_menu"
 require "vimamsa/gui_dialog"
 require "vimamsa/gui_select_window"
 require "vimamsa/gui_sourceview"
+require "vimamsa/gui_sourceview_autocomplete"
 require "vimamsa/gui_image"
 require "vimamsa/hyper_plain_text"
 
@@ -39,6 +40,7 @@ require "vimamsa/ack"
 require "vimamsa/buffer"
 require "vimamsa/buffer_cursor"
 require "vimamsa/buffer_changetext"
+# require "vimamsa/buffer_list"
 require "vimamsa/buffer_list"
 require "vimamsa/buffer_manager"
 require "vimamsa/constants"

data/lib/vimamsa/search_replace.rb

@@ -1,9 +1,3 @@
-class Grep
-  attr_accessor :history
-
-  def initialize()
-  end
-end
 
 class FileSelector
   def initialize()
@@ -85,9 +79,14 @@ class Grep
     end
     vma.kbd.add_minor_mode("bmgr", :buf_mgr, :command)
     reg_act(:grep_buffer, proc { Grep.new.run }, "Grep current buffer")
+    reg_act(:grep_refresh, proc {
+      if vma.buf.module.class == Grep
+        vma.buf.module.refresh
+      end
+    }, "Refresh current Grep buffer")
 
     bindkey "C , g", :grep_buffer
-
+    bindkey "grep ctrl-r", :grep_refresh
   end
 
   def apply_changes()
@@ -114,45 +113,54 @@ class Grep
     @line_to_id = {}
   end
 
-  def callback(search_str, b = nil)
-    debug "grep_cur_buffer(search_str)"
-    lines = vma.buf.split("\n")
-    r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
-    fpath = ""
-    fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
-    res_str = ""
+  def refresh
+    set_buf_contents
+  end
+
+  def set_buf_contents()
+    lines = @orig_buf.split("\n")
 
-    hlparts = []
     @grep_matches = []
+
+    res_str = ""
     lines.each_with_index { |l, i|
-      if r.match(l)
+      if @r.match(l)
         res_str << "#{i + 1}:"
         # ind = scan_indexes(l, r)
         res_str << "#{l}\n"
         @grep_matches << i + 1 # Lines start from index 1
       end
     }
-    $grep_bufid = vma.buffers.current_buf
+
+    @buf.set_content(res_str)
+
+    Gui.highlight_match(@buf, @search_str, color: cnf.match.highlight.color!)
+  end
+
+  def callback(search_str, b = nil)
+    debug "grep_cur_buffer(search_str)"
+    @r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
+    fpath = ""
+    fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
+
+    @search_str = search_str
     @orig_buf = vma.buf
-    b = create_new_buffer(res_str, "grep")
-    vbuf = vma.gui.view.buffer
+    @buf = create_new_buffer("", "grep")
 
-    Gui.highlight_match(b, search_str, color: cnf.match.highlight.color!)
-    b.default_mode = :grep
-    b.module = self
+    @buf.default_mode = :grep
+    @buf.module = self
 
-    vma.kbd.set_mode(:grep) #TODO: allow to work with other keybindings also
-    vma.kbd.set_default_mode(:grep)
-    b.line_action_handler = proc { |lineno|
+    vma.kbd.set_mode(:grep)
+    @buf.line_action_handler = proc { |lineno|
       debug "GREP HANDLER:#{lineno}"
       jumpto = @grep_matches[lineno]
       if jumpto.class == Integer
-        # vma.buffers.set_current_buffer($grep_bufid, update_history = true)
-        # buf.jump_to_line(jumpto)
         vma.buffers.set_current_buffer_by_id(@orig_buf.id)
         @orig_buf.jump_to_line(jumpto)
       end
     }
+
+    set_buf_contents
   end
 
   def run()

data/lib/vimamsa/terminal.rb

@@ -1,3 +1,4 @@
+
 def exec_in_terminal(cmd, autoclose = false)
   # debug "CMD:#{cmd}"
 
@@ -19,4 +20,15 @@ def exec_in_terminal(cmd, autoclose = false)
   fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
 end
 
+def command_to_buf_callback(cmd)
+  require "open3"
+  stdout, stderr, status = Open3.capture3(cmd)
+  b = create_new_buffer(stdout, cmd)
+end
+
 
+load "terminal_extra.rb" if File.exist?("terminal_extra.rb")
+def command_to_buf
+  callback = method("command_to_buf_callback")
+  gui_one_input_action("Execute command in shell, output to buffer", "Command:", "Execute", callback)
+end

data/lib/vimamsa/util.rb

@@ -23,8 +23,17 @@ def file_is_text_file(fpath)
   debug "file_is_text_file(#{fpath})"
   fpath = File.expand_path(fpath)
   return false if !File.exist?(fpath)
+  return false if !File.file?(fpath)
+
+  if File.size(fpath) < 1000e3 #smaler than 1MB
+    str = IO.read(fpath)
+    str.force_encoding("UTF-8")
+    debug "Small file with valid utf-8"
+    return true if str.valid_encoding?
+  end
+
+  #TODO: not sure if needed
   r = exec_cmd("file", fpath)
-  debug "DEBUG:#{r}"
   return true if r.match(/UTF-8.*text/)
   return true if r.match(/ASCII.*text/)
   return false
@@ -101,7 +110,7 @@ class HSafe
     hh = @h
     while !b.empty?
       x = b.pop
-      puts "x=#{x}"
+      debug "x=#{x}"
       pp b
       ok = false
       if hh.class == Hash or hh.class == Array

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/vimamsa.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib","ext"]
 
   spec.add_development_dependency "bundler", "~> 2.4.21"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake", "~> 13.1.0"
   
   spec.add_runtime_dependency 'rufo', '~> 0.16.2'
   
@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
   spec.add_runtime_dependency 'gdk4', '~> 4.2.0'
   spec.add_runtime_dependency 'gtk4', '~> 4.2.0'
-  spec.add_runtime_dependency 'rake', '~> 13.1.0'
+  spec.add_runtime_dependency 'rambling-trie', '~> 2.3.1'
+  
   spec.add_runtime_dependency 'differ', '~>  0.1.2'
   spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.0'
   spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?