vimamsa 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eba5b3c9a7821e14802295825b32369ff9440046b91b065ca2b1e82e44cc444
-  data.tar.gz: 16bd4a94226c3b07cb5d40cb6e395a09f8fbbb4e96e164af19b05415048a9812
+  metadata.gz: b1c5be10ed2f57f72fe6aa73549680f6617b88149350b2afde434be82bfbe0a8
+  data.tar.gz: 941e4c0ddd0359306b91f1f8ebd3d3c91e156847e04c8ffd5ebd4ba7dbf27880
 SHA512:
-  metadata.gz: f74f902af54d82002d4b0d814e80cafc5326bfb712c0cd124c39be0bb2bf3f70d1eaabe6c2f05de619ee9e9ac4cf12a10a4350c568ca1b815129904b40797c48
-  data.tar.gz: a01c59f8358904e1ad511c4608de70bc31ac8bc8ccbbfa240eb897240a68f7673b7ae1bc124dcf312b94a6c7f12834d33dba692e6795713f083a5b2736ac6291
+  metadata.gz: b161ee9c95585324ee772fb6c28bd148d8846bde5aec0a70117af51895ca82f7e179968d1b7dd05269b24f8e4a78f7a61de09db48c75531e252e6a07bb412bbd
+  data.tar.gz: f5b553a83eef33c833ca5fc0ef01da4b3c5004f2c44df8d1298940d61dd28ddc8863828249568c88feac0d611538a533d90ee914a61e4ddf499538eacae228ef

data/.dockerignore

@@ -0,0 +1,32 @@
+# Let the container generate its own lockfile during bundle install
+Gemfile.lock
+
+# Compiled artifacts — rebuilt by bundle install
+*.gem
+*.o
+*.so
+ext/vmaext/Makefile
+ext/vmaext/mkmf.log
+
+# Autosave files
+*_vma_autosave
+
+# Reports and logs
+test_report.txt
+llm_report.txt
+lsp-log.txt
+
+# Bug/scratch notes
+bug*.txt
+*.txtf
+
+# Media
+*.mp3
+*.wav
+*.png
+
+# Performance traces
+perf*.svg
+perf.data*
+
+

data/Dockerfile

@@ -0,0 +1,45 @@
+# Vimamsa test container
+#
+# Runs the full test suite headlessly via xvfb.
+#
+# Build:  docker build -t vimamsa-test .
+# Run:    docker run --rm vimamsa-test
+#
+# Ruby version matches development environment (see Makefile in project root).
+
+FROM ruby:3.1-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    ruby-dev \
+    git \
+    pkg-config \
+    libgtk-4-dev \
+    libgtksourceview-5-dev \
+    libgstreamer1.0-dev \
+    libgstreamer-plugins-base1.0-dev \
+    libvte-2.91-gtk4-dev \
+    xvfb \
+    xauth \
+    libssl-dev
+
+WORKDIR /app
+
+# COPY .git/ .git/
+# COPY vimamsa.gemspec Gemfile ./
+# COPY lib/vimamsa/version.rb lib/vimamsa/
+# COPY ext/vmaext/ ext/vmaext/
+
+RUN gem install bundler -v '~> 2.4'
+
+RUN echo "alias ll='ls -ltrh'" >> ~/.bashrc
+ARG CACHE_BUST=1
+RUN git  clone https://github.com/SamiSieranoja/vimamsa.git && cd vimamsa && gem build vimamsa.gemspec  && gem install vimamsa-0.1.*.gem
+RUN cp /usr/local/bundle/gems/vimamsa-0.1.23/ext/vmaext/vmaext.so vimamsa/lib/ 
+
+WORKDIR /app/vimamsa
+CMD ["bash", "-c", "xvfb-run -a ruby run_tests.rb 2>&1"]
+
+

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 ..."
 
@@ -14,15 +14,8 @@
 # setcnf :tab_width, 4
 
 # Open this file every time the program starts
-# setcnf :startup_file, "~/Documents/startup.txt"
+cnf.startup_file = "~/Documents/startup.txt"
 
-# To enable LSP:
-# cnf.lsp.enabled = true
-# cnf.lsp.server.solargraph = { name: "solargraph", command: "solargraph stdio", type: "stdio" }
-# cnf.lsp.server.solargraph.languages = ["ruby"]
-
-# cnf.lsp.server.clangd = { name: "clangd", command: "clangd-12 --offset-encoding=utf-8", type: "stdio" }
-# cnf.lsp.server.clangd.languages = ["c", "cpp"]
 
 
 
@@ -32,6 +25,9 @@ def insert_date()
   vma.buf.insert_txt("#{DateTime.now().strftime("%Y-%m-%d")}\n")
 end
 
+bindkey "C , i d", proc { insert_date }
+
+
 def collect_c_header()
   # Matches e.g.:
   # static void funcname(parameters)
@@ -66,4 +62,37 @@ end
 # Find with action search ([C] , , s) 
 reg_act(:insert_lorem_ipsum, proc { insert_lorem_ipsum }, "Insert lorem ipsum")
 
+def open_mtg(urlpref = nil)
+  require "uri"
+  l = vma.buf.get_current_line.strip
+  m = l.match(/[^;!]+/)
+  if m
+    cardname = m[0].strip
+    # cardname = "Omnath, locus of mana"
+    u = URI.encode_www_form_component(cardname)
+    url = "https://gatherer.wizards.com/Pages/Card/Details.aspx?name=#{u}"
+    if !urlpref.nil?
+      url = urlpref + u
+    end
+    open_url(url)
+  end
+end
+
+# reg_act(:open_mtg, proc { open_mtg }, "open mtg card info")
+# bindkey "C , , m", :open_mtg
+# Restless Cottage
+# https://duckduckgo.com/?ia=web&origin=funnel_home_website&t=h_&q=
+
+# Primitive support for LSP (not well tested)
+# To enable LSP:
+# cnf.lsp.enabled = true
+# cnf.lsp.server.solargraph = { name: "solargraph", command: "solargraph stdio", type: "stdio" }
+# cnf.lsp.server.solargraph.languages = ["ruby"]
+
+# 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/docker_cmd.sh

@@ -0,0 +1,7 @@
+gem build vimamsa.gemspec 
+sudo gem install --local vimamsa-0.1.*.gem
+cp /usr/local/bundle/gems/vimamsa-0.1.23/ext/vmaext/vmaext.so .
+cp /usr/local/bundle/gems/vimamsa-0.1.23/ext/vmaext/vmaext.so lib/
+# xvfb-run -a bundle exec ruby exe/run_tests.rb --test tests/test_basic_editing.rb
+xvfb-run -a bundle exec ruby run_tests.rb
+

data/exe/run_tests.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+require "ripl/multi_line"
+require "tempfile"
+require "pathname"
+
+ENV["GTK_THEME"] = "Adwaita:light"
+
+selfpath = __FILE__
+selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
+scriptdir = File.expand_path(File.dirname(selfpath) + "/..")
+
+$LOAD_PATH.unshift(File.expand_path("lib"))
+$LOAD_PATH.unshift(File.expand_path("ext"))
+begin
+  gem_spec = Gem::Specification.find_by_name("vimamsa")
+  $LOAD_PATH.unshift(File.join(gem_spec.gem_dir, "ext", "vmaext")) if gem_spec
+rescue Gem::MissingSpecError
+end
+
+require "vimamsa"
+$vmag = VMAgui.new()
+$vmag.run
+

data/lib/vimamsa/actions.rb

@@ -10,6 +10,10 @@ class Action
   end
 end
 
+def unreg_act(id)
+  vma.actions.unregister(id)
+end
+
 def reg_act(id, callfunc, name = "", opt = {})
   if callfunc.class == Proc
     a = Action.new(id, name, callfunc, opt)
@@ -43,6 +47,10 @@ class ActionList
     @actions[id] = obj
   end
 
+  def unregister(id)
+    @actions.delete(id)
+  end
+
   def include?(act)
     return @actions.has_key?(act)
   end

data/lib/vimamsa/buffer.rb

@@ -5,10 +5,6 @@ require "pathname"
 require "openssl"
 require "ripl/multi_line"
 
-$buffer_history = []
-
-$update_highlight = false
-
 $ifuncon = false
 
 class Buffer < String
@@ -42,6 +38,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 +63,7 @@ class Buffer < String
     if cnf.lsp.enabled?
       init_lsp
     end
+    start_autosave_timer
     return self
   end
 
@@ -237,11 +236,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 +284,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,12 +336,15 @@ 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:)
     @crypt = crypt
     @encrypted_str = encrypted
     set_filename(filename)
+    gui_set_buffer_contents(@id, self.to_s)
   end
 
   def sanitycheck_btree()
@@ -376,7 +407,10 @@ class Buffer < String
     @need_redraw = 1
     @call_func = nil
     @deltas = []
-    @edit_history = []
+    @edit_history = []   # Array of groups: [[delta, ...], ...]
+    @current_group = []  # In-progress undo group
+    @last_delta_time = nil
+    @macro_group_active = false
     @redo_stack = []
     @edit_pos_history = []
     @edit_pos_history_i = 0
@@ -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,12 +520,16 @@ 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
     #highlight_c()
 
-    $update_highlight = true
     @update_highlight = true
 
     return delta
@@ -523,36 +562,39 @@ class Buffer < String
     end
   end
 
-  def undo()
-    debug @edit_history.inspect
-    return if !@edit_history.any?
-    last_delta = @edit_history.pop
-    @redo_stack << last_delta
-    debug last_delta.inspect
-    if last_delta[1] == DELETE
-      d = [last_delta[0], INSERT, 0, last_delta[3]]
-      run_delta(d)
-    elsif last_delta[1] == INSERT
-      d = [last_delta[0], DELETE, last_delta[3].size]
-      run_delta(d)
-    else
-      return #TODO: assert?
+  # Flush @current_group into @edit_history and start a new group.
+  # Called on mode changes, macro boundaries, and time threshold.
+  def new_undo_group
+    if @current_group.any?
+      @edit_history << @current_group
+      @current_group = []
     end
-    set_pos(last_delta[0])
-    #recalc_line_ends #TODO: optimize?
+  end
+
+  def apply_inverse_delta(d)
+    if d[1] == DELETE
+      run_delta([d[0], INSERT, 0, d[3]])
+    elsif d[1] == INSERT
+      run_delta([d[0], DELETE, d[3].size])
+    end
+  end
+
+  def undo()
+    new_undo_group  # flush any in-progress group first
+    return if @edit_history.empty?
+    group = @edit_history.pop
+    @redo_stack << group
+    group.reverse_each { |d| apply_inverse_delta(d) }
+    set_pos(group.first[0])
     calculate_line_and_column_pos
   end
 
   def redo()
-    return if !@redo_stack.any?
-    #last_delta = @edit_history[-1].pop
-    redo_delta = @redo_stack.pop
-    #printf("==== UNDO ====\n")
-    debug redo_delta.inspect
-    run_delta(redo_delta)
-    @edit_history << redo_delta
-    set_pos(redo_delta[0])
-    #recalc_line_ends #TODO: optimize?
+    return if @redo_stack.empty?
+    group = @redo_stack.pop
+    group.each { |d| run_delta(d) }
+    @edit_history << group
+    set_pos(group.last[0])
     calculate_line_and_column_pos
   end
 
@@ -1045,7 +1087,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
@@ -1086,6 +1135,9 @@ class Buffer < String
     elsif linep != nil
       wtype = :linepointer
       word = linep
+    elsif (bare_linep = resolve_bare_file_line_pointer(word))
+      wtype = :linepointer
+      word = bare_linep
     elsif m = word.match(/⟦help:(.*)⟧/)
       return [m[1], :help]
     else
@@ -1247,16 +1299,17 @@ class Buffer < String
   end
 
   def end_selection()
-    @selection_start = nil
+    # @selection_start = nil
     @selection_active = false
     @visual_mode = false
     #TODO: remove @visual_mode
+    # print(caller())
   end
 
   def start_selection()
     @selection_start = @pos
     @selection_active = true
-    @visual_mode = true
+    @visual_mode = true #TODO: change use of @visual_mode into @selection_active
   end
 
   # Start selection if not already started
@@ -1265,7 +1318,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
 
@@ -1392,10 +1445,6 @@ class Buffer < String
 
   def get_visual_mode_range2()
     r = get_visual_mode_range
-    if r.begin > r.end
-      debug "r.begin > r.end"
-      Ripl.start :binding => binding
-    end
     return [r.begin, r.end]
   end
 
@@ -1410,12 +1459,9 @@ class Buffer < String
   end
 
   def get_visual_mode_range()
-    _start = @selection_start
+    _start = @selection_start || @pos
     _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
 
@@ -1600,15 +1721,6 @@ class Buffer < String
   end
 end
 
-#TODO: function not used
-def write_to_file(savepath, s)
-  if is_path_writable(savepath)
-    IO.write(savepath, self.to_s)
-  else
-    message("PATH NOT WRITABLE: #{savepath}")
-  end
-end
-
 def is_path_writable(fpath)
   r = false
   if fpath.class == String