vimamsa 0.1.13 → 0.1.14

data/lib/vimamsa/conf.rb

@@ -13,18 +13,143 @@ def setcnf(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", ".py"]
 setcnf :default_search_extensions, ["txt", "rb"]
 
-
 setcnf "log.verbose", 1
-setcnf :tab_width, 4
 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:
+#   cnf.foo.bar.baz = 3
+
+#To get conf value:
+# cnf.foo.bar.baz?
+# cnf.foo.bar.baz!
+# get(cnf.foo.bar.baz)
+# (All get the same result)
+
+class ConfId
+  def initialize(first)
+    @id = [first]
+  end
+
+  def method_missing(method_name, *args)
+    # pp "asize:#{args.size}"
+    if m = method_name.match(/(.*)=$/)
+      @id << m[1].to_sym
+      # pp [@id, args[0]]
+      set(self, args[0])
+      return args[0]
+    elsif m = method_name.match(/(.*)[\!\?]$/)
+      @id << m[1].to_sym
+      r = get(self)
+
+      if r.class == Hash and r.empty?
+        # The accessed key was not defined
+        return nil
+      else
+        return r
+      end
+    else
+      @id << method_name
+    end
+
+    return self
+  end
+
+  def to_s
+    @id.join(".")
+  end
+
+  def to_a
+    return @id
+  end
+end
+
+class Conf
+  attr_reader :confh
+
+  def initialize()
+    @id = []
+    @confh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
+  end
+
+  def method_missing(method_name, *args)
+    c = ConfId.new(method_name)
+
+    #TODO: improve
+    if m = method_name.match(/(.*)[\!\?]$/)
+      c = ConfId.new(m[1])
+      return get(c)
+    end
+
+    if m = method_name.match(/(.*)=$/)
+      c = ConfId.new(m[1])
+      set(c, args[0])
+      return args[0]
+    end
+
+    return c
+  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()
+  return $vimamsa_conf
+end
+
+cnf.indent_based_on_last_line = true
+cnf.extensions_to_open = [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js", ".py"]
+cnf.default_search_extensions = ["txt", "rb"]
+
+cnf.log.verbose = 1
+cnf.lsp.enabled = false
+cnf.fexp.experimental = false
+cnf.experimental = false
+
+cnf.tab.width = 2
+cnf.tab.to_spaces_default = false
+cnf.tab.to_spaces_languages = ["c", "java", "ruby", "hyperplaintext", "php"]
+cnf.tab.to_spaces_not_languages = ["makefile"]
+cnf.workspace_folders = []
+
+cnf.match.highlight.color = "#10bd8e"
+

data/lib/vimamsa/debug.rb

@@ -1,7 +1,7 @@
 require "fileutils"
 
 def debug(message, severity = 1)
-  if $debug
+  if cnf.debug?
     if severity > 1
       # Add red colour and bold for attention
       # https://en.wikipedia.org/wiki/ANSI_escape_code
@@ -18,7 +18,7 @@ def debug_print_buffer(c)
 end
 
 def debug_dump_clipboard()
-  puts $clipboard.inspect
+  puts vma.clipboard.inspect
 end
 
 def debug_dump_deltas()
@@ -59,8 +59,8 @@ def savedebug(message, e)
   dbginfo["trace_str"] = dbginfo["trace"].join("\n")
   dbginfo["edit_history"] = buf.edit_history
   dbginfo["cnf"] = $cnf
-  dbginfo["register"] = $register
-  dbginfo["clipboard"] = $clipboard
+  dbginfo["register"] = vma.register
+  dbginfo["clipboard"] = vma.clipboard
   # dbginfo["last_event"] = $last_event
   dbginfo["buffer"] = {}
   dbginfo["buffer"]["str"] = buf.to_s
@@ -79,10 +79,6 @@ def savedebug(message, e)
   puts save_fn_json
 end
 
-def run_tests()
-  run_test("01")
-  run_test("02")
-end
 
 def run_test(test_id)
   target_results = read_file("", "tests/test_#{test_id}_output.txt")

data/lib/vimamsa/editor.rb

@@ -1,35 +1,13 @@
 require "pty"
 
-def exec_in_terminal(cmd, autoclose = false)
-  # debug "CMD:#{cmd}"
-
-  # global to prevent garbage collect unlink
-  $initf = Tempfile.new("bashinit")
-  # debug $initf.path
-  $initf.write(cmd)
-  if autoclose
-    $initf.write("\nsleep 10; exit;\n")
-    $initf.write("rm #{$initf.path}\n")
-  else
-    $initf.write("rm #{$initf.path}\n")
-    $initf.write("\nexec bash\n")
-  end
-  $initf.close
-  # PTY.spawn("gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash")
-  # fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
-  # Just another execution
-  fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
-end
-
 def handle_drag_and_drop(fname)
   debug "EDITOR:handle_drag_and_drop"
   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
+  attr_accessor :converters, :fh, :paint_stack, :kbd, :langsrv, :register, :cur_register, :clipboard
   #attr_writer :call_func, :update_highlight
 
   def initialize()
@@ -46,6 +24,19 @@ class Editor
     @paint_stack = []
     @_plugins = {}
     @errors
+    @register = Hash.new("")
+    @cur_register = "a"
+    @clipboard = Clipboard.new
+  end
+
+  def set_register(char)
+    @cur_register = char
+    message("Set register #{char}")
+  end
+
+  def paste_register(char)
+    $c = @cur_register #TODO:??
+    message("Paste: #{$c}")
   end
 
   def open_file_listener(added)
@@ -73,8 +64,7 @@ class Editor
     @hook = $hook
     register_plugin(:Hook, @hook)
     @macro = Macro.new
-    $macro = @macro
-    register_plugin(:Macro, $macro)
+    register_plugin(:Macro, @macro)
     $search = Search.new
     register_plugin(:Search, $search)
 
@@ -91,7 +81,6 @@ class Editor
     require "vimamsa/key_bindings_vimlike"
     sleep(0.03)
 
-    FileManager.init
     BufferManager.init
 
     @gui.init_menu
@@ -130,13 +119,16 @@ class Editor
     custom_script = read_file("", custom_fn)
     eval(custom_script) if custom_script
 
+    Grep.init
+    FileManager.init
+
     if conf(:enable_lsp)
       require "vimamsa/langservp"
       require "vimamsa/audio" # TODO:config
       @langsrv["ruby"] = LangSrv.new("ruby")
       @langsrv["cpp"] = LangSrv.new("cpp")
     end
-    
+
     # build_options
 
     fname = nil
@@ -306,35 +298,28 @@ 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]
-    #TODO: HACK
-    $paste_lines = false
+class Clipboard
+  def initialize
+    @clipboard = []
   end
-  $clipboard << clipboard_contents
-  # debug $clipboard[-1]
-  $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
-end
 
-def get_clipboard()
-  return $clipboard[-1]
-end
+  def set(s)
+    if !(s.class <= String) or s.size == 0
+      debug s.inspect
+      debug [s, s.class, s.size]
+      log_error("s.class != String or s.size == 0")
+      return
+    end
+    @clipboard << s
+    set_system_clipboard(s)
+    vma.register[vma.cur_register] = s
+    debug "SET CLIPBOARD: [#{s}]"
+    debug "REGISTER: #{vma.cur_register}:#{vma.register[vma.cur_register]}"
+  end
 
-def set_clipboard(s)
-  if !(s.class <= String) or s.size == 0
-    debug s.inspect
-    debug [s, s.class, s.size]
-    log_error("s.class != String or s.size == 0")
-    # Ripl.start :binding => binding
-    return
+  def get()
+    return @clipboard[-1]
   end
-  $clipboard << s
-  set_system_clipboard(s)
-  $register[$cur_register] = s
-  debug "SET CLIPBOARD: [#{s}]"
-  debug "REGISTER: #{$cur_register}:#{$register[$cur_register]}"
 end
 
 def set_cursor_pos(new_pos)
@@ -558,21 +543,21 @@ def load_buffer(fname)
   return buffer
 end
 
-def jump_to_file(filename, linenum = nil, charn = nil)
+def jump_to_file(filename, tnum = nil, charn = nil)
   open_new_file(filename)
 
   # Link to character position
   if !charn.nil?
     if charn == "c"
-      buf.jump_to_pos(linenum)
+      buf.jump_to_pos(tnum) # tnum=character position
       center_on_current_line
       return
     end
   end
 
   # Link to line
-  if !linenum.nil?
-    buf.jump_to_line(linenum)
+  if !tnum.nil?
+    buf.jump_to_line(tnum) # tnum=line position
     center_on_current_line
     return
   end
@@ -633,28 +618,6 @@ def get_file_line_pointer(s)
   return nil
 end
 
-# TODO: Implement using https://github.com/blackwinter/ruby-filemagic
-def file_is_text_file(fpath)
-  debug "file_is_text_file(#{fpath})"
-  fpath = File.expand_path(fpath)
-  return false if !File.exist?(fpath)
-  r = exec_cmd("file", fpath)
-  debug "DEBUG:#{r}"
-  return true if r.match(/UTF-8.*text/)
-  return true if r.match(/ASCII.*text/)
-  return false
-end
-
-def set_register(char)
-  $cur_register = char
-  message("Set register #{char}")
-end
-
-def paste_register(char)
-  $c = $register[char]
-  message("Paste: #{$c}")
-end
-
 def find_project_dir_of_fn(fn)
   pcomp = Pathname.new(fn).each_filename.to_a
   parent_dirs = (0..(pcomp.size - 2)).collect { |x| "/" + pcomp[0..x].join("/") }.reverse

data/lib/vimamsa/encrypt.rb

@@ -1,4 +1,3 @@
-
 require "openssl"
 
 class Encrypt
@@ -13,16 +12,16 @@ class Encrypt
   end
 
   def encrypt(text)
-    cipher=@enc
+    cipher = @enc
     encrypted = cipher.update text
     encrypted << cipher.final
-    encrypted = encrypted.unpack('H*')[0].upcase
+    encrypted = encrypted.unpack("H*")[0].upcase
     @enc.reset
     return encrypted
   end
 
   def decrypt(encrypted)
-    cipher=@dec
+    cipher = @dec
     encrypted = [encrypted].pack("H*").unpack("C*").pack("c*")
     plain = cipher.update encrypted
     plain << cipher.final
@@ -32,16 +31,12 @@ class Encrypt
   end
 end
 
-def decrypt_cur_buffer(password, b = nil)
-  vma.buf.decrypt(password)
-end
 
 def encrypt_cur_buffer()
-  callback = proc{|x|encrypt_cur_buffer_callback(x)}
-  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback,{:hide=>true})
+  callback = proc { |x| encrypt_cur_buffer_callback(x) }
+  gui_one_input_action("Encrypt", "Password:", "Encrypt", callback, { :hide => true })
 end
 
-def encrypt_cur_buffer_callback(password,b=nil)
+def encrypt_cur_buffer_callback(password, b = nil)
   vma.buf.set_encrypted(password)
 end
-

data/lib/vimamsa/file_manager.rb

@@ -1,8 +1,12 @@
+require "fileutils"
+
 class FileManager
   @@cur
 
   def initialize()
     @buf = nil
+    @cut_files = []
+    @copied_files = []
   end
 
   def self.chdir_parent()
@@ -14,7 +18,7 @@ class FileManager
   end
 
   def self.init()
-    reg_act(:start_file_selector, proc { FileManager.new.run; $kbd.set_mode(:file_exp) }, "File selector")
+    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(:fexp_chdir_parent, proc { FileManager.chdir_parent }, "File selector")
     reg_act(:fexp_select, proc { buf.module.select_line }, "")
@@ -32,6 +36,19 @@ class FileManager
     bindkey "fexp o m", :fexp_sort_mtime
     bindkey "fexp o f", :fexp_sort_fname
 
+    # These are not yet safe to use
+    if cnf.fexp.experimental?
+      reg_act(:fexp_cut_file, proc { FileManager.cur.cut_file }, "Cut file (to paste elsewhere)")
+      reg_act(:fexp_copy_file, proc { FileManager.cur.copy_file }, "Copy file (to paste elsewhere)")
+      reg_act(:fexp_delete_file, proc { FileManager.cur.delete_file }, "Delete current file")
+      reg_act(:fexp_paste_files, proc { FileManager.cur.paste_files }, "Move previously cut files here")
+
+      bindkey "fexp d d", :fexp_cut_file
+      bindkey "fexp y y", :fexp_copy_file
+      bindkey "fexp d D", :fexp_delete_file
+      bindkey "fexp p p", :fexp_paste_files
+    end
+
     # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
     bindkey "fexp esc", [:fexp_quit, proc { FileManager.cur.quit }, ""]
@@ -63,18 +80,106 @@ class FileManager
     dir_to_buf(@ld)
   end
 
+  def paste_files
+    if !@cut_files.empty?
+      message "MOVE FILES #{@cut_files.join(",")} TO #{@ld} "
+      # Thread.new {
+      for fn in @cut_files
+        FileUtils.move(fn, @ld)
+        puts "FileUtils.move(#{fn}, #{@ld})"
+      end
+    elsif !@copied_files.empty?
+      for fn in @copied_files
+        bn = File.basename(fn)
+        bnwe = File.basename(fn, ".*")
+        ext = File.extname(fn)
+        dst = "#{@ld}/#{bn}"
+        break if !File.exist?(fn)
+        if dst == fn #or File.exist?(dst)
+          i = 1
+          exists = true
+          while File.exist?(dst)
+            dst = "#{@ld}/#{bnwe}_copy#{i}#{ext}"
+            i += 1
+          end
+        elsif File.exist?(dst)
+          message("File #{dst} already exists")
+          break
+          #TODO: confirm if user wants to replace existing file
+        end
+        message "FileUtils.copy_entry(#{fn}, #{dst})"
+        FileUtils.copy_entry(fn, dst, preserve = false, dereference_root = false, remove_destination = false)
+      end
+    else
+      message "Nothing to paste, cut/copy some files first!"
+      return
+    end
+    # }
+    @cut_files = []
+    @copied_files = []
+    refresh
+  end
+
+  def cut_file
+    fn = cur_file
+    debug "CUT FILE #{fn}", 2
+    @cut_files << fn
+    @copied_files = []
+  end
+
+  def copy_file
+    fn = cur_file
+    debug "COPY FILE #{fn}", 2
+    @copied_files << fn
+    @cut_files = []
+  end
+
+  def delete_file_confirmed(*args)
+    debug args, 2
+    fn = @file_to_delete
+    message "Deleting file #{fn}"
+    # FileUtils.remove_file(fn)
+    FileUtils.remove_entry_secure(fn, force = false)
+    refresh
+  end
+
+  def delete_file
+    fn = cur_file
+    if File.file?(fn)
+      @file_to_delete = fn #TODO: set as parameter to confirm_box
+      Gui.confirm("Delete the file? \r #{fn}",
+                  self.method("delete_file_confirmed"))
+    elsif File.directory?(fn)
+      @file_to_delete = fn #TODO: set as parameter to confirm_box
+      Gui.confirm("Delete the directory? \r #{fn}",
+                  self.method("delete_file_confirmed"))
+    else
+      message "Can't delete #{fn}"
+    end
+
+    # TODO: FileUtils.remove_dir
+
+    #TODO:
+  end
+
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
 
+    debug "last file: #{vma.buffers.last_file}", 2
+    lastf = vma.buffers.last_file
+    jumpto = nil
+    if File.dirname(lastf) == dirpath
+      jumpto = File.basename(lastf)
+    end
     vma.buffers.last_dir = dirpath
     dirpath = File.expand_path(dirpath)
     @header = []
     @header << "#{dirpath}"
     @header << "=" * 40
-    @ld = dirpath
+    @ld = dirpath # Path to current directory
     @dlist = Dir.children(@ld).sort
-    @cdirs = []
-    @cfiles = []
+    @cdirs = [] # Dirs in current directory
+    @cfiles = [] # Files in current directory
     for x in @dlist
       fpath = fullp(x)
 
@@ -93,7 +198,6 @@ class FileManager
       end
     end
 
-
     @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
@@ -105,29 +209,54 @@ class FileManager
     s << @cdirs.join("\n")
     s << "\n"
     s << "\n"
+    jumppos = nil
     for f in @cfiles
+      if f[0] == jumpto
+        jumppos = s.size
+      end
       s << "#{f[0]}\n"
       # s << @cfiles.join("\n")
     end
 
     if @buf.nil?
-      @buf = create_new_buffer(s,"filemgr")
+      @buf = create_new_buffer(s, "filemgr")
+      @buf.default_mode = :file_exp
       @buf.module = self
       @buf.active_kbd_mode = :file_exp
     else
       @buf.set_content(s)
     end
-    @buf.set_line_and_column_pos(@header.size, 0)
+    if jumppos
+      @buf.set_pos(jumppos)
+    else
+      @buf.set_line_and_column_pos(@header.size, 0)
+    end
   end
 
   def fullp(fn)
     "#{@ld}/#{fn}"
   end
 
+  def refresh
+    # TODO: only apply diff
+    lpos = @buf.lpos
+    # cpos = @buf.cpos
+    dir_to_buf(@ld)
+    @buf.set_line_and_column_pos(lpos, 0)
+  end
+
+  def cur_file
+    return nil if @buf.lpos < @header.size
+    fn = fullp(@buf.get_current_line[0..-2])
+    return fn
+  end
+
   def select_line
-    return if @buf.lpos < @header.size
+    # return if @buf.lpos < @header.size
     # debug "def select_line"
-    fn = fullp(@buf.get_current_line[0..-2])
+    # fn = fullp(@buf.get_current_line[0..-2])
+    fn = cur_file
+    return if fn.nil?
     if File.directory?(fn)
       debug "CHDIR: #{fn}"
       dir_to_buf(fn)