vimamsa 0.1.14 → 0.1.15

data/lib/vimamsa/buffer_list.rb

@@ -2,7 +2,7 @@ def save_buffer_list()
   message("Save buffer list")
   buffn = get_dot_path("buffers.txt")
   f = File.open(buffn, "w")
-  bufstr = vma.buffers.collect { |buf| buf.fname }.inspect
+  bufstr = vma.buffers.list.collect { |buf| buf.fname }.inspect
   f.write(bufstr)
   f.close()
 end
@@ -19,74 +19,93 @@ def load_buffer_list()
   end
 end
 
-class BufferList < Array
+class BufferList
   attr_reader :current_buf, :last_dir, :last_file, :buffer_history
+  attr_accessor :list
 
   def initialize()
     @last_dir = File.expand_path(".")
     @buffer_history = []
     super
     @current_buf = 0
+    @list = []
+    @h = {}
+    reset_navigation
   end
 
   # lastdir = File.expand_path(".") if lastdir.nil?
   def <<(_buf)
-    super
     vma.buf = _buf
-    @current_buf = self.size - 1
-    @buffer_history << @current_buf
-    @recent_ind = 0
+    self.add(_buf)
+
     $hook.call(:change_buffer, vma.buf)
-    vma.gui.set_current_buffer(vma.buf.id)
-    # gui_set_cursor_pos(vma.buf.id, vma.buf.pos)
-    vma.buf.view.set_cursor_pos(vma.buf.pos)
+    vma.gui.set_current_buffer(vma.buf.id) #TODO: handle elswhere?
+    # vma.buf.view.set_cursor_pos(vma.buf.pos)  #TODO: handle elswhere?
     update_last_dir(_buf)
   end
 
   def add(_buf)
-    self.append(_buf)
-    @buffer_history << self.size - 1
+    @buffer_history << _buf.id
+    # @navigation_idx = _buf.id #TODO:??
+    @list << _buf
+    @h[_buf.id] = _buf
   end
 
-  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)
+  #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 }
   end
 
   def get_last_visited_id
-    last_buf = @buffer_history[-2]
-    return self[last_buf].id
+    last_buf = nil
+    for i in 0..(slist.size - 1)
+      next if slist[i].is_active?
+      last_buf = slist[i].id
+    end
+    return last_buf
   end
 
   def switch_to_last_buf()
     debug "SWITCH TO LAST BUF:"
-    debug @buffer_history
-    last_buf = @buffer_history[-2]
-    if last_buf
-      set_current_buffer(last_buf)
+    # debug @buffer_history
+    # last_buf = @buffer_history[-2]
+
+    last_buf = slist[-2]
+    if !last_buf.nil?
+      set_current_buffer(last_buf.id)
     end
   end
 
+  def size
+    return @list.size
+  end
+
   def get_buffer_by_filename(fname)
     #TODO: check using stat/inode?  http://ruby-doc.org/core-1.9.3/File/Stat.html#method-i-ino
-    buf_idx = self.index { |b| b.fname == fname }
-    return buf_idx
+    b = @list.find { |b| b.fname == fname }
+    return b.id unless b.nil?
+    return nil
   end
 
   def get_buffer_by_id(id)
-    buf_idx = self.index { |b| b.id == id }
-    return buf_idx
+    return @h[id]
   end
 
   def add_buf_to_history(buf_idx)
-    if self.include?(buf_idx)
+    if @list.include?(buf_idx)
       @buffer_history << @buf_idx
-      @recent_ind = 0
-      compact_buf_history()
+      @navigation_idx = 0
+      # compact_buf_history()
     else
       debug "buffer_list, no such id:#{buf_idx}"
       return
@@ -94,52 +113,40 @@ class BufferList < Array
   end
 
   def add_current_buf_to_history()
-    @recent_ind = 0
-    @buffer_history << @current_buf
-    compact_buf_history()
+    @h[@current_buf].update_access_time
   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
+  def set_current_buffer_by_id(idx, update_history = true)
     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
-    if !vma.buf.nil? and vma.kbd.get_mode != :browse #TODO
+  def set_current_buffer(idx, update_history = true)
+    # Set update_history = false if we are only browsing
+
+    if !vma.buf.nil? and vma.kbd.get_scope != :editor
       # Save keyboard mode status of old buffer when switching buffer
       vma.buf.mode_stack = vma.kbd.default_mode_stack.clone
     end
-    vma.buf = self[buffer_i]
-    return if !vma.buf
+    return if !@h[idx]
+    vma.buf = bu = @h[idx]
     update_last_dir(vma.buf)
-    @current_buf = buffer_i
-    debug "SWITCH BUF2. bufsize:#{self.size}, curbuf: #{@current_buf}"
-    fpath = vma.buf.fname
-    if fpath and fpath.size > 50
-      fpath = fpath[-50..-1]
-    end
+    @current_buf = idx
+    debug "SWITCH BUF. bufsize:#{@list.size}, curbuf: #{@current_buf}"
 
-    if update_history
-      add_current_buf_to_history
-    end
     vma.hook.call(:change_buffer, vma.buf)
-    vma.buf.set_active # TODO
 
-    vma.gui.set_current_buffer(vma.buf.id)
+    bu.set_active # TODO
+    bu.update_access_time if update_history
+    vma.gui.set_current_buffer(idx)
 
-    if !vma.buf.mode_stack.nil? and vma.kbd.get_mode != :browse #TODO
-      debug "set kbd mode stack #{vma.buf.mode_stack}  #{vma.buf.id}", 2
-      # Reload previously saved keyboard mode status
-      # vma.kbd.set_mode_stack(vma.buf.mode_stack.clone) #TODO:needed?
-      vma.kbd.set_mode_stack([vma.buf.default_mode])
-    end
-    vma.kbd.set_mode_to_default
+    #TODO: delete?
+    # if !vma.buf.mode_stack.nil? and vma.kbd.get_scope != :editor #TODO
+    # debug "set kbd mode stack #{vma.buf.mode_stack}  #{vma.buf.id}", 2
+    # Reload previously saved keyboard mode status
+    # vma.kbd.set_mode_stack(vma.buf.mode_stack.clone) #TODO:needed?
+    # vma.kbd.set_mode_stack([vma.buf.default_mode])
+    # end
+    # vma.kbd.set_mode_to_default if vma.kbd.get_scope != :editor
 
     gui_set_window_title(vma.buf.title, vma.buf.subtitle)
 
@@ -169,100 +176,80 @@ class BufferList < Array
     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 }
-    return bufs
+  def reset_navigation
+    @navigation_idx = 0
   end
 
-  def history_switch_backwards()
-    recent = get_recent_buffers()
-    @recent_ind += 1
-    @recent_ind = 0 if @recent_ind >= recent.size
-    bufid = recent[@recent_ind]
-    debug "IND:#{@recent_ind} RECENT:#{recent.join(" ")}"
-    set_current_buffer(bufid, false)
+  def history_switch_backwards
+    @navigation_idx += 1
+    @navigation_idx = 0 if @navigation_idx >= list.size
+    b = slist[-1 - @navigation_idx]
+    debug "IND:#{@navigation_idx} RECENT:#{slist.collect { |x| x.fname }.join(" ")}"
+    set_current_buffer(b.id, false)
   end
 
   def history_switch_forwards()
-    recent = get_recent_buffers()
-    @recent_ind -= 1
-    @recent_ind = self.size - 1 if @recent_ind < 0
-    bufid = recent[@recent_ind]
-    debug "IND:#{@recent_ind} RECENT:#{recent.join(" ")}"
-    set_current_buffer(bufid, false)
+    @navigation_idx -= 1
+    @navigation_idx = list.size - 1 if @navigation_idx < 0
+
+    b = slist[-1 - @navigation_idx]
+    debug "IND:#{@navigation_idx} RECENT:#{slist.collect { |x| x.fname }.join(" ")}"
+    set_current_buffer(b.id, false)
   end
 
-  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
+  def get_last_non_active_buffer
+    for bu in slist.reverse
+      return bu.id if !bu.is_active
+    end
+    return nil
   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
+  def close_buffer(idx, from_recent = false, auto_open: true)
+    return if idx.nil?
+    bu = @h[idx]
+    return if bu.nil?
 
-    bufname = self[buffer_i].basename
+    bufname = bu.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
-  end
-
-  def close_buffer(buffer_i, from_recent = false)
-    return if buffer_i.nil?
-    return if self.size <= buffer_i
+    @list.delete(@h[idx])
+    @h.delete(idx)
 
-    bufname = self[buffer_i].basename
-    message("Closed buffer #{bufname}")
-    recent = get_recent_buffers
-    jump_to_buf = recent[@recent_ind + 1]
-    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
-
-    if @current_buf == buffer_i
-      if from_recent
-        @current_buf = jump_to_buf
-      else
-        # Find last edited buffer that is not already open
-        @current_buf = @buffer_history.filter { |x| !vma.gui.is_buffer_open(self[x].id) }.last
+    if auto_open
+      @current_buf = get_last_non_active_buffer
+      if @list.size == 0 or @current_buf.nil?
+        bu = Buffer.new("\n")
+        add(bu)
+        @current_buf = bu.id
       end
+      set_current_buffer(@current_buf, false)
     end
-    if self.size == 0 or @current_buf.nil?
-      self << Buffer.new("\n")
-      @current_buf = 0
-    else
-      @current_buf = 0 if @current_buf >= self.size
-    end
-    set_current_buffer(@current_buf, false)
   end
 
-  def close_all_buffers()
-    message("Closing all buffers")
-    while true
-      if self.size == 1
-        close_buffer(0)
-        break
-      else
-        close_buffer(0)
-      end
-    end
-    # self << Buffer.new("\n")
+  # Close buffer in the background
+  def close_other_buffer(idx)
+    close_buffer(idx, auto_open: false)
   end
 
+  #TODO
+  # def close_all_buffers()
+  # message("Closing all buffers")
+  # while @list.size > 0
+  # if self.size == 1
+  # close_buffer(0)
+  # break
+  # else
+  # close_buffer(0)
+  # end
+  # end
+  # # self << Buffer.new("\n")
+  # end
+
   def close_scrap_buffers()
-    i = 0
-    while i < self.size
-      if !self[i].pathname
-        close_buffer(i)
-      else
-        i += 1
+    l = @list.clone
+    for bu in l
+      if !bu.pathname
+        close_buffer(bu.id)
       end
     end
   end
@@ -273,7 +260,7 @@ class BufferList < Array
 
   def delete_current_buffer(from_recent = false)
     fn = buf.fname
-    close_buffer(@current_buf, from_recent)
+    close_buffer(@current_buf)
     #TODO: confirm with user, "Do you want to delete file X"
     if is_existing_file(fn)
       message("Deleting file: #{fn}")

data/lib/vimamsa/buffer_manager.rb

@@ -28,28 +28,26 @@ class BufferManager
     l = @buf.lpos - @header.size
     return nil if l < 0
     bufid = @line_to_id[l]
-    buf_i = vma.buffers.get_buffer_by_id(bufid)
-    return buf_i
+    return bufid
   end
 
   def close_selected
-    buf_i = buf_of_current_line()
-    if buf_i.nil?
+    idx = buf_of_current_line()
+    r = @buf.current_line_range
+    Gui.hilight_range(@buf,r, color:"#666666ff")
+    if idx.nil?
       message("buf already closed")
       return
     end
-    vma.buffers.close_other_buffer(buf_i)
+    vma.buffers.close_other_buffer(idx)
   end
 
   def select_line
-    buf_i = buf_of_current_line()
-    return if buf_i.nil?
+    idx = buf_of_current_line()
+    return if idx.nil?
 
-    # 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)
+    vma.buffers.set_current_buffer(idx)
+    vma.buffers.close_other_buffer(@buf.id)
     @@cur = nil
   end
 
@@ -70,7 +68,7 @@ class BufferManager
     s << "\n"
     i = 0
     jump_to_line = 0
-    for b in vma.buffers.sort_by { |x| x.list_str }
+    for b in vma.buffers.list.sort_by { |x| x.list_str }
       if b.id == vma.buf.id # current file
         # s << "   "
         jump_to_line = i

data/lib/vimamsa/clipboard.rb

@@ -31,5 +31,6 @@ class Clipboard
 end
 
 def set_system_clipboard(arg)
+  debug arg,2
   vma.gui.window.display.clipboard.set(arg)
 end

data/lib/vimamsa/conf.rb

@@ -153,3 +153,9 @@ cnf.workspace_folders = []
 
 cnf.match.highlight.color = "#10bd8e"
 
+cnf.lsp.enabled = false
+
+cnf.font.size = 11
+cnf.font.family = "Monospace"
+
+

data/lib/vimamsa/constants.rb

@@ -15,8 +15,6 @@ CURRENT_CHAR_FORWARD = 2005
 CURRENT_CHAR_BACKWARD = 2006
 START_OF_BUFFER = 2007
 END_OF_BUFFER = 2008
-BACKWARD = 2009
-FORWARD = 2010
 END_OF_LINE = 2011
 BEGINNING_OF_LINE = 2012
 WORD_START = 2013
@@ -30,14 +28,6 @@ REPLACE = 3002
 KEY_PRESS = 6
 KEY_RELEASE = 7 # QEvent::KeyRelease
 
-# http://qt-project.org/doc/qt-5.0/qtcore/qt.html#KeyboardModifier-enum
-ALTMODIFIER = 0x08000000
-NOMODIFIER = 0x00000000 #    No modifier key is pressed.
-SHIFTMODIFIER = 0x02000000 #    A Shift key on the keyboard is pressed.
-CONTROLMODIFIER = 0x04000000 #    A Ctrl key on the keyboard is pressed.
-ALTMODIFIER = 0x08000000 #    An Alt key on the keyboard is pressed.
-METAMODIFIER = 0x10000000 #    A Meta key on the keyboard is pressed.
-KEYPADMODIFIER = 0x20000000 #    A keypad button is pressed.
 
 
 

data/lib/vimamsa/debug.rb

@@ -41,6 +41,11 @@ def log_error(message)
   #TODO
 end
 
+def show_caller
+  puts caller().join("\n")
+end
+
+
 def crash(message, e = nil)
   puts "FATAL ERROR:#{message}"
   puts caller().join("\n")

data/lib/vimamsa/editor.rb

@@ -5,6 +5,7 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
+
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro
   attr_accessor :converters, :fh, :paint_stack, :kbd, :langsrv, :register, :cur_register, :clipboard
@@ -68,6 +69,11 @@ class Editor
     $search = Search.new
     register_plugin(:Search, $search)
 
+    # build_key_bindings_tree
+    @kbd = KeyBindingTree.new()
+    $kbd = @kbd
+    require "vimamsa/key_bindings_vimlike"
+
     $buffers = BufferList.new
     $minibuffer = Buffer.new(">", "")
     @langsrv = {}
@@ -75,10 +81,7 @@ class Editor
     require "vimamsa/text_transforms"
 
     debug "ARGV: " + ARGV.inspect
-    # build_key_bindings_tree
-    @kbd = KeyBindingTree.new()
-    $kbd = @kbd
-    require "vimamsa/key_bindings_vimlike"
+
     sleep(0.03)
 
     BufferManager.init
@@ -121,8 +124,9 @@ class Editor
 
     Grep.init
     FileManager.init
+    Autocomplete.init
 
-    if conf(:enable_lsp)
+    if cnf.lsp.enabled?
       require "vimamsa/langservp"
       require "vimamsa/audio" # TODO:config
       @langsrv["ruby"] = LangSrv.new("ruby")
@@ -444,7 +448,7 @@ def minibuffer_delete()
 end
 
 def error(str)
-  puts caller[0]
+  show_caller
   debug "#{caller[0]} ERROR: #{str}", 2
 end
 
@@ -487,7 +491,7 @@ GUESS_ENCODING_ORDER = [
 ]
 
 def create_new_file(filename = nil, file_contents = "\n")
-  buffer = Buffer.new(file_contents)
+  buffer = Buffer.new(file_contents, filename)
 
   debug "NEW FILE CREATED: #{buffer.id}"
   vma.buffers.add(buffer)
@@ -580,6 +584,12 @@ def open_new_file(filename, file_contents = "")
     if !is_path_writable(filename)
       message("Path #{filename} cannot be written to")
       return false
+    elsif !File.exist?(filename)
+      message("File #{filename} does not exist")
+      return false
+    elsif !file_is_text_file(filename)
+      message("File #{filename} does not contain text")
+      return false
     end
     message "New file opened: #{filename}"
     fname = filename

data/lib/vimamsa/file_history.rb

@@ -4,9 +4,6 @@ class FileHistory
   attr_accessor :history
 
   def initialize()
-    # puts self.method("update")
-    # x = self.method("update")
-    # x.call("ASFASF")
 
     vma.hook.register(:change_buffer, self.method("update"))
     vma.hook.register(:shutdown, self.method("save"))
@@ -17,9 +14,6 @@ class FileHistory
     $search_list = []
   end
 
-  # def self.init()
-  # end
-
   def update(buf)
     debug "FileHistory.update(buf=#{buf.fname})"
     return if !buf.fname
@@ -30,8 +24,6 @@ class FileHistory
       @history[buf.fname] += 1
     end
     debug @history
-
-    # puts "FileHistory.update(buf=#{buf})"
   end
 
   def save()

data/lib/vimamsa/file_manager.rb

@@ -18,7 +18,7 @@ class FileManager
   end
 
   def self.init()
-    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp); vma.kbd.set_default_mode(:file_exp) }, "File selector")
+    reg_act(:start_file_selector, proc { FileManager.new.run; vma.kbd.set_mode(:file_exp); }, "File selector")
 
     reg_act(:fexp_chdir_parent, proc { FileManager.chdir_parent }, "File selector")
     reg_act(:fexp_select, proc { buf.module.select_line }, "")
@@ -86,7 +86,7 @@ class FileManager
       # Thread.new {
       for fn in @cut_files
         FileUtils.move(fn, @ld)
-        puts "FileUtils.move(#{fn}, #{@ld})"
+        debug "FileUtils.move(#{fn}, #{@ld})"
       end
     elsif !@copied_files.empty?
       for fn in @copied_files
@@ -263,8 +263,11 @@ class FileManager
       # elsif vma.can_open_extension?(fn)
       # jump_to_file(fn)
     elsif file_is_text_file(fn)
-      bufs.close_current_buffer
+      # bufs.close_current_buffer
       jump_to_file(fn)
+      # vma.buffers.set_current_buffer(idx)
+      vma.buffers.close_other_buffer(@buf.id)
+
     else
       open_with_default_program(fn)
     end