vimamsa 0.1.9 → 0.1.11

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,13 @@ 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 +126,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,18 +161,10 @@ 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
-    $buffers << buffer
-
-    # load_theme($cnf[:theme])
-
-    # render_buffer($buffer, 1) #TODO
-
-    # gui_select_buffer_init #TODO
-    # gui_file_finder_init #TODO
 
     #Load plugins
     require "vimamsa/file_history.rb"
@@ -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)
@@ -198,6 +190,10 @@ class Editor
     return $buffer
   end
 
+  def buf=(aa)
+    $buffer = aa
+  end
+
   def buffers()
     return $buffers
   end
@@ -239,8 +235,9 @@ class Editor
   end
 
   def shutdown()
-    $hook.call(:shutdown)
+    @hook.call(:shutdown)
     save_state
+    @gui.quit
   end
 
   def save_state
@@ -256,7 +253,7 @@ class Editor
   # Register converter
   def reg_conv(converter, converter_id)
     @converters[converter_id] = converter
-    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
+    reg_act(converter_id, proc { vma.buf.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
   end
 
   def apply_conv(converter_id, txt)
@@ -268,7 +265,7 @@ class Editor
     r = @file_content_search_paths.clone
     p = find_project_dir_of_cur_buffer()
     if p.nil?
-      p = buf.dirname # Search dir of current file by default
+      p = vma.buffers.last_dir
     end
 
     if p and !@file_content_search_paths.include?(p)
@@ -289,7 +286,7 @@ end
 
 def _quit()
   vma.shutdown
-  Gtk.main_quit
+  # Gtk.main_quit
 end
 
 def fatal_error(msg)
@@ -303,10 +300,11 @@ end
 
 def open_file_dialog()
   path = ""
-  path = $buffer.fname if $buffer.fname
+  path = vma.buf.fname if vma.buf.fname
   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]
@@ -339,8 +337,8 @@ end
 
 def set_cursor_pos(new_pos)
   buf.set_pos(new_pos)
-  #render_buffer($buffer)
-  debug "New pos: #{new_pos}lpos:#{$buffer.lpos} cpos:#{$buffer.cpos}"
+  #render_buffer(vma.buf)
+  debug "New pos: #{new_pos}lpos:#{vma.buf.lpos} cpos:#{vma.buf.cpos}"
 end
 
 def set_last_command(cmd)
@@ -361,7 +359,7 @@ end
 
 def repeat_last_find()
   return if !defined? $last_find_command
-  $buffer.jump_to_next_instance_of_char($last_find_command[:char],
+  vma.buf.jump_to_next_instance_of_char($last_find_command[:char],
                                         $last_find_command[:direction])
 end
 
@@ -375,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
@@ -388,7 +386,8 @@ 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)
   gui_set_file_lang(b.id, "hyperplaintext")
@@ -397,10 +396,10 @@ end
 
 def diff_buffer()
   bufstr = ""
-  orig_path = $buffer.fname
+  orig_path = vma.buf.fname
   infile = Tempfile.new("out")
   infile = Tempfile.new("in")
-  infile.write($buffer.to_s)
+  infile.write(vma.buf.to_s)
   infile.flush
   cmd = "diff -w '#{orig_path}' #{infile.path}"
   # debug cmd
@@ -446,7 +445,7 @@ def minibuffer_new_char(c)
     $minibuffer.insert_txt(c)
     debug "MINIBUFFER: #{c}"
   end
-  #$buffer = $minibuffer
+  #vma.buf = $minibuffer
 end
 
 # def readchar_new_char(c)
@@ -496,10 +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?
-  $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")
+  debug "NEW BUFFER CREATED"
+  buffer = Buffer.new(file_contents,nil,prefix)
+  vma.buffers.add(buffer)
+  vma.buffers.set_current_buffer_by_id(buffer.id)
+  buffer.set_content(file_contents)
+
   return buffer
 end
 
@@ -516,12 +532,13 @@ def filter_buffer(buf)
 end
 
 def load_buffer(fname)
-  return if !File.exist?(fname)
-  existing_buffer = $buffers.get_buffer_by_filename(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)
@@ -529,8 +546,9 @@ def load_buffer(fname)
   debug("DONE LOAD: #{fname}")
   #buf = filter_buffer(buffer)
   #    debug("END FILTER: #{fname}")
-  $buffers << buffer
-  #$buffer_history << $buffers.size - 1
+  vma.buffers << buffer
+  #$buffer_history << vma.buffers.size - 1
+  return buffer
 end
 
 def jump_to_file(filename, linenum = nil, charn = nil)
@@ -561,15 +579,16 @@ end
 def open_new_file(filename, file_contents = "")
   #TODO: expand path
   filename = File.expand_path(filename)
-  b = $buffers.get_buffer_by_filename(filename)
+  b = vma.buffers.get_buffer_by_filename(filename)
   # File is already opened to existing buffer
   if b != nil
     message "Switching to: #{filename}"
-    $buffers.set_current_buffer(b)
+    vma.buffers.set_current_buffer(b)
   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
 
@@ -680,8 +699,8 @@ end
 def find_project_dir_of_cur_buffer()
   # Find "project dir" of current file. If currently editing file in path "/foo/bar/baz/fn.txt" and file named "/foo/bar/.vma_project" exists, then dir /foo/bar is treated as project dir and subject to e.g. ack search.
   pdir = nil
-  if $buffer.fname
-    pdir = find_project_dir_of_fn($buffer.fname)
+  if vma.buf.fname
+    pdir = find_project_dir_of_fn(vma.buf.fname)
   end
   # debug "Proj dir of current file: #{pdir}"
   return pdir

data/lib/vimamsa/encrypt.rb

@@ -33,7 +33,7 @@ class Encrypt
 end
 
 def decrypt_cur_buffer(password, b = nil)
-  $buffer.decrypt(password)
+  vma.buf.decrypt(password)
 end
 
 def encrypt_cur_buffer()
@@ -42,6 +42,6 @@ def encrypt_cur_buffer()
 end
 
 def encrypt_cur_buffer_callback(password,b=nil)
-  $buffer.set_encrypted(password)
+  vma.buf.set_encrypted(password)
 end
 

data/lib/vimamsa/file_finder.rb

@@ -1,12 +1,26 @@
 require "parallel"
+
+# Limit file search to these extensions:
+$find_extensions = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb"]
+$search_dirs = []
+
 class FileFinder
+  def self.update_index()
+    message("Start updating file index")
+    Thread.new {
+      recursively_find_files()
+      message("Finnish updating file index")
+    }
+  end
+
   def initialize()
-    $hook.register(:shutdown, self.method("save"))
-    $dir_list = vma.marshal_load("file_index")
+    vma.hook.register(:shutdown, self.method("save"))
+    @dir_list = vma.marshal_load("file_index")
   end
 
   def save()
-    vma.marshal_save("file_index", $dir_list)
+   debug "SAVE FILE INDEX", 2
+    vma.marshal_save("file_index", @dir_list)
   end
 
   def start_gui()
@@ -16,85 +30,69 @@ class FileFinder
     end
     l = []
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-    if $dir_list == nil
-      Thread.new { recursively_find_files() }
+    if @dir_list == nil
+      Thread.new { FileFinder.recursively_find_files() }
     end
 
+    # select_callback = proc { |search_str, idx| gui_file_finder_select_callback(search_str, idx) }
+    select_callback = self.method("gui_file_finder_select_callback")
+    update_callback = self.method("gui_file_finder_update_callback")
+
     gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
-                            "gui_file_finder_select_callback",
-                            "gui_file_finder_update_callback")
+                             # "gui_file_finder_select_callback",
+                             select_callback,
+                             update_callback)
   end
-end
 
-def update_file_index()
-  message("Start updating file index")
-  Thread.new {
-    recursively_find_files()
-    message("Finnish updating file index")
-  }
-end
-
-def recursively_find_files()
-  debug("START find files")
-  dlist = []
-
-  for d in $search_dirs
-    debug("FIND FILEs IN #{d}")
-    dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
-         debug("FIND FILEs IN #{d} END")   end   #$dir_list = Dir.glob('./**/*').select { |e| File.file? e }
-  debug("END find files2")
-  $dir_list = dlist
-  debug("END find files")
-  return $dir_list
-end
-
-def filter_files(search_str)
-  dir_hash = {}
-  scores = Parallel.map($dir_list, in_threads: 8) do |file|
-    [file, srn_dst(search_str, file)]
-  end
-  for s in scores
-    dir_hash[s[0]] = s[1] if s[1] > 0
-  end
-  # debug scores
-  dir_hash = dir_hash.sort_by { |k, v| -v }
-  dir_hash = dir_hash[0..20]
-  dir_hash.map do |file, d|
-    debug "D:#{d} #{file}"
+  def gui_file_finder_update_callback(search_str = "")
+    debug "FILE FINDER UPDATE CALLBACK: #{search_str}"
+    if (search_str.size > 1)
+      files = filter_files(search_str)
+      @file_search_list = files
+      return files
+      #debug files.inspect
+      #return files.values
+    end
+    return []
   end
-  return dir_hash
-end
 
-def gui_file_finder_update_callback(search_str = "")
-  debug "FILE FINDER UPDATE CALLBACK: #{search_str}"
-  if (search_str.size > 1)
-    files = filter_files(search_str)
-    $file_search_list = files
-    return files
-    #debug files.inspect
-    #return files.values
+  def gui_file_finder_select_callback(search_str, idx)
+    selected_file = @file_search_list[idx][0]
+    debug "FILE FINDER SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
+    gui_select_window_close(0)
+    open_new_file(selected_file)
   end
-  return []
-end
 
-def gui_file_finder_select_callback(search_str, idx)
-  selected_file = $file_search_list[idx][0]
-  debug "FILE FINDER SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"
-  gui_select_window_close(0)
-  open_new_file(selected_file)
-end
+  def self.recursively_find_files()
+    debug("START find files")
+    dlist = []
 
-def gui_file_finder_handle_char(c)
-  debug "BUFFER SELECTOR INPUT CHAR: #{c}"
-  buffer_i = $select_keys.index(c)
-  if buffer_i != nil
-    gui_file_finder_callback(buffer_i)
+    for d in $search_dirs
+      debug("FIND FILEs IN #{d}")
+      dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
+      debug("FIND FILEs IN #{d} END")
+    end   #@dir_list = Dir.glob('./**/*').select { |e| File.file? e }
+    debug("END find files2")
+    @dir_list = dlist
+    debug("END find files")
+    return @dir_list
   end
-end
 
-# TODO: delete?
-def gui_file_finder_init()
-  $kbd.add_mode("Z", :filefinder)
-  bindkey "Z enter", "$kbd.set_mode(:command)"
-  bindkey "Z return", "$kbd.set_mode(:command)"
+  def filter_files(search_str)
+    dir_hash = {}
+    scores = Parallel.map(@dir_list, in_threads: 8) do |file|
+      [file, srn_dst(search_str, file)]
+    end
+    for s in scores
+      dir_hash[s[0]] = s[1] if s[1] > 0
+    end
+    # debug scores
+    dir_hash = dir_hash.sort_by { |k, v| -v }
+    dir_hash = dir_hash[0..20]
+    dir_hash.map do |file, d|
+      debug "D:#{d} #{file}"
+    end
+    return dir_hash
+  end
 end
+

data/lib/vimamsa/file_history.rb

@@ -8,8 +8,8 @@ class FileHistory
     # x = self.method("update")
     # x.call("ASFASF")
 
-    $hook.register(:change_buffer, self.method("update"))
-    $hook.register(:shutdown, self.method("save"))
+    vma.hook.register(:change_buffer, self.method("update"))
+    vma.hook.register(:shutdown, self.method("save"))
 
     reg_act(:fhist_remove_nonexisting, proc { remove_nonexisting }, "Cleanup history, remove non-existing files")
 
@@ -98,7 +98,6 @@ def gui_file_history_update_callback(search_str = "")
 end
 
 def gui_file_history_select_callback(search_str, idx)
-  # selected_file = $file_search_list[idx][0]
   selected_file = $search_list[idx][0]
 
   debug "FILE HISTORY SELECT CALLBACK: s=#{search_str},i=#{idx}: #{selected_file}"

data/lib/vimamsa/file_manager.rb

@@ -1,4 +1,3 @@
-
 class FileManager
   @@cur
 
@@ -28,14 +27,14 @@ class FileManager
 
     # bindkey "C o", :delete_state
 
-    $kbd.add_minor_mode("fexp", :file_exp, :command)
+    vma.kbd.add_minor_mode("fexp", :file_exp, :command)
 
     bindkey "fexp o m", :fexp_sort_mtime
     bindkey "fexp o f", :fexp_sort_fname
 
     # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
-    bindkey "fexp esc", [:fexp_quit, proc { $kbd.set_mode(:command) }, ""]
+    bindkey "fexp esc", [:fexp_quit, proc { FileManager.cur.quit }, ""]
     bindkey "fexp enter", :fexp_select
     bindkey "fexp l", :fexp_select
 
@@ -66,6 +65,8 @@ class FileManager
 
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
+
+    vma.buffers.last_dir = dirpath
     dirpath = File.expand_path(dirpath)
     @header = []
     @header << "#{dirpath}"
@@ -92,9 +93,7 @@ class FileManager
       end
     end
 
-    # sort_by = :mtime
-    # sort_by = :name
-    # Ripl.start :binding => binding
+
     @cfiles.sort_by! { |x| x[1].mtime }.reverse! if @sort_by == :mtime
     @cfiles.sort_by! { |x| x[1].size }.reverse! if @sort_by == :size
     @cfiles.sort_by! { |x| x[0] } if @sort_by == :name
@@ -112,7 +111,7 @@ class FileManager
     end
 
     if @buf.nil?
-      @buf = create_new_file(nil, s)
+      @buf = create_new_buffer(s,"filemgr")
       @buf.module = self
       @buf.active_kbd_mode = :file_exp
     else
@@ -140,6 +139,9 @@ class FileManager
     else
       open_with_default_program(fn)
     end
-    # debug l.inspect
+  end
+
+  def quit
+    @buf.close
   end
 end