RubyGems - vimamsa - Versions diffs - 0.1.19 → 0.1.21 - Mend

vimamsa 0.1.19 → 0.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

checksums.yaml +4 -4
data/README.md +16 -1
data/custom_example.rb +1 -1
data/ext/vmaext/extconf.rb +5 -0
data/lib/vimamsa/ack.rb +7 -16
data/lib/vimamsa/buffer.rb +35 -5
data/lib/vimamsa/buffer_changetext.rb +3 -1
data/lib/vimamsa/buffer_list.rb +45 -11
data/lib/vimamsa/conf.rb +28 -60
data/lib/vimamsa/debug.rb +1 -1
data/lib/vimamsa/editor.rb +22 -26
data/lib/vimamsa/file_finder.rb +90 -13
data/lib/vimamsa/gui.rb +115 -154
data/lib/vimamsa/gui_dialog.rb +11 -8
data/lib/vimamsa/gui_form_generator.rb +6 -8
data/lib/vimamsa/gui_menu.rb +12 -10
data/lib/vimamsa/gui_select_window.rb +3 -1
data/lib/vimamsa/gui_sourceview.rb +63 -29
data/lib/vimamsa/key_actions.rb +18 -13
data/lib/vimamsa/key_binding_tree.rb +9 -10
data/lib/vimamsa/key_bindings_vimlike.rb +4 -3
data/lib/vimamsa/langservp.rb +1 -2
data/lib/vimamsa/macro.rb +3 -1
data/lib/vimamsa/tests.rb +81 -2
data/lib/vimamsa/text_transforms.rb +6 -1
data/lib/vimamsa/util.rb +19 -1
data/lib/vimamsa/version.rb +1 -1
data/lib/vimamsa.rb +3 -0
data/vimamsa.gemspec +4 -3
metadata +20 -7
data/.vma_project +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29e057a168e6c2152c0d8da4c6957b863bd44e7dd9328ba2d5520ae11ab49a2
-  data.tar.gz: 4cdad5268d59c11e83335818bbcdd5627fe3e75045ab2602f84fd0d7440c6d7d
+  metadata.gz: 4b44f279b048a7cd7baba9e21e70dc9666a251f9608466f9e4bd38094c486738
+  data.tar.gz: ef57b1ad00c480d30720ec8d272df38ec289640c7951b8a04a070837e43a261a
 SHA512:
-  metadata.gz: c9ac4b15042dd07cab99b7be0859e714684073ff4438b8048f33bd9c21779b545d61f1ff17608d1ab15fe2e31a356e2af24df6002d027621958776b42c568db8
-  data.tar.gz: afdf6cab6f002f925542831c7e439eace41b9fd4217e8f659d9774e2c7609309ba55e1d1042447d0c091437ab379ca76c0c6fb515c7a90a7720603f1bad68b89
+  metadata.gz: 756f7c861bff64427fac5e397f8e0b4d539f46dd9d72edf39ddbc190eefff09cb86c0107ec38664ee9a1c450c2de9912f6960aee7c990c8b99c4c914cf0f5a56
+  data.tar.gz: 15a6b06c01f13435a154a2b64c544e8d5b14f253bed3e4b65e845dc510f591fcd77c1e9c278d4cf7b67699205c97952ad6ab8042fffe222260d972b88db42bee

data/README.md CHANGED Viewed

@@ -1,7 +1,18 @@
 # Vimamsa
-Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK.
+Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK.
+<!-- toc -->
+- [Requirements](#requirements)
+- [Installation](#installation)
+  * [Other install options](#other-install-options)
+- [Run](#run)
+- [Screenshots](#screenshots)
+- [Key bindings](#key-bindings)
+- [Current limitations](#current-limitations)
+<!-- tocstop -->
 ## Requirements
  - Ruby 3.0+
@@ -144,6 +155,10 @@ For example, to bind ctrl-n to action "create new file":
 bindkey 'C ctrl-n',  'create_new_file()'
 ```
+## Known issues
+ - Cursor sometimes vanishes when dragging or resizing the window. At least some cases are fixed in new GTK4 versions ( >= 4.18, in Ubuntu Ubuntu 25.04). Workaround is to press ctrl key twice.
 ## Current limitations
  - UTF8 only
  - Line endings with "\n"

data/custom_example.rb CHANGED Viewed

@@ -4,6 +4,7 @@
 # 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)
 # bindkey "V , e", "vma.buf.convert_selected_text(:eval)"
 # syntax: bindkey "mode key1 key2 ..."
@@ -26,7 +27,6 @@
 def insert_date()
   # $buffer.insert_txt("#{DateTime.now().strftime("==========\n%Y-%m-%d")}\n")
   vma.buf.insert_txt("#{DateTime.now().strftime("%Y-%m-%d")}\n")

data/ext/vmaext/extconf.rb CHANGED Viewed

@@ -6,6 +6,11 @@ require 'mkmf'
 module_name = "vimamsa"
 extension_name = 'vmaext'
+# $CFLAGS << " -Wall -fpermissive "
+# $CXXFLAGS << " -Wall -fpermissive "
+# have_library( 'stdc++' );
 dir_config(extension_name)       # The destination
 create_makefile(extension_name)  # Create Makefile

data/lib/vimamsa/ack.rb CHANGED Viewed

@@ -4,21 +4,13 @@ class FileContentSearch
   def self.start_gui()
     search_paths = vma.get_content_search_paths.join("<br/>")
-    nfo = "<span size='x-large'>Search contents of text files</span>
-Will search all .txt files in the following directories:
-#{search_paths}
-<span>Hint: add empty file named .vma_project to directories you want to search in.
- If .vma_project exists in parent directory of current file, searches within that directory.
-  </span>"
     callback = proc { |x| FileContentSearch.search_buffer(x) }
     params = {}
     params["inputs"] = {}
     params["inputs"]["search"] = { :label => "Search:", :type => :entry }
     params["inputs"]["extensions"] = { :label => "Limit to file extensions:", :type => :entry }
-    params["inputs"]["extensions"][:initial_text] = conf(:default_search_extensions).join(",")
+    params["inputs"]["extensions"][:initial_text] = cnf.default_search_extensions!.join(",")
     params["inputs"]["btn1"] = { :label => "Search", :type => :button }
     params[:callback] = callback
@@ -92,17 +84,12 @@ end
 def gui_ack()
   search_paths = vma.get_content_search_paths.join("<br/>")
-  nfo = "<html><h2>Search contents of all files using ack</h2>
-  <div style='width:300px'>
-  <p>Hint: add empty file named .vma_project to dirs you want to search.</p>\n<p>If .vma_project exists in parent dir of current file, searches within that dir</p></div></html>"
   nfo = "<span size='x-large'>Search contents of all files using ack</span>
 Will search the following directories:
 #{search_paths}
-<span>Hint: add empty file named .vma_project to directories you want to search in.
- If .vma_project exists in parent directory of current file, searches within that directory.
-  </span>"
+<span>Note: Directory determined automatically as the first parent directory of a last accessed file which includes file/dir named .git or .vma_project. Or, if not found, the last accessed directory.
+</span>"
   callback = proc { |x| Ack.new.ack_buffer(x) }
   gui_one_input_action(nfo, "Search:", "search", callback)
@@ -151,6 +138,10 @@ class Ack
   end
   def ack_buffer(_instr, b = nil)
+    if _instr.nil? or _instr.strip.size <= 1
+      message("No input for ack")
+      return
+    end
     instr = Shellwords.escape(_instr)
     bufstr = ""
     for path in vma.get_content_search_paths

data/lib/vimamsa/buffer.rb CHANGED Viewed

@@ -41,6 +41,7 @@ class Buffer < String
     @module = nil
     @last_save = @last_asked_from_user = @file_last_cheked = Time.now
+    @t_modified = @last_save
     @crypt = nil
     @update_highlight = true
@@ -271,7 +272,7 @@ class Buffer < String
   def unindent
     debug("unindent", 2)
-    conf(:tab_width).times {
+    cnf.tab.width!.times {
       p = @pos - 1
       if p >= 0
         if self[p] == " "
@@ -754,7 +755,7 @@ class Buffer < String
   end
   def update_highlights(pos, changeamount, changestr)
-    return if !self.is_highlighted # $cnf[:syntax_highlight]
+    return if !self.is_highlighted
     lpos, cpos = get_line_and_col_pos(pos)
     if @highlights and @highlights[lpos]
       hl = @highlights[lpos]
@@ -1063,7 +1064,11 @@ class Buffer < String
     # message("Open link #{word}")
     linep = get_file_line_pointer(word)
     debug "linep'#{linep}'"
-    path = File.expand_path(word)
+    if word[0] != "/" and word[0] != "~"
+      path = File.expand_path("#{bufs.last_dir}/#{word}")
+    else
+      path = File.expand_path(word)
+    end
     wtype = nil
     if is_url(word)
       wtype = :url
@@ -1089,7 +1094,7 @@ class Buffer < String
         return [fn, :hpt_link]
       end
     end
     return [word, wtype]
   end
@@ -1158,7 +1163,7 @@ class Buffer < String
     c = c.force_encoding("UTF-8");  #TODO:correct?
     c = "\n" if c == "\r"
-    if $cnf[:indent_based_on_last_line] and c == "\n" and @lpos > 0
+    if cnf.indent_based_on_last_line? and c == "\n" and @lpos > 0
       # Indent start of new line based on last line
       last_line = line(@lpos)
       m = /^( +)([^ ]+|$)/.match(last_line)
@@ -1291,6 +1296,16 @@ class Buffer < String
     end_visual_mode
   end
+  def eval_whole_buf(x = 888)
+    s = self.to_s
+    begin
+      eval(s)
+    rescue Exception
+      message("Error running eval")
+    else
+    end
+  end
   def convert_selected_text(converter_id)
     return if !@visual_mode
     r = get_visual_mode_range
@@ -1499,6 +1514,7 @@ class Buffer < String
         #TODO: show message box
       end
       @last_save = Time.now
+      refresh_title
       debug "file saved on #{@last_save}"
       sleep 3
     }
@@ -1511,6 +1527,20 @@ class Buffer < String
     end
   end
+  def unsaved_changes?
+    pp [@t_modified, @last_save]
+    return true if @t_modified > @last_save
+    return false
+  end
+  def refresh_title
+    if vma.buf == self
+      pfx = ""
+      pfx = "+ " if vma.buf.unsaved_changes?
+      gui_set_window_title(pfx + vma.buf.title, vma.buf.subtitle)
+    end
+  end
   def check_if_modified_outside
     # Don't check if less than 8 seconds since last checked
     return false if @fname.nil?

data/lib/vimamsa/buffer_changetext.rb CHANGED Viewed

@@ -5,6 +5,7 @@ class Buffer < String
   #TODO: change to apply=true as default
   def add_delta(delta, apply = false, auto_update_cpos = false)
+    @t_modified = Time.now
     return if !is_delta_ok(delta)
     if delta[1] == DELETE
       return if delta[0] >= self.size
@@ -26,6 +27,7 @@ class Buffer < String
       add_delta([self.size, INSERT, 1, "\n"], true)
     end
     reset_larger_cpos #TODO: correct here?
+    refresh_title
   end
   # TODO: rename ot auto-format. separate module?
@@ -264,7 +266,7 @@ class Buffer < String
     convert = cnf.tab.to_spaces_default?
     convert = true if cnf.tab.to_spaces_languages?.include?(@lang)
     convert = false if cnf.tab.to_spaces_not_languages?.include?(@lang)
-    tw = conf(:tab_width)
+    tw = cnf.tab.width!
     if convert
       indent_to = (@cpos / tw) * tw + tw
       indentdiff = indent_to - @cpos

data/lib/vimamsa/buffer_list.rb CHANGED Viewed

@@ -65,7 +65,7 @@ class BufferList
     # TODO: implement using heap/priorityque
     @list.sort_by! { |x| x.access_time }
   end
   def each(&block)
     for x in slist
       block.call(x)
@@ -154,7 +154,7 @@ class BufferList
     # end
     # vma.kbd.set_mode_to_default if vma.kbd.get_scope != :editor
-    gui_set_window_title(vma.buf.title, vma.buf.subtitle)
+    vma.buf.refresh_title
     if vma.buf.fname
       @last_dir = File.dirname(vma.buf.fname)
@@ -187,21 +187,55 @@ class BufferList
     @navigation_idx = 0
   end
-  def history_switch_backwards
-    @navigation_idx += 1
+  def history_switch(dir = -1)
+    # -1: from newest towards oldest
+    # +1: from oldest towards newest
+    @navigation_idx += dir * -1
     @navigation_idx = 0 if @navigation_idx >= list.size
+    @navigation_idx = list.size - 1 if @navigation_idx < 0
+    # most recent is at end of slist
     b = slist[-1 - @navigation_idx]
-    debug "IND:#{@navigation_idx} RECENT:#{slist.collect { |x| x.fname }.join(" ")}"
+    puts "@navigation_idx=#{@navigation_idx}"
+    non_active =  slist.select{|x|!x.is_active?}
+    return if non_active.size == 0
+    # Take another one from the history if buffer is already open in a window (active)
+    navtmp = @navigation_idx
+    i = 1
+    while b.is_active?
+      pp "b.is_active b=#{b.id}"
+      navtmp += dir * -1
+      b = slist[-1 - navtmp]
+      if b.nil? # went past the beginning or end of array slist
+        # Start from the end
+        if navtmp != 0 and dir == -1 # did not already start from the end
+          navtmp = 0
+          i = 0
+          b = slist[-1 - navtmp]
+        elsif navtmp == list.size and dir == 1
+          navtmp = list.size
+          i = 0
+          b = slist[-1 - navtmp]
+        else
+          return # No buffer exists which is not active already
+        end
+      end
+      i += 1
+    end
+    @navigation_idx = navtmp
+    pp "IND:#{@navigation_idx} RECENT:#{slist.collect { |x| x.fname }.join("\n")}"
     set_current_buffer(b.id, false)
   end
-  def history_switch_forwards()
-    @navigation_idx -= 1
-    @navigation_idx = list.size - 1 if @navigation_idx < 0
+  def history_switch_backwards()
+    history_switch(-1)
+  end
-    b = slist[-1 - @navigation_idx]
-    debug "IND:#{@navigation_idx} RECENT:#{slist.collect { |x| x.fname }.join(" ")}"
-    set_current_buffer(b.id, false)
+  def history_switch_forwards()
+    history_switch(+1)
   end
   def get_last_non_active_buffer

data/lib/vimamsa/conf.rb CHANGED Viewed

@@ -1,43 +1,36 @@
-$cnf = {} # TODO
-def conf(id)
-  return $cnf[id]
-end
-def set_conf(id, val)
-  $cnf[id] = val
-end
-def setcnf(id, val)
-  set_conf(id, val)
-end
-setcnf :custom_lsp, {}
-setcnf :indent_based_on_last_line, true
-setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js", ".py"]
-setcnf :default_search_extensions, ["txt", "rb"]
-setcnf "log.verbose", 1
-setcnf :enable_lsp, false
-setcnf :tab_width, 2
-setcnf :tab_to_spaces_default, false
-setcnf :tab_to_spaces_languages, ["c", "java", "ruby", "hyperplaintext", "php"]
-setcnf :tab_to_spaces_not_languages, ["makefile"]
-setcnf :workspace_folders, []
-# New way to configure:
-# To set conf value:
+# Set conf value by:
 #   cnf.foo.bar.baz = 3
-#To get conf value:
+# Get conf value by:
 # cnf.foo.bar.baz?
 # cnf.foo.bar.baz!
 # get(cnf.foo.bar.baz)
-# (All get the same result)
+# (All ways get the same result)
+$confh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
+# set cnf.foo.bar.baz, 3
+# => $confh = {:foo=>{:bar=>{:baz=>3}}}
+def set(_id, val)
+  a = $confh
+  id = _id.to_a
+  last = id.pop
+  for x in id
+    a = a[x]
+  end
+  a[last] = val
+end
+def get(id)
+  id = id.to_a
+  a = $confh
+  for x in id
+    return nil if a[x].nil?
+    return nil if a.empty?
+    a = a[x]
+  end
+  return a
+end
 class ConfId
   def initialize(first)
@@ -104,32 +97,6 @@ class Conf
   end
 end
-$confh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
-# set cnf.foo.bar.baz, 3
-# => $confh = {:foo=>{:bar=>{:baz=>3}}}
-def set(_id, val)
-  a = $confh
-  id = _id.to_a
-  last = id.pop
-  for x in id
-    a = a[x]
-  end
-  a[last] = val
-end
-def get(id)
-  id = id.to_a
-  a = $confh
-  for x in id
-    return nil if a[x].nil?
-    return nil if a.empty?
-    a = a[x]
-  end
-  return a
-end
 $vimamsa_conf = Conf.new
 def cnf()
@@ -158,6 +125,7 @@ cnf.lsp.enabled = false
 cnf.font.size = 11
 cnf.font.family = "Monospace"
+cnf.startup_file=false
 cnf.macro.animation_delay = 0.02

data/lib/vimamsa/debug.rb CHANGED Viewed

@@ -63,7 +63,7 @@ def savedebug(message, e)
   dbginfo["trace"] = e.backtrace() if e
   dbginfo["trace_str"] = dbginfo["trace"].join("\n")
   dbginfo["edit_history"] = buf.edit_history
-  dbginfo["cnf"] = $cnf
+  dbginfo["cnf"] = $vimamsa_conf
   dbginfo["register"] = vma.register
   dbginfo["clipboard"] = vma.clipboard
   # dbginfo["last_event"] = $last_event

data/lib/vimamsa/editor.rb CHANGED Viewed

@@ -91,37 +91,29 @@ class Editor
     @gui.init_menu
-    mkdir_if_not_exists("~/.config/vimamsa")
-    mkdir_if_not_exists("~/.config/vimamsa/backup")
-    mkdir_if_not_exists("~/.config/vimamsa/listen")
-    listen_dir = File.expand_path "~/.config/vimamsa/listen"
+    mkdir_if_not_exists(get_dot_path(""))
+    mkdir_if_not_exists(get_dot_path("backup"))
+    mkdir_if_not_exists(get_dot_path("testfoobar")) #TODO
+    listen_dir = get_dot_path("listen")
+    mkdir_if_not_exists(listen_dir)
     listener = Listen.to(listen_dir) do |modified, added, removed|
       debug([modified: modified, added: added, removed: removed])
       open_file_listener(added)
     end
     listener.start
-    custom_fn = File.expand_path("~/.config/vimamsa/custom.rb")
+    custom_fn = get_dot_path("custom.rb")
     if !File.exist?(custom_fn)
       example_custom = IO.read(ppath("custom_example.rb"))
       IO.write(custom_fn, example_custom)
     end
-    mkdir_if_not_exists("~/.config/vimamsa/custom.rb")
-    $cnf[:theme] = "Twilight_edit"
-    $cnf[:syntax_highlight] = true
     settings_path = get_dot_path("settings.rb")
     if File.exist?(settings_path)
-      $cnf = eval(IO.read(settings_path))
+      #  = eval(IO.read(settings_path))
+      #TODO
     end
-    # set_gui_style(1)
-    #TODO: remove
-    dotfile = read_file("", "~/.config/vimamsarc")
-    eval(dotfile) if dotfile
     custom_script = read_file("", custom_fn)
     eval(custom_script) if custom_script
@@ -137,18 +129,17 @@ class Editor
       require "vimamsa/langservp"
       @langsrv["ruby"] = LangSrv.new("ruby")
       @langsrv["cpp"] = LangSrv.new("cpp")
+      #TODO: if language enabled in config?
     end
-    # build_options
     fname = nil
-    if conf(:startup_file)
-      fname_ = File.expand_path(conf(:startup_file))
+    if cnf.startup_file?
+      fname_ = File.expand_path(cnf.startup_file!)
       if File.exist?(fname_)
         fname = fname_
       end
     else
-      fname = ppath("demo.txt")
+      # fname = ppath("demo.txt")
     end
     fname = ARGV[0] if ARGV.size >= 1 and File.file?(File.expand_path(ARGV[0]))
     # vma.add_content_search_path(Dir.pwd)
@@ -275,7 +266,7 @@ class Editor
   end
   def can_open_extension?(filepath)
-    exts = $cnf[:extensions_to_open]
+    exts = cnf.extensions_to_open!
     extname = Pathname.new(filepath).extname.downcase
     can_open = exts.include?(extname)
     debug "CAN OPEN?: #{can_open}"
@@ -645,11 +636,16 @@ def find_project_dir_of_fn(fn)
   parent_dirs = (0..(pcomp.size - 2)).collect { |x| "/" + pcomp[0..x].join("/") }.reverse
   projdir = nil
   for pdir in parent_dirs
-    candfn = "#{pdir}/.vma_project"
-    if File.exist?(candfn)
-      projdir = pdir
-      break
+    candfns = []
+    candfns << "#{pdir}/.vma_project"
+    candfns << "#{pdir}/.git"
+    for candfn in candfns
+      if File.exist?(candfn)
+        projdir = pdir
+        break
+      end
     end
+    return projdir if !projdir.nil?
   end
   return projdir
 end