vimamsa 0.1.10 → 0.1.12

data/lib/vimamsa/buffer_list.rb

@@ -1,3 +1,4 @@
+
 def save_buffer_list()
   message("Save buffer list")
   buffn = get_dot_path("buffers.txt")
@@ -20,11 +21,13 @@ def load_buffer_list()
 end
 
 class BufferList < Array
-  attr_reader :current_buf, :last_dir
+  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?
@@ -32,11 +35,17 @@ class BufferList < Array
     super
     vma.buf = _buf
     @current_buf = self.size - 1
-    $buffer_history << @current_buf
+    @buffer_history << @current_buf
     @recent_ind = 0
     $hook.call(:change_buffer, vma.buf)
-    gui_set_current_buffer(vma.buf.id)
+    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()
@@ -48,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
@@ -68,12 +82,32 @@ class BufferList < Array
     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
@@ -90,10 +124,11 @@ class BufferList < Array
       add_current_buf_to_history
     end
 
-    $hook.call(:change_buffer, vma.buf)
+    vma.hook.call(:change_buffer, vma.buf)
     vma.buf.set_active
 
-    gui_set_current_buffer(vma.buf.id)
+    vma.gui.set_current_buffer(vma.buf.id)
+
     gui_set_window_title(vma.buf.title, vma.buf.subtitle)
 
     if vma.buf.fname
@@ -103,6 +138,12 @@ class BufferList < Array
     # hpt_scan_images() if $debug # experimental
   end
 
+  def update_last_dir(buf)
+    if buf.fname
+      @last_dir = File.dirname(buf.fname)
+    end
+  end
+
   def last_dir=(d)
     @last_dir = d
   end
@@ -113,7 +154,7 @@ class BufferList < Array
 
   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
 
@@ -138,8 +179,8 @@ 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
@@ -152,7 +193,7 @@ class BufferList < Array
     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)
@@ -166,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

@@ -15,6 +15,7 @@ class BufferManager
 
     bindkey "bmgr enter", :bmgr_select
     bindkey "bmgr c", :bmgr_close
+    bindkey "bmgr x", :close_current_buffer
   end
 
   def initialize()
@@ -43,8 +44,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
 
@@ -57,27 +61,40 @@ class BufferManager
     @@cur = self
     @header = []
     @header << "Current buffers:"
-    @header << "keys: <enter> to select, <c> to close buffer"
+    @header << "keys: <enter> to select, <c> to close buffer, <x> exit"
     @header << "=" * 40
 
     s = ""
     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
@@ -137,7 +142,6 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
   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()
@@ -68,7 +72,7 @@ class EasyJump
       # @kbd.set_mode(:command)
       vma.kbd.remove_keyhandling_override
       @jump_sequence = []
-      vma.gui.clear_overlay()
+      vma.gui.clear_overlay
     end
     return true
   end
@@ -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

data/lib/vimamsa/editor.rb

@@ -32,8 +32,8 @@ def mkdir_if_not_exists(_dirpath)
 end
 
 class Editor
-  attr_reader :file_content_search_paths, :file_name_search_paths, :gui
-  attr_accessor :converters, :fh, :paint_stack, :kbd
+  attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro
+  attr_accessor :converters, :fh, :paint_stack, :kbd, :langsrv
   #attr_writer :call_func, :update_highlight
 
   def initialize()
@@ -73,14 +73,17 @@ class Editor
     @gui = $vmag #TODO
 
     $hook = Hook.new
-    register_plugin(:Hook, $hook)
-    $macro = Macro.new
+    @hook = $hook
+    register_plugin(:Hook, @hook)
+    @macro = Macro.new
+    $macro = @macro
     register_plugin(:Macro, $macro)
     $search = Search.new
     register_plugin(:Search, $search)
 
     $buffers = BufferList.new
     $minibuffer = Buffer.new(">", "")
+    @langsrv = {}
 
     require "vimamsa/text_transforms"
 
@@ -88,20 +91,14 @@ class Editor
     # build_key_bindings_tree
     @kbd = KeyBindingTree.new()
     $kbd = @kbd
-    @kbd.add_mode("C", :command)
-    @kbd.add_mode("I", :insert)
-    @kbd.add_mode("V", :visual)
-    @kbd.add_mode("M", :minibuffer)
-    @kbd.add_mode("R", :readchar)
-    @kbd.add_mode("B", :browse)
-    @kbd.set_default_mode(:command)
-    @kbd.set_mode(:command)
-    @kbd.show_state_trail
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
+    
 
     FileManager.init
     BufferManager.init
+    
+    @gui.init_menu
 
     mkdir_if_not_exists("~/.vimamsa")
     mkdir_if_not_exists("~/.vimamsa/backup")
@@ -130,15 +127,19 @@ class Editor
 
     # set_gui_style(1)
 
-    # Limit file search to these extensions:
-    $find_extensions = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb"]
-
+    #TODO: remove
     dotfile = read_file("", "~/.vimamsarc")
     eval(dotfile) if dotfile
-    
+
     custom_script = read_file("", custom_fn)
     eval(custom_script) if custom_script
 
+    if conf(:enable_lsp)
+      require "vimamsa/langservp"
+      @langsrv["ruby"] = LangSrv.new("ruby")
+      @langsrv["cpp"] = LangSrv.new("cpp")
+    end
+
     # build_options
 
     fname = nil
@@ -161,23 +162,14 @@ class Editor
     end
 
     if fname
-      buffer = Buffer.new(read_file("", fname), fname)
+      open_new_file(fname)
     else
-      buffer = Buffer.new(" \n")
+      create_new_buffer(file_contents = "\n")
     end
-    vma.buffers << buffer
-
-    # load_theme($cnf[:theme])
-
-    # render_buffer(vma.buf, 1) #TODO
-
-    # gui_select_buffer_init #TODO
-    # gui_file_finder_init #TODO
 
     #Load plugins
     require "vimamsa/file_history.rb"
     @fh = FileHistory.new
-    # @_plugins[:FileFinder] = FileFinder.new
     @_plugins[:FileHistory] = @fh
 
     register_plugin(:FileHistory, @fh)
@@ -185,7 +177,7 @@ class Editor
     # To access via vma.FileFinder
     # self.define_singleton_method(:FileFinder) { @_plugins[:FileFinder] }
 
-    $hook.call(:after_init)
+    @hook.call(:after_init)
   end
 
   def register_plugin(name, obj)
@@ -197,11 +189,11 @@ class Editor
   def buf()
     return $buffer
   end
+
   def buf=(aa)
-    $buffer=aa
+    $buffer = aa
   end
 
-
   def buffers()
     return $buffers
   end
@@ -243,8 +235,9 @@ class Editor
   end
 
   def shutdown()
-    $hook.call(:shutdown)
+    @hook.call(:shutdown)
     save_state
+    @gui.quit
   end
 
   def save_state
@@ -272,7 +265,7 @@ class Editor
     r = @file_content_search_paths.clone
     p = find_project_dir_of_cur_buffer()
     if p.nil?
-      p = vma.buffers.last_dir 
+      p = vma.buffers.last_dir
     end
 
     if p and !@file_content_search_paths.include?(p)
@@ -293,7 +286,7 @@ end
 
 def _quit()
   vma.shutdown
-  Gtk.main_quit
+  # Gtk.main_quit
 end
 
 def fatal_error(msg)
@@ -311,6 +304,7 @@ def open_file_dialog()
   gui_open_file_dialog(File.dirname(path))
 end
 
+#TODO:delete?
 def system_clipboard_changed(clipboard_contents)
   max_clipboard_items = 100
   if clipboard_contents != $clipboard[-1]
@@ -379,7 +373,7 @@ def set_next_command_count(num)
 end
 
 def start_minibuffer_cmd(bufname, bufstr, cmd)
-  $kbd.set_mode(:minibuffer)
+  vma.kbd.set_mode(:minibuffer)
   $minibuffer = Buffer.new(bufstr, "")
   $minibuffer.call_func = method(cmd)
 end
@@ -392,9 +386,10 @@ def show_key_bindings()
   kbd_s << "key!: Press key once, release before pressing any other keys\n"
 
   kbd_s << "===============================================\n"
-  kbd_s << $kbd.to_s
+  kbd_s << vma.kbd.to_s
+  kbd_s << "\n"
   kbd_s << "===============================================\n"
-  b = create_new_file(nil, kbd_s)
+  b = create_new_buffer(kbd_s,"key-bindings")
   gui_set_file_lang(b.id, "hyperplaintext")
   #
 end
@@ -500,11 +495,27 @@ GUESS_ENCODING_ORDER = [
 ]
 
 def create_new_file(filename = nil, file_contents = "\n")
-  debug "NEW FILE CREATED"
   buffer = Buffer.new(file_contents)
-  # gui_set_current_buffer(buffer.id) #TODO: remove?
-  vma.buffers << buffer
+
+  debug "NEW FILE CREATED: #{buffer.id}"
+  vma.buffers.add(buffer)
   vma.kbd.set_mode_to_default
+  vma.buffers.set_current_buffer_by_id(buffer.id)
+
+  # Do set_content twice (once in Buffer.new) to force redraw and work around a bug 
+  # The bug: if switching a child of scrolledWindow to a textview with a file smaller than the window, it won't get drawn properly if in previous (larger) file the ScrolledWindow was scrolled down.
+  buffer.set_content(file_contents)
+
+  return buffer
+end
+
+def create_new_buffer(file_contents = "\n",prefix="buf", setcurrent=true)
+  debug "NEW BUFFER CREATED"
+  buffer = Buffer.new(file_contents,nil,prefix)
+  vma.buffers.add(buffer)
+  vma.buffers.set_current_buffer_by_id(buffer.id) if setcurrent
+  buffer.set_content(file_contents)
+
   return buffer
 end
 
@@ -521,12 +532,13 @@ def filter_buffer(buf)
 end
 
 def load_buffer(fname)
-  return if !File.exist?(fname)
+  # If file already open in existing buffer
   existing_buffer = vma.buffers.get_buffer_by_filename(fname)
   if existing_buffer != nil
-    $buffer_history << existing_buffer
+    vma.buffers.add_buf_to_history(existing_buffer)
     return
   end
+  return if !File.exist?(fname)
   debug("LOAD BUFFER: #{fname}")
   buffer = Buffer.new(read_file("", fname), fname)
   # gui_set_current_buffer(buffer.id)
@@ -536,6 +548,7 @@ def load_buffer(fname)
   #    debug("END FILTER: #{fname}")
   vma.buffers << buffer
   #$buffer_history << vma.buffers.size - 1
+  return buffer
 end
 
 def jump_to_file(filename, linenum = nil, charn = nil)
@@ -574,7 +587,8 @@ def open_new_file(filename, file_contents = "")
   else
     message "New file opened: #{filename}"
     fname = filename
-    load_buffer(fname)
+    bf = load_buffer(fname)
+    vma.buffers.set_current_buffer_by_id(bf.id)
   end
 end