vimamsa 0.1.9 → 0.1.11

data/lib/vimamsa/buffer_list.rb

@@ -3,7 +3,7 @@ def save_buffer_list()
   message("Save buffer list")
   buffn = get_dot_path("buffers.txt")
   f = File.open(buffn, "w")
-  bufstr = $buffers.collect { |buf| buf.fname }.inspect
+  bufstr = vma.buffers.collect { |buf| buf.fname }.inspect
   f.write(bufstr)
   f.close()
 end
@@ -21,18 +21,31 @@ def load_buffer_list()
 end
 
 class BufferList < Array
-  attr_reader :current_buf
+  attr_reader :current_buf, :last_dir, :buffer_history
 
+  def initialize()
+    @last_dir = File.expand_path(".")
+    @buffer_history = []
+    super
+    @current_buf=0
+  end
 
+  # lastdir = File.expand_path(".") if lastdir.nil?
   def <<(_buf)
     super
-    $buffer = _buf
+    vma.buf = _buf
     @current_buf = self.size - 1
-    $buffer_history << @current_buf
+    @buffer_history << @current_buf
     @recent_ind = 0
-    $hook.call(:change_buffer, $buffer)
-    gui_set_current_buffer($buffer.id)
-    gui_set_cursor_pos($buffer.id, $buffer.pos)
+    $hook.call(:change_buffer, vma.buf)
+    vma.gui.set_current_buffer(vma.buf.id)
+    gui_set_cursor_pos(vma.buf.id, vma.buf.pos)
+    update_last_dir(_buf)
+  end
+
+  def add(_buf)
+    self.append(_buf)
+    @buffer_history << self.size - 1
   end
 
   def switch()
@@ -44,10 +57,15 @@ class BufferList < Array
     set_current_buffer(@current_buf)
   end
 
+  def get_last_visited_id
+    last_buf = @buffer_history[-2]
+    return self[last_buf].id
+  end
+
   def switch_to_last_buf()
     debug "SWITCH TO LAST BUF:"
-    debug $buffer_history
-    last_buf = $buffer_history[-2]
+    debug @buffer_history
+    last_buf = @buffer_history[-2]
     if last_buf
       set_current_buffer(last_buf)
     end
@@ -58,27 +76,46 @@ class BufferList < Array
     buf_idx = self.index { |b| b.fname == fname }
     return buf_idx
   end
-  
-   def get_buffer_by_id(id)
+
+  def get_buffer_by_id(id)
     buf_idx = self.index { |b| b.id == id }
     return buf_idx
   end
- 
+
+  def add_buf_to_history(buf_idx)
+    if self.include?(buf_idx)
+      @buffer_history << @buf_idx
+      @recent_ind = 0
+      compact_buf_history()
+    else
+      debug "buffer_list, no such id:#{buf_idx}"
+      return
+    end
+  end
 
   def add_current_buf_to_history()
     @recent_ind = 0
-    $buffer_history << @current_buf
+    @buffer_history << @current_buf
     compact_buf_history()
   end
 
+  def set_current_buffer_by_id(buf_id, update_history = true)
+    idx = get_buffer_by_id(buf_id)
+    if idx.nil?
+      debug "IDX=nil"
+      return
+    end
+    set_current_buffer(idx, update_history)
+  end
+
   def set_current_buffer(buffer_i, update_history = true)
     buffer_i = self.size -1 if buffer_i > self.size
     buffer_i = 0 if buffer_i < 0
-    $buffer = self[buffer_i]
-    return if !$buffer
+    vma.buf = self[buffer_i]
+    return if !vma.buf
     @current_buf = buffer_i
     debug "SWITCH BUF2. bufsize:#{self.size}, curbuf: #{@current_buf}"
-    fpath = $buffer.fname
+    fpath = vma.buf.fname
     if fpath and fpath.size > 50
       fpath = fpath[-50..-1]
     end
@@ -87,36 +124,37 @@ class BufferList < Array
       add_current_buf_to_history
     end
 
-    $hook.call(:change_buffer, $buffer)
-    $buffer.set_active
+    vma.hook.call(:change_buffer, vma.buf)
+    vma.buf.set_active
+
+    vma.gui.set_current_buffer(vma.buf.id)
 
-    gui_set_current_buffer($buffer.id)
-    gui_set_window_title($buffer.title,$buffer.subtitle)   
+    gui_set_window_title(vma.buf.title, vma.buf.subtitle)
+
+    if vma.buf.fname
+      @last_dir = File.dirname(vma.buf.fname)
+    end
 
     # hpt_scan_images() if $debug # experimental
   end
 
-  def get_last_dir
-    lastdir = nil
-    if $buffer.fname
-      lastdir = File.dirname($buffer.fname)
-    else
-      for bufid in $buffer_history.reverse[1..-1]
-        bf = $buffers[bufid]
-        debug "FNAME:#{bf.fname}"
-        if bf.fname
-          lastdir = File.dirname(bf.fname)
-          break
-        end
-      end
+  def update_last_dir(buf)
+    if buf.fname
+      @last_dir = File.dirname(buf.fname)
     end
-    lastdir = File.expand_path(".") if lastdir.nil?
-    return lastdir
+  end
+
+  def last_dir=(d)
+    @last_dir = d
+  end
+
+  def get_last_dir
+    return @last_dir
   end
 
   def get_recent_buffers()
     bufs = []; b = {}
-    $buffer_history.reverse.each { |x| bufs << x if !b[x] && x < self.size; b[x] = true }
+    @buffer_history.reverse.each { |x| bufs << x if !b[x] && x < self.size; b[x] = true }
     return bufs
   end
 
@@ -141,30 +179,27 @@ class BufferList < Array
   def compact_buf_history()
     h = {}
     # Keep only first occurence in history
-    bh = $buffer_history.reverse.select { |x| r = h[x] == nil; h[x] = true; r }
-    $buffer_history = bh.reverse
+    bh = @buffer_history.reverse.select { |x| r = h[x] == nil; h[x] = true; r }
+    @buffer_history = bh.reverse
   end
 
-
   # Close buffer in the background
   # TODO: if open in another widget
   def close_other_buffer(buffer_i)
     return if self.size <= buffer_i
     return if @current_buf == buffer_i
-    
+
     bufname = self[buffer_i].basename
     message("Closed buffer #{bufname}")
 
     self.slice!(buffer_i)
-    $buffer_history = $buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
-
+    @buffer_history = @buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
   end
 
-
   def close_buffer(buffer_i, from_recent = false)
     return if buffer_i.nil?
     return if self.size <= buffer_i
-    
+
     bufname = self[buffer_i].basename
     message("Closed buffer #{bufname}")
     recent = get_recent_buffers
@@ -172,17 +207,17 @@ class BufferList < Array
     jump_to_buf = 0 if jump_to_buf == nil
 
     self.slice!(buffer_i)
-    $buffer_history = $buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
+    @buffer_history = @buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
 
     if @current_buf == buffer_i
       if from_recent
         @current_buf = jump_to_buf
       else
-        @current_buf = $buffer_history.last
+      	# Find last edited buffer that is not already open
+        @current_buf = @buffer_history.filter{|x| !vma.gui.is_buffer_open(self[x].id)}.last
       end
     end
-    # Ripl.start :binding => binding
-    if self.size == 0
+    if self.size == 0 or @current_buf.nil?
       self << Buffer.new("\n")
       @current_buf = 0
     else

data/lib/vimamsa/buffer_manager.rb

@@ -43,8 +43,11 @@ class BufferManager
     buf_i = buf_of_current_line()
     return if buf_i.nil?
 
-    vma.buffers.close_current_buffer()
+    # vma.buffers.close_current_buffer() #TODO:??
     vma.buffers.set_current_buffer(buf_i)
+
+    bid = vma.buffers.get_buffer_by_id(@buf.id)
+    vma.buffers.close_other_buffer(bid)
     @@cur = nil
   end
 
@@ -64,20 +67,33 @@ class BufferManager
     s << @header.join("\n")
     s << "\n"
     i = 0
+    jump_to_line = 0
     for b in vma.buffers.sort_by { |x| x.list_str }
+      if b.id == vma.buf.id # current file
+        # s << "   "
+        jump_to_line = i
+      end
       x = b.list_str
       s << "#{x}\n"
       @line_to_id[i] = b.id
       i += 1
     end
 
+
+
     if @buf.nil?
-      @buf = create_new_file(nil, s)
+      @buf = create_new_buffer(s,"bufmgr")
       @buf.module = self
       @buf.active_kbd_mode = :buf_mgr
     else
       @buf.set_content(s)
     end
-    @buf.set_line_and_column_pos(@header.size, 0)
+    # Position on the line of the active buffer
+    # @buf.set_content(s)
+    newlpos = @header.size + jump_to_line
+
+    @buf.set_line_and_column_pos(newlpos, 0)
+
+    # Thread.new{sleep 0.1; center_on_current_line()} # TODO
   end
 end

data/lib/vimamsa/conf.rb

@@ -12,10 +12,19 @@ def setcnf(id, val)
   set_conf(id, val)
 end
 
+setcnf :custom_lsp, {}
+conf(:custom_lsp)[:ruby] = {name: "solargraph", command:"solargraph stdio", type: "stdio"}
+conf(:custom_lsp)[:cpp] = {name: "clangd", command:"clangd-12 --offset-encoding=utf-8", type: "stdio"}
+conf(:custom_lsp)[:python] = {name: "pyright", command:"pyright-langserver --stdio --verbose", type: "stdio"}
+
 setcnf :indent_based_on_last_line, true
-setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
+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 :tab_width, 4
+setcnf :enable_lsp, false
+
+setcnf :workspace_folders, []
 

data/lib/vimamsa/debug.rb

@@ -1,7 +1,12 @@
 require "fileutils"
 
-def debug(message)
+def debug(message, severity = 1)
   if $debug
+    if severity > 1
+      # Add red colour and bold for attention
+      # https://en.wikipedia.org/wiki/ANSI_escape_code
+      message = "\033[1;31m!!! \033[0m#{message}"
+    end
     puts "[#{DateTime.now().strftime("%H:%M:%S")}] #{message}"
     $stdout.flush
   end
@@ -22,7 +27,7 @@ end
 
 $log_messages = []
 
-def log_message(message,vlevel=1)
+def log_message(message, vlevel = 1)
   puts message if conf("log.verbose") >= vlevel
   $log_messages << message
 end
@@ -81,19 +86,19 @@ end
 
 def run_test(test_id)
   target_results = read_file("", "tests/test_#{test_id}_output.txt")
-  old_buffer = $buffer
-  $buffer = Buffer.new("", "")
+  old_buffer = vma.buf
+  vma.buf = Buffer.new("", "")
   load "tests/test_#{test_id}.rb"
-  test_ok = $buffer.to_s.strip == target_results.strip
+  test_ok = vma.buf.to_s.strip == target_results.strip
   puts "##################"
   puts target_results
   puts "##################"
-  puts $buffer.to_s
+  puts vma.buf.to_s
   puts "##################"
   puts "TEST OK" if test_ok
   puts "TEST FAILED" if !test_ok
   puts "##################"
-  $buffer = old_buffer
+  vma.buf = old_buffer
 end
 
 #TODO: remove?
@@ -121,7 +126,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     # puts buf.current_line()
     # puts "======================"
 
-    render_buffer($buffer)
+    render_buffer(vma.buf)
 
     gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
@@ -130,14 +135,13 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
 
     gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
-    render_buffer($buffer)
+    render_buffer(vma.buf)
 
-    $buffers.set_current_buffer(rand($buffers.size)) if rand > 0.25
+    vma.buffers.set_current_buffer(rand(vma.buffers.size)) if rand > 0.25
     step += 1
   end
 end
 
-
 def start_ripl
   Ripl.start :binding => binding
 end

data/lib/vimamsa/easy_jump.rb

@@ -22,18 +22,20 @@ class EasyJump
       r = false if lsh[x] or lsh[x - 1] or lsh[x - 2]
       r
     }
+    
+    wsmarks = [0] if wsmarks.empty?
 
     # Exclude those word start positions that are too close to each other
     wsmarks.sort!
     wsm2 = [wsmarks[0]]
     for i in 1..(wsmarks.size - 1)
       if (wsmarks[i] - wsm2[-1]) >= 4 or visible_text[wsm2[-1]..wsmarks[i]].include?("\n")
-
         wsm2 << wsmarks[i]
       end
     end
     wsmarks = wsm2
 
+
     linestart_buf = (line_starts).collect { |x| x + visible_range[0] }
     wsmarks_buf = (wsmarks).collect { |x| x + visible_range[0] }
 
@@ -57,9 +59,11 @@ class EasyJump
     if @jump_sequence.include?(@easy_jump_input)
       jshash = Hash[@jump_sequence.map.with_index.to_a]
       nthword = jshash[@easy_jump_input]
-      debug "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
-      buf.set_pos(@easy_jump_wsmarks[nthword])
-      # @kbd.set_mode(:command)
+      newpos = @easy_jump_wsmarks[nthword]
+      if !newpos.nil?
+        debug "nthword:#{nthword} #{[@easy_jump_wsmarks[nthword], @jump_sequence[nthword]]}"
+        buf.set_pos(@easy_jump_wsmarks[nthword])
+      end
       vma.kbd.remove_keyhandling_override
       @jump_sequence = []
       vma.gui.clear_overlay()
@@ -76,7 +80,7 @@ class EasyJump
   def easy_jump_draw()
     vma.gui.start_overlay_draw
     for i in 0..(@easy_jump_wsmarks.size - 1)
-      vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i]) 
+      vma.gui.overlay_draw_text(@jump_sequence[i], @easy_jump_wsmarks[i])
     end
     vma.gui.end_overlay_draw
   end