vimamsa 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eba5b3c9a7821e14802295825b32369ff9440046b91b065ca2b1e82e44cc444
-  data.tar.gz: 16bd4a94226c3b07cb5d40cb6e395a09f8fbbb4e96e164af19b05415048a9812
+  metadata.gz: 0cde9df6e9ba0c6ac7bdbc894726e0fe0941ab50867abfdc150314e2d3a2c3de
+  data.tar.gz: b2ca3e49f7b7da7f3f135b12780dc5b2e34e90d5d90bf35ec56ac8efa5f46600
 SHA512:
-  metadata.gz: f74f902af54d82002d4b0d814e80cafc5326bfb712c0cd124c39be0bb2bf3f70d1eaabe6c2f05de619ee9e9ac4cf12a10a4350c568ca1b815129904b40797c48
-  data.tar.gz: a01c59f8358904e1ad511c4608de70bc31ac8bc8ccbbfa240eb897240a68f7673b7ae1bc124dcf312b94a6c7f12834d33dba692e6795713f083a5b2736ac6291
+  metadata.gz: 25de014aaef8785f1e169f9afe8242143ff5e70d1c3a71d13aa6556188161d361a7c9248d00f8a530550e488c1dabea4104461011bcb17f135c157e6d9c229e6
+  data.tar.gz: 87023b352b98dcceb2e2d388cfe18409bb899522629357bdd62dcb62856738ce5af4f3f5ae4091bac399f251ea4848f524318127e8ad7aa05d8bd49a437b7d48

data/README.md

@@ -63,8 +63,8 @@ For customization, edit ~/.vimamsa/custom.rb
 
 ## Screenshots
 
-<a href="https://samiddhi.net/vimamsa/screenshot1.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot1.png" width="400"/></a>
-<a href="https://samiddhi.net/vimamsa/screenshot2.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot2.png" width="400"/></a>
+<a href="https://raw.githubusercontent.com/SamiSieranoja/vimamsa/refs/heads/master/img/screenshot1.png" target="_blank"><img src="https://raw.githubusercontent.com/SamiSieranoja/vimamsa/refs/heads/master/img/screenshot1.png" width="400"/></a>
+<a href="https://raw.githubusercontent.com/SamiSieranoja/vimamsa/refs/heads/master/img/screenshot2.png" target="_blank"><img src="https://raw.githubusercontent.com/SamiSieranoja/vimamsa/refs/heads/master/img/screenshot2.png" width="400"/></a>
 
 ## Key bindings
 

data/custom_example.rb

@@ -3,8 +3,8 @@
 # Extract unique words
 # c = Converter.new(lambda { |x| h = {}; x.split(/\s+/).each { |y| h[y] = 1 }; h.keys.join(" ") }, :lambda, :uniqwords)
 
-# Eval selected text as ruby code (e.g. use as calculator)
 
+# Eval selected text as ruby code (e.g. use as calculator):
 # bindkey "V , e", "vma.buf.convert_selected_text(:eval)"
 # syntax: bindkey "mode key1 key2 ..."
 
@@ -24,6 +24,9 @@
 # cnf.lsp.server.clangd = { name: "clangd", command: "clangd-12 --offset-encoding=utf-8", type: "stdio" }
 # cnf.lsp.server.clangd.languages = ["c", "cpp"]
 
+# Uncomment this if you don't want to see the state trail of previous action
+# on top right corner:
+# cnf.kbd.show_prev_action = false
 
 
 

data/lib/vimamsa/buffer.rb

@@ -42,6 +42,8 @@ class Buffer < String
 
     @last_save = @last_asked_from_user = @file_last_cheked = Time.now
     @t_modified = @last_save
+    @last_autosave = @last_save
+    @autosave_thread = nil
 
     @crypt = nil
     @update_highlight = true
@@ -65,6 +67,7 @@ class Buffer < String
     if cnf.lsp.enabled?
       init_lsp
     end
+    start_autosave_timer
     return self
   end
 
@@ -237,11 +240,40 @@ class Buffer < String
     return words
   end
 
+  # TODO: review
+  def cleanup_deleted_images(deleted_text)
+    return if @images.empty?
+    return unless deleted_text&.include?("⟦img:")
+    deleted_text.scan(/⟦img:(.+?)⟧/) do |match|
+      tag_path = match[0]
+      abs_path = translate_path(tag_path, self)
+      @images.delete_if do |img|
+        next false unless img[:path] == abs_path || img[:path] == tag_path
+        # img[:obj].destroy unless img[:obj].destroyed?
+        # Schedule anchor character deletion after the current delta is done.
+        # Using the anchor object lets us find the correct position even if
+        # prior edits shifted it.
+        anchor = img[:anchor]
+        buf_ref = self
+        run_as_idle proc {
+          next if anchor.nil? || anchor.deleted?
+          itr = buf_ref.view.buffer.get_iter_at_child_anchor(anchor)
+          next if itr.nil?
+          pos = itr.offset
+          buf_ref.add_delta([pos, DELETE, 1], true)
+          buf_ref.calculate_line_and_column_pos
+        }
+        true
+      end
+    end
+  end
+
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
 
     vbuf = view.buffer
     itr = vbuf.get_iter_at(:offset => pos)
+    return if itr&.child_anchor  # anchor already exists here, image already rendered
     itr2 = vbuf.get_iter_at(:offset => pos + 1)
     vbuf.delete(itr, itr2)
     anchor = vbuf.create_child_anchor(itr)
@@ -256,7 +288,7 @@ class Buffer < String
     da.scale_image
 
     # vma.gui.handle_image_resize #TODO:gtk4
-    @images << { :path => imgpath, :obj => da }
+    @images << { :path => imgpath, :obj => da, :anchor => anchor }
 
     gui_set_current_buffer(@id) #TODO: needed?
   end
@@ -308,6 +340,8 @@ class Buffer < String
     message("Revert buffer #{@fname}")
     str = read_file("", @fname)
     self.set_content(str)
+    @last_save = Time.now
+    refresh_title
   end
 
   def init_encrypted(crypt:, filename:, encrypted:)
@@ -408,7 +442,7 @@ class Buffer < String
     @title = File.basename(@fname)
     @dirname = File.dirname(@fname)
     userhome = File.expand_path("~")
-    @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+    @subtitle = @fname.gsub(/^#{userhome}/, "~")
     vma.buffers.last_dir = @dirname
 
     detect_file_language
@@ -464,6 +498,7 @@ class Buffer < String
 
     if delta[1] == DELETE
       delta[3] = self.slice!(delta[0], delta[2])
+      cleanup_deleted_images(delta[3])
       @deltas << delta
       update_index(pos, -delta[2])
       update_line_ends(pos, -delta[2], delta[3])
@@ -485,6 +520,11 @@ class Buffer < String
       @update_hl_startpos = pos
       @update_hl_endpos = pos + delta[2]
       add_hl_update(@update_hl_startpos, @update_hl_endpos)
+
+      if delta[3]&.include?("⟦img:")
+        buf_ref = self
+        run_as_idle proc { hpt_scan_images(buf_ref) }
+      end
     end
     debug("DELTA=#{delta.inspect}", 2)
     # sanity_check_line_ends #TODO: enable with debug mode
@@ -1045,7 +1085,14 @@ class Buffer < String
       wsm = scan_marks(p - maxws, p, /((?<=\s)\S)|^\S/)
       word_start = wsm[-1]
       word_end = wem[0]
+    elsif boundary == :word2
+      wem = scan_marks(p, p + maxws, /\b/,-1)
+      wsm = scan_marks(p - maxws, p, /\b\w/)
+      word_start = wsm[-1]
+      word_end = wem.select{|x|x>=word_start}[0]
+     
     elsif boundary == :word
+    #TODO: change name :word. This works only with autocomplete
       wsm = scan_marks(p - maxws, p, /\b\w/)
       word_start = wsm[-1]
       word_end = p
@@ -1247,10 +1294,12 @@ class Buffer < String
   end
 
   def end_selection()
-    @selection_start = nil
+    puts("END SELECTION")
+    # @selection_start = nil
     @selection_active = false
     @visual_mode = false
     #TODO: remove @visual_mode
+    # print(caller())
   end
 
   def start_selection()
@@ -1265,7 +1314,7 @@ class Buffer < String
   end
 
   def copy_active_selection(x = nil)
-    debug "!COPY SELECTION"
+    debug "!COPY SELECTION vm=#{@visual_mode}"
     @paste_lines = false
     return if !@visual_mode
 
@@ -1394,7 +1443,7 @@ class Buffer < String
     r = get_visual_mode_range
     if r.begin > r.end
       debug "r.begin > r.end"
-      Ripl.start :binding => binding
+      require "pry";binding.pry
     end
     return [r.begin, r.end]
   end
@@ -1412,10 +1461,7 @@ class Buffer < String
   def get_visual_mode_range()
     _start = @selection_start
     _end = @pos
-
     _start, _end = _end, _start if _start > _end
-    # _end = _end + 1 if _start < _end #TODO:verify if correct
-    # return _start..(_end - 1)
     return _start..(_end)
   end
 
@@ -1567,6 +1613,80 @@ class Buffer < String
     return false
   end
 
+  AUTOSAVE_INTERVAL = 5 # seconds between autosave checks
+
+  def autosave_path
+    return nil if @fname.nil?
+    dir = File.dirname(@fname)
+    base = File.basename(@fname)
+    File.join(dir, ".#{base}_vma_autosave")
+  end
+
+  def autosave
+    return if @fname.nil?
+    return if @t_modified <= @last_autosave
+    apath = autosave_path
+    contents = self.to_s
+    Thread.new {
+      begin
+        File.open(apath, "w+") { |io| io.set_encoding(self.encoding); io.write(contents) }
+        @last_autosave = Time.now
+        debug "autosaved to #{apath}"
+      rescue => ex
+        debug "autosave failed: #{ex}"
+      end
+    }
+  end
+
+  def start_autosave_timer
+    @autosave_thread = Thread.new {
+      loop do
+        sleep AUTOSAVE_INTERVAL
+        autosave
+      end
+    }
+  end
+
+  def delete_autosave_file
+    apath = autosave_path
+    return if apath.nil?
+    File.delete(apath) if File.exist?(apath)
+  rescue => ex
+    debug "delete autosave failed: #{ex}"
+  end
+
+  def check_autosave_load
+    apath = autosave_path
+    return if apath.nil? || !File.exist?(apath)
+    if File.read(apath) == self.to_s
+      delete_autosave_file
+      return
+    end
+    title = "An autosave file was found for <b>#{File.basename(@fname)}</b>. Load autosave?"
+    params = {
+      "title" => title,
+      "inputs" => {
+        "yes_btn"    => { :label => "Load",   :type => :button, :default_focus => true },
+        "delete_btn" => { :label => "Delete autosave", :type => :button },
+      },
+      :callback => proc { |x| load_autosave_callback(x) },
+    }
+    PopupFormGenerator.new(params).run
+  end
+
+  def load_autosave_callback(x)
+    if x["yes_btn"] == "submit"
+      str = read_file("", autosave_path)
+      set_content(str)
+      @t_modified = Time.now
+      refresh_title
+      message("Loaded autosave for #{@fname}")
+    elsif x["delete_btn"] == "submit"
+      delete_autosave_file
+      message("Deleted autosave for #{@fname}")
+    end
+  end
+
   def save()
     check_if_modified_outside #TODO
     if !@fname
@@ -1575,6 +1695,7 @@ class Buffer < String
     end
     message("Saving file #{@fname}")
     write_contents_to_file(@fname)
+    delete_autosave_file
     hook.call(:file_saved, self)
   end
 

data/lib/vimamsa/buffer_changetext.rb

@@ -93,7 +93,7 @@ class Buffer < String
     if true or running_wayland? and !GLib::Version::or_later?(2, 79, 0)
       return paste_start_xclip(at, register)
     end
-    
+
     clipboard = vma.gui.window.display.clipboard
     clipboard.read_text_async do |_clipboard, result|
       begin
@@ -135,6 +135,7 @@ class Buffer < String
       set_pos(pos + text.size)
     end
     set_pos(@pos)
+    vma.buf.view.after_action # redraw
     @clipboard_paste_running = false
   end
 
@@ -152,6 +153,22 @@ class Buffer < String
     return true
   end
 
+  def increment_current_word()
+    debug "increment_current_word", 2
+    p = @pos
+    return if !is_legal_pos(p)
+    (word, range) = get_word_in_pos(p, boundary: :word2)
+    if word.match(/(true|false)/i)
+      rep = flip_true_false(word)
+    else
+      num = word.to_i
+      num += 1
+      rep = num.to_s
+    end
+    debug [word, range].to_s, 2
+    replace_range(range, rep)
+  end
+
   def complete_current_word(rep)
     debug "complete_current_word", 2
     p = @pos - 1
@@ -217,7 +234,7 @@ class Buffer < String
 
   def delete_range(startpos, endpos, x = nil)
     s = self[startpos..endpos]
-    if startpos == endpos or s == ""
+    if startpos > endpos or s == ""
       return
     end
     if x == :append

data/lib/vimamsa/buffer_cursor.rb

@@ -1,6 +1,5 @@
 # Buffer operations related to cursor position, e.g. moving the cursor (backward, forward, next line etc.)
 class Buffer < String
-
   def line(lpos)
     if @line_ends.size == 0
       return self
@@ -30,15 +29,22 @@ class Buffer < String
   def refresh_cursor
     self.view.set_cursor_pos(@pos)
   end
-  
+
   def set_pos(new_pos)
+    # If user interacts with the buffer, we consider that the buffer has been accessed
+    # And navigation has ended
+    if new_pos != @pos
+      update_access_time
+      bufs.reset_navigation
+    end
     if new_pos >= self.size
       @pos = self.size - 1 # TODO:??right side of last char
     elsif new_pos >= 0
       @pos = new_pos
     end
+
     self.view.set_cursor_pos(pos)
-     # gui_set_cursor_pos(@id, @pos)
+    # gui_set_cursor_pos(@id, @pos)
     calculate_line_and_column_pos
 
     check_if_modified_outside

data/lib/vimamsa/buffer_list.rb

@@ -42,6 +42,7 @@ class BufferList
     vma.gui.set_current_buffer(vma.buf.id) #TODO: handle elswhere?
     # vma.buf.view.set_cursor_pos(vma.buf.pos)  #TODO: handle elswhere?
     update_last_dir(_buf)
+    vma.gui.file_panel_refresh
   end
 
   def add(_buf)
@@ -72,6 +73,13 @@ class BufferList
     end
   end
 
+  def print_by_access_time
+    slist.reverse.each_with_index do |b, i|
+      name = b.fname || "(untitled)"
+      puts "#{i + 1}. #{b.access_time.strftime('%H:%M:%S')} #{name}"
+    end
+  end
+
   def get_last_visited_id
     last_buf = nil
     for i in 0..(slist.size - 1)
@@ -143,7 +151,9 @@ class BufferList
 
     bu.set_active # TODO
     bu.update_access_time if update_history
+    reset_navigation if update_history
     vma.gui.set_current_buffer(idx)
+    vma.gui.file_panel_refresh
 
     #TODO: delete?
     # if !vma.buf.mode_stack.nil? and vma.kbd.get_scope != :editor #TODO
@@ -255,6 +265,8 @@ class BufferList
 
     @list.delete(@h[idx])
     @h.delete(idx)
+    gui_close_buffer(idx)
+    vma.gui.file_panel_refresh
 
     if auto_open
       @current_buf = get_last_non_active_buffer

data/lib/vimamsa/buffer_manager.rb

@@ -60,7 +60,7 @@ class BufferManager
     @@cur = self
     @header = []
     @header << "Current buffers:"
-    @header << "keys: <enter> to select, <c> to close buffer, <x> exit"
+    @header << "keys: <enter> (or <double click>) to select, <c> to close buffer, <x> exit"
     @header << "=" * 40
 
     s = ""

data/lib/vimamsa/conf.rb

@@ -13,7 +13,7 @@ $confh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
 # => $confh = {:foo=>{:bar=>{:baz=>3}}}
 def set(_id, val)
   a = $confh
-  id = _id.to_a
+  id = _id.to_a.dup
   last = id.pop
   for x in id
     a = a[x]
@@ -112,6 +112,8 @@ cnf.lsp.enabled = false
 cnf.fexp.experimental = false
 cnf.experimental = false
 
+cnf.kbd.show_prev_action = true
+
 cnf.tab.width = 2
 cnf.tab.to_spaces_default = false
 cnf.tab.to_spaces_languages = ["c", "java", "ruby", "hyperplaintext", "php"]

data/lib/vimamsa/diff_buffer.rb

@@ -0,0 +1,137 @@
+# Map a "line number in a unified diff output" to the corresponding
+# line number in the *new/changed file* (the + side).
+#
+# Key idea:
+#   @@ -old_start,old_count +new_start,new_count @@
+# sets starting counters. Then walk each hunk line:
+#   ' ' => old++, new++
+#   '-' => old++
+#   '+' => new++
+#
+# If the target diff line is:
+#   ' ' or '+' => it corresponds to current new line (before increment)
+#   '-'        => it has no new-file line (deleted). We return nil.
+#
+class DiffLineMapper
+  HUNK_RE = /^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@/
+
+  def initialize(diff_text)
+    @lines = diff_text.lines
+  end
+
+  # Given a 1-based line number in the diff output, return:
+  #   - Integer: 1-based line number in the new file
+  #   - nil:     if the diff line is a deletion ('-') or cannot be mapped
+  def new_line_for_diff_lineno(diff_lineno)
+    raise ArgumentError, "diff line number must be >= 1" if diff_lineno.to_i < 1
+    idx = diff_lineno.to_i - 1
+    return nil if idx >= @lines.length
+
+    old = nil
+    new_ = nil
+    in_hunk = false
+
+    @lines.each_with_index do |line, i|
+      if (m = line.match(HUNK_RE))
+        old = m[1].to_i
+        new_ = m[3].to_i
+        in_hunk = true
+        next
+      end
+
+      next unless in_hunk
+
+      if line.start_with?('--- ', '+++ ')
+        in_hunk = false
+        old = new_ = nil
+        next
+      end
+
+      if i == idx
+        return nil unless new_
+        case line.getbyte(0)
+        when '+'.ord then return new_
+        when ' '.ord then return new_
+        when '-'.ord then return nil
+        else              return nil
+        end
+      end
+
+      next unless old && new_
+
+      case line.getbyte(0)
+      when ' '.ord then old += 1; new_ += 1
+      when '-'.ord then old += 1
+      when '+'.ord then new_ += 1
+      end
+    end
+
+    nil
+  end
+end
+
+def diff_buffer_init()
+  return if @diff_buffer_init_done
+  @diff_buffer_init_done = true
+  vma.kbd.add_minor_mode("diffview", :diffview, :command)
+  bindkey "diffview enter", :diff_buffer_jump_to_source
+end
+
+def diff_buffer()
+  return if !if_cmd_exists("diff")
+  diff_buffer_init
+  orig_path = vma.buf.fname
+  infile = Tempfile.new("in")
+  infile.write(vma.buf.to_s)
+  infile.flush
+  bufstr = run_cmd("diff -uw '#{orig_path}' #{infile.path}")
+  infile.close; infile.unlink
+  create_new_file(nil, bufstr)
+  gui_set_file_lang(vma.buf.id, "diff")
+  vma.kbd.set_mode(:diffview)
+end
+
+def diff_buffer_jump_to_source()
+  mapper = DiffLineMapper.new(vma.buf.to_s)
+  cur_lpos = vma.buf.lpos + 1
+  to_line = mapper.new_line_for_diff_lineno(cur_lpos)
+
+  orig_path = nil
+  vma.buf.to_s.each_line do |l|
+    if l =~ /^--- (.+)/
+      path = $1.split("\t").first.strip
+      # git diff prefixes paths with "a/" — strip it and resolve from git root
+      if path.start_with?("a/")
+        git_root = `git rev-parse --show-toplevel 2>/dev/null`.strip
+        path = File.join(git_root, path[2..]) unless git_root.empty?
+      end
+      orig_path = path
+      break
+    end
+  end
+  if orig_path.nil? || !File.exist?(orig_path)
+    message("Could not find original file in diff")
+    return
+  end
+
+  jump_to_file(orig_path, to_line)
+  center_on_current_line
+end
+
+def git_diff_buffer()
+  return if !if_cmd_exists("git")
+  diff_buffer_init
+  fname = vma.buf.fname
+  if fname.nil?
+    message("Buffer has no file")
+    return
+  end
+  bufstr = run_cmd("git diff -w -- #{Shellwords.escape(fname)}")
+  if bufstr.strip.empty?
+    message("git diff: no changes")
+    return
+  end
+  create_new_file(nil, bufstr)
+  gui_set_file_lang(vma.buf.id, "diff")
+  vma.kbd.set_mode(:diffview)
+end