vimamsa 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4603a715f3fd3b549cc38a9744d93617b3a87ba3d95268f77ed2c98c2c04643d
-  data.tar.gz: 26e82f3a6564a78dcd7188a69037f97bae3fb53c43be807560facfab8e70dd51
+  metadata.gz: e861051f02f35b286c8e97c225b69b9377f1d5cdf3dcf311de89a2ababb9dcd9
+  data.tar.gz: c27f3bc13a925dbd0293592f9d692a1918e91a7ce8047868c340098be76d1613
 SHA512:
-  metadata.gz: 1f05aad90407dfdd0e9c310f08f5e79274a5901f714d63e353e7291f25c7f4dba3d402163f338cebf01fef4f8fae07522f85a58d62e76086661007f24b14a0bd
-  data.tar.gz: f503976439de2a311778b48a427354fc21a1b42434eb6a0bcfa5e3c00144fc3508abe029a058249c2b433e9f41f983679f44927ae095b1ec4a4eb36fafdbfe93
+  metadata.gz: 2dbc0c1b7c6f42f0d4eca33c82b5a7e007ca549dda77b4e4d23056264a16b853b2cacbaa120ff24a1b25eb010aeea79efc955a6f3b9018bf9cca1249276f2410
+  data.tar.gz: b9e9deb8f5c3faf4a0f5e03757a8070d91e79e1bc959c991ca101df288fb62f809acc15154e7eab234647ad3d9b2d7a2b488b6013ff3a5c6db1978cf06e1654c

data/lib/vimamsa/ack.rb

@@ -13,7 +13,6 @@ Will search all .txt files in the following directories:
   </span>"
 
     callback = proc { |x| FileContentSearch.search_buffer(x) }
-    # gui_one_input_action(nfo, "Search:", "search", callback)
 
     params = {}
     params["inputs"] = {}
@@ -21,7 +20,6 @@ Will search all .txt files in the following directories:
     params["inputs"]["extensions"] = { :label => "Limit to file extensions:", :type => :entry }
     params["inputs"]["extensions"][:initial_text] = conf(:default_search_extensions).join(",")
     params["inputs"]["btn1"] = { :label => "Search", :type => :button }
-    # callback = proc { |x| gui_replace_callback(x) }
 
     params[:callback] = callback
     PopupFormGenerator.new(params).run
@@ -106,20 +104,100 @@ Will search the following directories:
  If .vma_project exists in parent directory of current file, searches within that directory.
   </span>"
 
-  callback = proc { |x| ack_buffer(x) }
+  callback = proc { |x| Ack.new.ack_buffer(x) }
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def ack_buffer(_instr, b = nil)
-  instr = Shellwords.escape(_instr)
-  bufstr = ""
-  for path in vma.get_content_search_paths
-    bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
+def group_by_folder(list)
+  bh = {}
+  for b in list
+    fpath = b[:fpath]
+    if !fpath.nil?
+      bname = File.basename(b[:fpath])
+      dname = File.dirname(b[:fpath])
+    else
+      #TODO
+    end
+    bh[dname] ||= {}
+    bh[dname][:files] ||= []
+    bh[dname][:files] << { bname: bname, nfo: b }
+  end
+  arr = []
+
+  for k in bh.keys.sort
+    tp = tilde_path(k)
+    arr << { type: :dir, path: tp }
+    for f in bh[k][:files].sort_by { |x| x[:bname] }
+      arr << { type: :file, bname: f[:bname], nfo: f[:nfo] }
+    end
   end
-  if bufstr.size > 5
-    b = create_new_buffer(bufstr, "ack")
-    Gui.highlight_match(b, _instr, color: cnf.match.highlight.color!)
-  else
-    message("No results for input:#{instr}")
+  return arr
+end
+
+class Ack
+  attr_reader :buf
+  @@cur = nil # Current object of class
+
+  def self.cur()
+    return @@cur
+  end
+
+  def self.init()
+  end
+
+  def initialize()
+    @buf = nil
+    @line_to_id = {}
+  end
+
+  def ack_buffer(_instr, b = nil)
+    instr = Shellwords.escape(_instr)
+    bufstr = ""
+    for path in vma.get_content_search_paths
+      bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
+    end
+
+    b = ""
+    list = []
+    for x in bufstr.lines
+      if x.match(/(.*?):(\d+):(.+)/) # non greedy: *?
+        fn = $1
+        lineno = $2
+        matchpart = $3
+        pp [fn, lineno, matchpart]
+        b << "[#{fn},#{lineno},#{matchpart}]\n"
+        list << { fpath: fn, lineno: lineno, matchpart: matchpart }
+      end
+    end
+
+    gb = group_by_folder(list)
+    s = ""
+    @line_to_nfo = {}
+    i = 0
+    for x in gb
+      if x[:type] == :file
+        s << "╰─#{x[:bname]}:#{x[:nfo][:lineno]}:#{x[:nfo][:matchpart]}\n"
+        @line_to_nfo[i] = x
+      end
+      if x[:type] == :dir
+        s << "📂#{x[:path]}:\n"
+      end
+      i += 1
+    end
+
+    if s.size > 5
+      @buf = create_new_buffer(s, "ack")
+      @buf.module = self
+      @buf.line_action_handler = self.method("select_line")
+      Gui.highlight_match(@buf, _instr, color: cnf.match.highlight.color!)
+    else
+      message("No results for input:#{instr}")
+    end
+  end
+
+  def select_line(lineno)
+    debug "def select_line #{lineno}", 2
+    nfo = @line_to_nfo[lineno][:nfo]
+    jump_to_file(nfo[:fpath], nfo[:lineno].to_i)
   end
 end

data/lib/vimamsa/actions.rb

@@ -6,13 +6,10 @@ class Action
     @id = id
     @method = method
     @opt = opt
-
-    $actions[id] = self
+    vma.actions.register(id, self) # TODO: handle this in Editor class
   end
 end
 
-$actions = {}
-
 def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
     a = Action.new(id, name, callfunc, opt)
@@ -31,108 +28,126 @@ def missing_callfunc
   debug "missing_callfunc"
 end
 
-#TODO: remove
-# def call(id)
-  # call_action(id)
-# end
+#TODO: remove?
+def call_action(id)
+  vma.actions.call(id)
+end
 
-$acth = []
+class ActionList
+  def initialize
+    @acth = []
+    @actions = {}
+  end
 
-def call_action(id)
-  $acth << id
-  a = $actions[id]
-  if a
-    a.method.call()
-  else
-    message("Unknown action: " + id.inspect)
+  def register(id, obj)
+    @actions[id] = obj
   end
-end
 
-def last_action
-  return $acth[-1]
-end
+  def include?(act)
+    return @actions.has_key?(act)
+  end
 
-def search_actions()
-  l = []
-  opt = { :title => "Search for actions", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
-  $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
+  def [](id)
+    @actions[id]
+  end
 
-  gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                           "search_actions_select_callback",
-                           "search_actions_update_callback",
-                           opt)
-end
+  def call(id)
+    @acth << id
+    a = @actions[id]
+    if a
+      a.method.call()
+    else
+      message("Unknown action: " + id.inspect)
+    end
+  end
 
-$item_list = []
+  def last_action
+    return @acth[-1]
+  end
 
-def search_actions_update_callback(search_str = "")
-  return [] if search_str == ""
+  def gui_search()
+    l = []
+    opt = { :title => "Search for actions", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current.",
+            :columns => [{ :title => "Shortcut", :id => 0 }, { :title => "Action", :id => 1 }] }
 
-  item_list2 = []
-  for act_id in $actions.keys
-    act = $actions[act_id]
-    item = {}
-    item[:key] = ""
+    @select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
 
-    for mode_str in ["C", "V"]
-      c_kbd = vma.kbd.act_bindings[mode_str][act_id]
-      if c_kbd.class == String
-        item[:key] = "[#{mode_str} #{c_kbd}] "
-        break
-      end
-    end
-    # c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
-    item[:action] = act_id
-    item[:str] = act_id.to_s
-    if $actions[act_id].method_name != ""
-      item[:str] = $actions[act_id].method_name
-    end
-    item_list2 << item
+    gui_select_update_window(l, @select_keys.collect { |x| x.upcase },
+                             self.method("search_actions_select_callback"),
+                             self.method("search_actions_update_callback"),
+                             opt)
   end
 
-  item_list = item_list2
+  @item_list = []
 
-  a = filter_items(item_list, 0, search_str)
-  debug a.inspect
+  def search_actions_update_callback(search_str = "")
+    return [] if search_str == ""
 
-  r = a.collect { |x| [x[0][0], 0, x] }
-  debug r.inspect
-  $item_list = r
+    item_list2 = []
+    for act_id in @actions.keys
+      act = @actions[act_id]
+      item = {}
+      item[:key] = ""
 
-  # Ripl.start :binding => binding
+      for mode_str in ["C", "V"]
+        c_kbd = vma.kbd.act_bindings[mode_str][act_id]
+        if c_kbd.class == String
+          item[:key] = "[#{mode_str}] #{c_kbd} "
+          item[:key] = "" if item[:key].size > 15
+          break
+        end
+      end
+      # c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
+      item[:action] = act_id
+      item[:str] = act_id.to_s
+      if @actions[act_id].method_name != ""
+        item[:str] = @actions[act_id].method_name
+      end
+      item_list2 << item
+    end
 
-  r = a.collect { |x| ["#{x[0][:key]}#{x[0][:str]}", 0, x] }
-  return r
-end
+    item_list = item_list2
 
-def search_actions_select_callback(search_str, idx)
-  item = $item_list[idx][2]
-  acc = item[0][:action]
+    a = filter_items(item_list, 0, search_str)
+    debug a.inspect
 
-  debug "Selected:" + acc.to_s
-  gui_select_window_close(0)
+    r = a.collect { |x| [x[0][0], 0, x] }
+    debug r.inspect
+    @item_list = r
 
-  if acc.class == String
-    eval(acc)
-  elsif acc.class == Symbol
-    debug "Symbol"
-    call_action(acc)
+    r = a.collect { |x| [x[0][:key], x[0][:str]] }
+    return r
   end
-end
 
-def filter_items(item_list, item_key, search_str)
-  item_hash = {}
-  # debug item_list.inspect
-  scores = Parallel.map(item_list, in_threads: 8) do |item|
-    if item[:str].class != String
-      puts item.inspect
-      exit!
+  def search_actions_select_callback(search_str, idx)
+    item = @item_list[idx][2]
+    acc = item[0][:action]
+
+    debug "Selected:" + acc.to_s
+    gui_select_window_close(0)
+
+    if acc.class == String
+      eval(acc)
+    elsif acc.class == Symbol
+      debug "Symbol"
+      call(acc)
     end
-    [item, srn_dst(search_str, item[:str])]
   end
-  scores.sort_by! { |x| -x[1] }
-  debug scores.inspect
-  scores = scores[0..30]
 
-  return scores
+  def filter_items(item_list, item_key, search_str)
+    item_hash = {}
+    # debug item_list.inspect
+    scores = Parallel.map(item_list, in_threads: 8) do |item|
+      if item[:str].class != String
+        puts item.inspect
+        exit!
+      end
+      [item, srn_dst(search_str, item[:str])]
+    end
+    scores.sort_by! { |x| -x[1] }
+    debug scores.inspect
+    scores = scores[0..30]
+
+    return scores
+  end
 end

data/lib/vimamsa/buffer.rb

@@ -12,7 +12,7 @@ $update_highlight = false
 $ifuncon = false
 
 class Buffer < String
-  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save, :access_time
+  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save, :access_time, :selection_active
   attr_writer :call_func, :update_highlight
   attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle, :paste_lines, :mode_stack, :default_mode
 
@@ -1051,7 +1051,7 @@ class Buffer < String
 
   # Activated when enter/return pressed
   def handle_line_action()
-    if line_action_handler.class == Proc
+    if line_action_handler.class == Proc or line_action_handler.class == Method
       # Custom handler
       line_action_handler.call(lpos)
     else
@@ -1258,18 +1258,28 @@ class Buffer < String
     @need_redraw = false
   end
 
-  def start_visual_mode()
-    @visual_mode = true
-    @selection_start = @pos
-    $kbd.set_mode(:visual)
+  def selection_active?
+    @selection_active
   end
 
+  def end_selection()
+    @selection_start = nil
+    @selection_active = false
+    @visual_mode = false
+    #TODO: remove @visual_mode
+  end
+  
   def start_selection()
-    @visual_mode = true
     @selection_start = @pos
-    $kbd.set_mode(:visual)
-    #TODO: implement without setting kbd mode
+    @selection_active = true
+    @visual_mode = true
+  end
+  
+  # Start selection if not already started
+  def continue_selection()
+    start_selection if !@selection_active
   end
+ 
 
   def copy_active_selection(x = nil)
     debug "!COPY SELECTION"
@@ -1297,6 +1307,7 @@ class Buffer < String
     txt.gsub!(/\w+/, &:capitalize) if op == :capitalize
     txt.swapcase! if op == :swapcase
     txt.reverse! if op == :reverse
+    txt = to_camel_case(txt) if op == :camelcase
 
     replace_range(r, txt)
     end_visual_mode
@@ -1380,6 +1391,7 @@ class Buffer < String
       # TODO: should not happen
     end
     debug "End visual mode"
+    end_selection
     vma.kbd.to_previous_mode
     @visual_mode = false
     return true

data/lib/vimamsa/buffer_list.rb

@@ -155,6 +155,7 @@ class BufferList
     end
 
     # hpt_scan_images() if cnf.debug? # experimental
+    return bu
   end
 
   def to_s

data/lib/vimamsa/buffer_manager.rb

@@ -73,7 +73,7 @@ class BufferManager
     for b in vma.buffers.list
       if !b.fname.nil?
         bname = File.basename(b.fname)
-        dname = File.dirname(b.dirname)
+        dname = File.dirname(b.fname)
       else
         bname = b.list_str
         dname = "*"

data/lib/vimamsa/conf.rb

@@ -159,3 +159,6 @@ cnf.font.size = 11
 cnf.font.family = "Monospace"
 
 
+cnf.macro.animation_delay = 0.02
+
+

data/lib/vimamsa/editor.rb

@@ -5,9 +5,8 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
-
 class Editor
-  attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro
+  attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro, :actions
   attr_accessor :converters, :fh, :paint_stack, :kbd, :langsrv, :register, :cur_register, :clipboard
   #attr_writer :call_func, :update_highlight
 
@@ -63,6 +62,10 @@ class Editor
 
     $hook = Hook.new
     @hook = $hook
+    require "vimamsa/actions"
+    @actions = ActionList.new
+    require "vimamsa/key_actions"
+
     register_plugin(:Hook, @hook)
     @macro = Macro.new
     register_plugin(:Macro, @macro)
@@ -548,12 +551,13 @@ def load_buffer(fname)
 end
 
 def jump_to_file(filename, tnum = nil, charn = nil)
-  open_new_file(filename)
+  b = open_new_file(filename)
+  # debug "open_new_file #{filename}, #{tnum} = nil, #{charn}",2
 
   # Link to character position
   if !charn.nil?
     if charn == "c"
-      buf.jump_to_pos(tnum) # tnum=character position
+      b.jump_to_pos(tnum) # tnum=character position
       center_on_current_line
       return
     end
@@ -561,7 +565,7 @@ def jump_to_file(filename, tnum = nil, charn = nil)
 
   # Link to line
   if !tnum.nil?
-    buf.jump_to_line(tnum) # tnum=line position
+    b.jump_to_line(tnum) # tnum=line position
     center_on_current_line
     return
   end
@@ -579,7 +583,7 @@ def open_new_file(filename, file_contents = "")
   # File is already opened to existing buffer
   if b != nil
     message "Switching to: #{filename}"
-    vma.buffers.set_current_buffer(b)
+    bu = vma.buffers.set_current_buffer(b)
   else
     if !is_path_writable(filename)
       message("Path #{filename} cannot be written to")
@@ -593,9 +597,10 @@ def open_new_file(filename, file_contents = "")
     end
     message "New file opened: #{filename}"
     fname = filename
-    bf = load_buffer(fname)
-    vma.buffers.set_current_buffer_by_id(bf.id)
+    bu = load_buffer(fname)
+    vma.buffers.set_current_buffer_by_id(bu.id)
   end
+  return bu
 end
 
 def scan_word_start_marks(search_str)

data/lib/vimamsa/file_history.rb

@@ -76,12 +76,12 @@ end
 
 def gui_file_history_update_callback(search_str = "")
   debug "gui_file_history_update_callback: #{search_str}"
-  return [] if $vma.fh.history.empty?
+  return [] if vma.fh.history.empty?
   $search_list = []
-  files = $vma.fh.history.keys.sort.collect { |x| [x, 0] }
+  files = vma.fh.history.keys.sort.collect { |x| [x, 0] }
 
   if (search_str.size > 1)
-    files = fuzzy_filter(search_str, $vma.fh.history.keys, 40)
+    files = fuzzy_filter(search_str, vma.fh.history.keys, 40)
   end
 
   $search_list = files

data/lib/vimamsa/gui.rb

@@ -2,6 +2,31 @@ $idle_scroll_to_mark = false
 
 $removed_controllers = []
 
+# Run one iteration of GMainLoop
+# https://developer.gnome.org/documentation/tutorials/main-contexts.html
+def iterate_gui_main_loop
+  GLib::MainContext.default.iteration(true)
+end
+
+# Wait for window resize to take effect
+# GTk3 had a resize notify event which got removed in gtk4
+# https://discourse.gnome.org/t/gtk4-any-way-to-connect-to-a-window-resize-signal/14869/3
+def wait_for_resize(window, tries = 200)
+  i = 0
+  widthold = @window.width
+  heightold = @window.height
+  while true
+    iterate_gui_main_loop
+    break if widthold != window.width
+    break if heightold != window.height
+    if i >= tries
+      debug "i >= tries", 2
+      break
+    end
+    i += 1
+  end
+end
+
 def gui_remove_controllers(widget)
   clist = widget.observe_controllers
   to_remove = []
@@ -102,7 +127,7 @@ def gui_create_buffer(id, bufo)
   view.set_buffer(buf1)
 
   provider = Gtk::CssProvider.new
-  
+
   provider.load(data: "textview { font-family: #{cnf.font.family!}; font-size: #{cnf.font.size!}pt; }")
   view.style_context.add_provider(provider)
   view.wrap_mode = :char
@@ -549,11 +574,24 @@ class VMAgui
 
   def idle_set_size()
     # Need to wait for a while to window to be maximized to get correct @window.width
-    sleep 0.1
+    @window.maximize
+    wait_for_resize(@window)
+    # Set new size as half of the screeen
     width = @window.width / 2
     height = @window.height - 5
+    width = 600 if width < 600
+    height = 600 if height < 600
+
+    #Minimum size:
+    @window.set_size_request(600, 600)
+    @window.set_default_size(width, height)
+    debug "size #{[width, height]}", 2
     @window.unmaximize
+
+    #set_default_size doesn't always have effect if run immediately
+    wait_for_resize(@window)
     @window.set_default_size(width, height)
+
     return false
   end
 
@@ -569,10 +607,6 @@ class VMAgui
       @window = Gtk::ApplicationWindow.new(app)
       @window.set_application(app)
 
-      @window.maximize
-      # Need to let Gtk process after maximize
-      run_as_idle proc { idle_set_size }
-
       @window.title = "Multiple Views"
       @vpaned = Gtk::Paned.new(:vertical)
 
@@ -664,6 +698,8 @@ class VMAgui
 
       @window.show
 
+      run_as_idle proc { idle_set_size }
+
       prov = Gtk::CssProvider.new
       # See gtk-4.9.4/gtk/theme/Default/_common.scss  on how to theme
       # gtksourceview/gtksourcestyleschemepreview.c

data/lib/vimamsa/gui_select_window.rb

@@ -12,6 +12,8 @@ class SelectUpdateWindow
 
   def update_item_list(item_list)
     # debug item_list.inspect
+    return if item_list.empty?
+
     @model.clear
     for item in item_list
       iter = @model.append

data/lib/vimamsa/gui_sourceview.rb

@@ -52,9 +52,9 @@ class VSourceView < GtkSource::View
 
     # Mainly after page-up or page-down
     signal_connect("move-cursor") do |widget, event|
-      if event.name == "GTK_MOVEMENT_PAGES" and (last_action == "page_up" or last_action == "page_down")
-        handle_scrolling()
-      end
+      # if event.name == "GTK_MOVEMENT_PAGES" and (vma.actions.last_action == "page_up" or vma.actions.last_action == "page_down")
+      # handle_scrolling()
+      # end
 
       # handle_scrolling()
       # curpos = buffer.cursor_position
@@ -149,10 +149,13 @@ class VSourceView < GtkSource::View
       debug "drag-end", 2
       if offsetx.abs < 5 and offsety.abs < 5
         debug "Not enough drag", 2
-        @range_start = nil
-      elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
+        buf.end_selection
+        # elsif !buf.visual_mode? and vma.kbd.get_scope != :editor
+      elsif vma.kbd.get_scope != :editor 
         # Can't transition from editor wide mode to buffer specific mode
-        buf.start_visual_mode
+        vma.kbd.set_mode(:visual)
+      else
+        buf.end_selection
       end
       @range_start = nil
     end
@@ -523,6 +526,15 @@ class VSourceView < GtkSource::View
     end
   end
 
+  def after_action
+    delete_cursorchar
+    iterate_gui_main_loop
+    handle_deltas
+    iterate_gui_main_loop
+    draw_cursor
+    iterate_gui_main_loop
+  end
+
   def set_cursor_color(ctype)
     if @ctype != ctype
       bg = $confh[:mode][ctype][:cursor][:background]
@@ -547,6 +559,8 @@ class VSourceView < GtkSource::View
 
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
+    ctype = :visual if vma.buf.selection_active?
+
     delete_cursorchar
     vma.gui.remove_overlay_cursor
     if [:command, :replace, :browse].include?(ctype)

data/lib/vimamsa/key_actions.rb

@@ -166,7 +166,7 @@ act_list = {
   # { :proc => proc {  },
   # :desc => "", :group => : },
 
-  :search_actions => { :proc => proc { search_actions },
+  :search_actions => { :proc => proc { vma.actions.gui_search },
                        :desc => "Search actions", :group => :search },
 
   :toggle_active_window => { :proc => proc { vma.gui.toggle_active_window },

data/lib/vimamsa/key_binding_tree.rb

@@ -67,6 +67,7 @@ class KeyBindingTree
   end
 
   def set_mode(label)
+    return if get_mode == :label
     @match_state = [@modes[label]] # used for matching input
     @mode_root_state = @modes[label]
     # @default_mode = label
@@ -290,8 +291,8 @@ class KeyBindingTree
       else
         method_desc = t.action
         if t.action.class == Symbol
-          if !$actions[t.action].nil?
-            a = $actions[t.action].method_name
+          if vma.actions.include?(t.action)
+            a = vma.actions[t.action].method_name
             if !a.nil? and !a.empty?
               method_desc = a
             end
@@ -477,7 +478,7 @@ class KeyBindingTree
     # return
     # end
     # $action_list << { :action => action, :key => key }
-    if !$actions.has_key?(action)
+    if !vma.actions.include?(action)
       if action.class == String
         reg_act(action, proc { eval(action) }, action)
       end
@@ -566,7 +567,7 @@ class KeyBindingTree
   end
 
   def handle_key_bindigs_action(action, c)
-    $acth << action
+    # $acth << action #TODO:needed here?
     @method_handles_repeat = false #TODO:??
     n = 1
     if @next_command_count and !(action.class == String and action.include?("set_next_command_count"))
@@ -619,8 +620,6 @@ def bindkey(key, action)
   $kbd.bindkey(key, action)
 end
 
-$action_list = []
-
 def exec_action(action)
   $kbd.last_action = $kbd.cur_action
   $kbd.cur_action = action

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -17,11 +17,31 @@ cnf.mode.default.cursor.background = "#03fcca"
 cnf.mode.visual.cursor.background = "#bc6040"
 cnf.mode.replace.cursor.background = "#fc0331"
 cnf.mode.browse.cursor.background = "#f803fc"
-# vma.kbd.show_state_trail
+
+def _insert_move(op)
+  if op == :pagedown
+    vma.gui.page_down
+  elsif op == :pageup
+    vma.gui.page_up
+  else
+    buf.move(op)
+  end
+end
+
+def insert_select_move(op)
+  buf.continue_selection
+  _insert_move(op)
+end
+
+def insert_move(op)
+  buf.end_selection
+  _insert_move(op)
+end
 
 bindkey ["VCB M", "B m"], :run_last_macro
 
 bindkey "VC s", :easy_jump
+bindkey "I alt-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
@@ -86,8 +106,8 @@ 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 r", proc { vma.gui.page_down(multip:0.25)}
-bindkey "B e", proc { vma.gui.page_up(multip:0.25)}
+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
@@ -128,24 +148,41 @@ default_keys = {
   # "VC j" => "buf.move(FORWARD_LINE)",
   # "VC k" => "buf.move(BACKWARD_LINE)",
 
-  "VC pagedown" => :page_down,
-  "VC pageup" => :page_up,
+  "VCI pagedown" => :page_down,
+  "VCI 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 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)",
-  "VCIX down" => "buf.move(FORWARD_LINE)",
-  "VCIX up" => "buf.move(BACKWARD_LINE)",
+  "I shift-down" => "insert_select_move(BACKWARD_CHAR)",
+  "I shift-right" => "insert_select_move(FORWARD_CHAR)",
+  "I shift-down" => "insert_select_move(FORWARD_LINE)",
+  "I shift-up" => "insert_select_move(BACKWARD_LINE)",
+  "I shift-pagedown" => "insert_select_move(:pagedown)",
+  "I shift-pageup" => "insert_select_move(:pageup)",
+
+  "I left" => "insert_move(BACKWARD_CHAR)",
+  "I right" => "insert_move(FORWARD_CHAR)",
+  "I down" => "insert_move(FORWARD_LINE)",
+  "I up" => "insert_move(BACKWARD_LINE)",
+  "I pagedown" => "insert_move(:pagedown)",
+  "I pageup" => "insert_move(:pageup)",
+
+  #TODO:
+  "I @shift-click" => "insert_mode_shift_click(charpos)",
+
+  "VCX left" => "buf.move(BACKWARD_CHAR)",
+  "VCX right" => "buf.move(FORWARD_CHAR)",
+  "VCX down" => "buf.move(FORWARD_LINE)",
+  "VCX up" => "buf.move(BACKWARD_LINE)",
 
   "VC w" => "buf.jump_word(FORWARD,WORD_START)",
   "VC b" => "buf.jump_word(BACKWARD,WORD_START)",
@@ -192,7 +229,7 @@ default_keys = {
   "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)",
 
@@ -209,7 +246,7 @@ default_keys = {
 
   # Command mode only:
   "C ctrl-r" => "buf.redo()", # TODO:???
-  "C v" => "buf.start_visual_mode",
+  "C v" => "buf.start_selection;vma.kbd.set_mode(:visual)",
   "C P" => "buf.paste(BEFORE)", # TODO: implement as replace for visual mode
   "C space <char>" => "buf.insert_txt(<char>)",
   "C space space" => "buf.insert_txt(' ')",
@@ -269,7 +306,7 @@ default_keys = {
   "C i" => "vma.kbd.set_mode(:insert)",
   "C R" => "vma.kbd.set_mode(:replace)",
   "C ctrl!" => "vma.kbd.set_mode(:insert)",
-  
+
   # Replace mode
   "X esc || X ctrl!" => "vma.kbd.to_previous_mode",
   "X <char>" => "buf.replace_with_char(<char>);buf.move(FORWARD_CHAR)",
@@ -312,7 +349,6 @@ default_keys = {
 
   "I ctrl-h" => :show_autocomplete,
   "I ctrl-j" => "vma.buf.view.hide_completions",
-  
 
   "I space" => 'buf.insert_txt(" ")',
 #  "I return" => 'buf.insert_new_line()',
@@ -320,7 +356,6 @@ default_keys = {
 
 bindkey "C , i p", "generate_password_to_buf(15)"
 
-
 default_keys.each { |key, value|
   bindkey(key, value)
 }

data/lib/vimamsa/langservp.rb

@@ -176,7 +176,9 @@ class LangSrv
   def open_file(fp, fc = nil)
     debug "open_file", 2
     fc = IO.read(fp) if fc.nil?
-    fpuri = URI.join("file:///", fp).to_s
+
+    encoded_filepath = URI.encode_www_form_component(fp)
+    fpuri = URI.parse("file://#{encoded_filepath}")
 
     a = LSP::Interface::DidOpenTextDocumentParams.new(
       text_document: LSP::Interface::TextDocumentItem.new(

data/lib/vimamsa/macro.rb

@@ -127,9 +127,12 @@ class Macro
         ret = exec_action(a)
         if ret == false
           error "Error while running macro"
-          isok=false
+          isok = false
           break
         end
+
+        vma.buf.view.after_action
+        sleep cnf.macro.animation_delay!
       end
     end
     @running_macro = false

data/lib/vimamsa/rbvma.rb

@@ -18,9 +18,7 @@ require "vimamsa/util"
 require "vimamsa/main"
 require "vimamsa/terminal"
 
-require "vimamsa/actions"
 require "vimamsa/key_binding_tree"
-require "vimamsa/key_actions"
 
 require "vimamsa/clipboard"
 

data/lib/vimamsa/tests.rb

@@ -1,26 +1,26 @@
 require "digest"
 
 def run_tests()
-  tests = ["test_paste_0","test_delete_0"]
+  tests = ["test_paste_0", "test_delete_0"]
   stats = []
   for t in tests
     r = eval(t)
     if r == true
       stats << "test #{t} OK"
     else
-      stats <<  "test #{t} FAILED"
+      stats << "test #{t} FAILED"
     end
   end
-  debug "TEST RESULTS:",2
+  debug "TEST RESULTS:", 2
   puts stats.join("\n")
   puts "===================="
-  
 end
 
-
 #
 
 def test_paste_0(runmacro = true)
+  return
+  #TODO: update macro
   b = create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
 
   b.insert_txt(JABBERWOCKY)
@@ -47,7 +47,7 @@ def test_paste_0(runmacro = true)
   end
 end
 
-def macro_test(macro, correct_hex, runmacro=true)
+def macro_test(macro, correct_hex, runmacro = true)
   b = create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
   b.insert_txt(JABBERWOCKY)
   b.insert_txt(LOREM_IPSUM)
@@ -117,6 +117,3 @@ O frabjous day! Callooh! Callay!”
 All mimsy were the borogoves,
       And the mome raths outgrabe.
 "
-
-
-

data/lib/vimamsa/util.rb

@@ -8,6 +8,14 @@ def tilde_path(abspath)
   abspath.sub(/^#{Regexp.escape(userhome)}\//, "~/")
 end
 
+def to_camel_case(str)
+  words = str.split(/\W+/) # Split the input string into words
+  camel_case_words = words.map.with_index do |word, index|
+    index == 0 ? word.downcase : word.capitalize
+  end
+  camel_case_words.join
+end
+
 def generate_password(length)
   password = ""
   while password.size < length

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Vimamsa