vimamsa 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cde9df6e9ba0c6ac7bdbc894726e0fe0941ab50867abfdc150314e2d3a2c3de
-  data.tar.gz: b2ca3e49f7b7da7f3f135b12780dc5b2e34e90d5d90bf35ec56ac8efa5f46600
+  metadata.gz: b1c5be10ed2f57f72fe6aa73549680f6617b88149350b2afde434be82bfbe0a8
+  data.tar.gz: 941e4c0ddd0359306b91f1f8ebd3d3c91e156847e04c8ffd5ebd4ba7dbf27880
 SHA512:
-  metadata.gz: 25de014aaef8785f1e169f9afe8242143ff5e70d1c3a71d13aa6556188161d361a7c9248d00f8a530550e488c1dabea4104461011bcb17f135c157e6d9c229e6
-  data.tar.gz: 87023b352b98dcceb2e2d388cfe18409bb899522629357bdd62dcb62856738ce5af4f3f5ae4091bac399f251ea4848f524318127e8ad7aa05d8bd49a437b7d48
+  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/custom_example.rb

@@ -14,19 +14,9 @@
 # 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"]
-
-# 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
 
 
 
@@ -35,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)
@@ -69,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
@@ -348,6 +344,7 @@ class Buffer < String
     @crypt = crypt
     @encrypted_str = encrypted
     set_filename(filename)
+    gui_set_buffer_contents(@id, self.to_s)
   end
 
   def sanitycheck_btree()
@@ -410,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
@@ -530,7 +530,6 @@ class Buffer < String
     # sanity_check_line_ends #TODO: enable with debug mode
     #highlight_c()
 
-    $update_highlight = true
     @update_highlight = true
 
     return delta
@@ -563,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
 
@@ -1133,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
@@ -1294,7 +1299,6 @@ class Buffer < String
   end
 
   def end_selection()
-    puts("END SELECTION")
     # @selection_start = nil
     @selection_active = false
     @visual_mode = false
@@ -1305,7 +1309,7 @@ class Buffer < String
   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
@@ -1441,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"
-      require "pry";binding.pry
-    end
     return [r.begin, r.end]
   end
 
@@ -1459,7 +1459,7 @@ 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
     return _start..(_end)
@@ -1721,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

data/lib/vimamsa/buffer_changetext.rb

@@ -22,7 +22,14 @@ class Buffer < String
     else
       @deltas << delta
     end
-    @edit_history << delta
+
+    unless @macro_group_active
+      if @last_delta_time && (Time.now - @last_delta_time) > cnf.undo.group_threshold!
+        new_undo_group
+      end
+    end
+    @current_group << delta
+    @last_delta_time = Time.now
     if self[-1] != "\n"
       add_delta([self.size, INSERT, 1, "\n"], true)
     end
@@ -81,18 +88,18 @@ class Buffer < String
     @clipboard_paste_running = true
     Thread.new {
       text = `xclip -selection c -o`
-      paste_finish(text, at, register)
+      GLib::Idle.add { paste_finish(text, at, register); false }
     }
     return nil
   end
 
   # Start asynchronous read of system clipboard
-  def paste_start(at, register)
+  def paste_start(at, register, overwrite: false)
     @clipboard_paste_running = true
 
-    if true or running_wayland? and !GLib::Version::or_later?(2, 79, 0)
-      return paste_start_xclip(at, register)
-    end
+    # 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|
@@ -101,13 +108,13 @@ class Buffer < String
       rescue Gio::IOError::NotSupported
         debug Gio::IOError::NotSupported
       else
-        paste_finish(text, at, register)
+        paste_finish(text, at, register, overwrite: overwrite)
       end
     end
     return nil
   end
 
-  def paste_finish(text, at, register)
+  def paste_finish(text, at, register, overwrite: false)
     debug "PASTE: #{text}"
 
     # If we did not put this text to clipboard
@@ -121,9 +128,25 @@ class Buffer < String
 
     return if text == ""
 
-    if @paste_lines
+    cursor_at_start = cnf.paste.cursor_at_start!
+
+    if overwrite && !@paste_lines
+      # Delete as many chars forward as we are about to insert, stopping before newline
+      line_end = current_line_range.last - 1  # position of last char before \n
+      n = [text.size, [line_end - @pos + 1, 0].max].min
+      add_delta([@pos, DELETE, n], true) if n > 0
+      insert_txt_at(text, @pos)
+      set_pos(cursor_at_start ? @pos : @pos + text.size - 1)
+    elsif @paste_lines
       debug "PASTE LINES"
-      put_to_new_next_line(text)
+      if at == BEFORE
+        l = current_line_range()
+        insert_txt_at(text, l.begin)
+        set_pos(l.begin)
+      else
+        put_to_new_next_line(text)
+        set_pos(@pos) if cursor_at_start
+      end
     else
       debug "PASTE !LINES"
       if at_end_of_buffer? or at_end_of_line? or at == BEFORE
@@ -132,13 +155,23 @@ class Buffer < String
         pos = @pos + 1
       end
       insert_txt_at(text, pos)
-      set_pos(pos + text.size)
+      set_pos(cursor_at_start ? pos : pos + text.size)
     end
     set_pos(@pos)
     vma.buf.view.after_action # redraw
     @clipboard_paste_running = false
   end
 
+  def paste_over(at = AFTER, register = nil)
+    if vma.macro.running_macro
+      text = vma.clipboard.get()
+      paste_finish(text, at, register, overwrite: true)
+    else
+      paste_start(at, register, overwrite: true)
+    end
+    return true
+  end
+
   def paste(at = AFTER, register = nil)
     # Macro's don't work with asynchronous call using GTK
     # TODO: implement as synchronous?
@@ -206,7 +239,11 @@ class Buffer < String
       (startpos, endpos) = get_visual_mode_range2
       delete_range(startpos, endpos, x)
       @pos = [@pos, @selection_start].min
-      end_visual_mode
+      if vma.kbd.get_mode == :visual
+        end_visual_mode
+      else
+        end_selection
+      end
       #return
 
       # Delete current char

data/lib/vimamsa/buffer_list.rb

@@ -20,12 +20,11 @@ def load_buffer_list()
 end
 
 class BufferList
-  attr_reader :current_buf, :last_dir, :last_file, :buffer_history
+  attr_reader :current_buf, :last_dir, :last_file
   attr_accessor :list
 
   def initialize()
     @last_dir = File.expand_path(".")
-    @buffer_history = []
     super
     @current_buf = 0
     @list = []
@@ -46,22 +45,10 @@ class BufferList
   end
 
   def add(_buf)
-    @buffer_history << _buf.id
-    # @navigation_idx = _buf.id #TODO:??
     @list << _buf
     @h[_buf.id] = _buf
   end
 
-  #NOTE: unused. enable?
-  # def switch()
-  # debug "SWITCH BUF. bufsize:#{self.size}, curbuf: #{@current_buf}"
-  # @current_buf += 1
-  # @current_buf = 0 if @current_buf >= self.size
-  # m = method("switch")
-  # set_last_command({ method: m, params: [] })
-  # set_current_buffer(@current_buf)
-  # end
-
   def slist
     # TODO: implement using heap/priorityque
     @list.sort_by! { |x| x.access_time }
@@ -91,9 +78,6 @@ class BufferList
 
   def switch_to_last_buf()
     debug "SWITCH TO LAST BUF:"
-    # debug @buffer_history
-    # last_buf = @buffer_history[-2]
-
     last_buf = slist[-2]
     if !last_buf.nil?
       set_current_buffer(last_buf.id)
@@ -115,17 +99,6 @@ class BufferList
     return @h[id]
   end
 
-  def add_buf_to_history(buf_idx)
-    if @list.include?(buf_idx)
-      @buffer_history << @buf_idx
-      @navigation_idx = 0
-      # compact_buf_history()
-    else
-      debug "buffer_list, no such id:#{buf_idx}"
-      return
-    end
-  end
-
   def add_current_buf_to_history()
     @h[@current_buf].update_access_time
   end
@@ -154,6 +127,7 @@ class BufferList
     reset_navigation if update_history
     vma.gui.set_current_buffer(idx)
     vma.gui.file_panel_refresh
+    vma.gui.func_panel_refresh
 
     #TODO: delete?
     # if !vma.buf.mode_stack.nil? and vma.kbd.get_scope != :editor #TODO

data/lib/vimamsa/conf.rb

@@ -103,6 +103,28 @@ def cnf()
   return $vimamsa_conf
 end
 
+# Read a config value by key path array.
+# Uses the cnf accessor chain so key types match cnf.xxx! reads.
+# Example:
+#   cnf_get([:tab, :width])   # => 2
+#   cnf_get([:style_scheme])  # => "molokai_edit"
+def cnf_get(key)
+  obj = cnf
+  key[0..-2].each { |k| obj = obj.public_send(k) }
+  obj.public_send(:"#{key.last}!")
+end
+
+# Write a config value by key path array.
+# Uses the cnf accessor chain so the value is readable via cnf.xxx!
+# Example:
+#   cnf_set([:tab, :width], 4)
+#   cnf_set([:style_scheme], "soviet_cockpit")
+def cnf_set(key, val)
+  obj = cnf
+  key[0..-2].each { |k| obj = obj.public_send(k) }
+  obj.public_send(:"#{key.last}=", val)
+end
+
 cnf.indent_based_on_last_line = true
 cnf.extensions_to_open = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js", ".py"]
 cnf.default_search_extensions = ["txt", "rb"]
@@ -131,4 +153,12 @@ cnf.startup_file=false
 
 cnf.macro.animation_delay = 0.02
 
+cnf.undo.group_threshold = 1.8 # seconds of inactivity before starting a new undo group
+
+cnf.paste.cursor_at_start = false
+
+cnf.style_scheme = "molokai_edit"
+cnf.color_contrast = 1.0
+cnf.color_brightness = 0.0
+