vimamsa 0.1.22 → 0.1.24

data/lib/vimamsa/editor.rb

@@ -1,9 +1,5 @@
 require "pty"
 
-# 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, :actions
@@ -110,8 +106,7 @@ class Editor
 
     settings_path = get_dot_path("settings.rb")
     if File.exist?(settings_path)
-      #  = eval(IO.read(settings_path))
-      #TODO
+      eval(IO.read(settings_path))
     end
 
     custom_script = read_file("", custom_fn)
@@ -132,6 +127,22 @@ class Editor
       #TODO: if language enabled in config?
     end
 
+    # Load each module that is enabled in settings.
+    # Each module lives in modules/<name>/<name>.rb and may optionally define
+    # <name>_init to register actions, key bindings, etc.
+    Dir.glob(ppath("modules/*/")).sort.each do |mod_dir|
+      mod_name = File.basename(mod_dir)
+      if cnf.modules.public_send(mod_name).enabled?
+        main_file = File.join(mod_dir, "#{mod_name}.rb")
+        if File.exist?(main_file)
+          load main_file
+          # Call <name>_init if the module defines it.
+          init_fn = "#{mod_name}_init"
+          send(init_fn) if respond_to?(init_fn, true)
+        end
+      end
+    end
+
     fname = nil
     if cnf.startup_file?
       fname_ = File.expand_path(cnf.startup_file!)
@@ -151,6 +162,8 @@ class Editor
       end
     end
 
+    argv_has_files = ARGV.any? { |a| File.file?(File.expand_path(a)) }
+
     if fname
       open_new_file(fname)
     else
@@ -167,7 +180,20 @@ class Editor
     # To access via vma.FileFinder
     # self.define_singleton_method(:FileFinder) { @_plugins[:FileFinder] }
 
+    check_session_restore unless argv_has_files
+
     @hook.call(:after_init)
+
+    if ARGV.include?("--test")
+      test_files = ARGV.select { |a| a.end_with?(".rb") && File.file?(a) }
+      run_as_idle proc {
+        test_files.each { |f| load f }
+        success = run_vma_tests
+        # Defer shutdown so GTK can drain all pending idle callbacks from test
+        # teardown before widget destruction begins (avoids heap corruption).
+        GLib::Timeout.add(300) { shutdown(); false }
+      }
+    end
   end
 
   def register_plugin(name, obj)
@@ -203,6 +229,7 @@ class Editor
 
   def save_var_to_file(varname, vardata)
     fn = get_dot_path(varname)
+    #TODO: check that save path is safe
     f = File.open(fn, "w")
     File.binwrite(f, vardata)
     f.close
@@ -225,6 +252,7 @@ class Editor
   end
 
   def shutdown()
+    save_session
     @hook.call(:shutdown)
     save_state
     @gui.quit
@@ -233,6 +261,45 @@ class Editor
   def save_state
   end
 
+  def save_session
+    fnames = vma.buffers.list
+      .map { |b| b.fname }
+      .compact
+      .select { |f| File.exist?(f) }
+    IO.write(get_dot_path("session.txt"), fnames.join("\n") + "\n")
+  rescue => ex
+    debug "save_session failed: #{ex}"
+  end
+
+  def check_session_restore
+    session_path = get_dot_path("session.txt")
+    return unless File.exist?(session_path)
+
+    fnames = File.read(session_path).lines.map(&:strip).reject(&:empty?)
+    fnames.select! { |f| File.exist?(f) }
+    fnames.reject! { |f| vma.buffers.get_buffer_by_filename(f) }
+    return if fnames.empty?
+
+    n = fnames.size
+    label = n == 1 ? "1 file" : "#{n} files"
+    params = {
+      "title" => "Restore previous session? (#{label})",
+      "inputs" => {
+        "yes_btn" => { :label => "Restore", :type => :button, :default_focus => true },
+        "no_btn"  => { :label => "No", :type => :button },
+      },
+      :callback => proc { |x|
+        if x["yes_btn"] == "submit"
+          initial = vma.buffers.list.find { |b| b.fname.nil? }
+          fnames.each { |f| load_buffer(f) }
+          initial&.close
+          message("Session restored: #{label}")
+        end
+      },
+    }
+    PopupFormGenerator.new(params).run
+  end
+
   def add_content_search_path(pathstr)
     p = File.expand_path(pathstr)
     if !@file_content_search_paths.include?(p)
@@ -362,73 +429,13 @@ def set_next_command_count(num)
   debug("NEXT COMMAND COUNT: #{$next_command_count}")
 end
 
-def start_minibuffer_cmd(bufname, bufstr, cmd)
-  vma.kbd.set_mode(:minibuffer)
-  $minibuffer = Buffer.new(bufstr, "")
-  $minibuffer.call_func = method(cmd)
-end
-
-
-def diff_buffer()
-  bufstr = ""
-  orig_path = vma.buf.fname
-  infile = Tempfile.new("out")
-  infile = Tempfile.new("in")
-  infile.write(vma.buf.to_s)
-  infile.flush
-  cmd = "diff -w '#{orig_path}' #{infile.path}"
-  # debug cmd
-  bufstr << run_cmd(cmd)
-  # debug bufstr
-  infile.close; infile.unlink
-  create_new_file(nil, bufstr)
-end
-
-def invoke_command()
-  start_minibuffer_cmd("", "", :execute_command)
-end
-
-def execute_command(input_str)
-  begin
-    out_str = eval(input_str, TOPLEVEL_BINDING) #TODO: Other binding?
-    $minibuffer.clear
-    $minibuffer << out_str.to_s #TODO: segfaults, why?
-  rescue SyntaxError
-    debug("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
-  end
-end
-
-def minibuffer_end()
-  debug "minibuffer_end"
-  vma.kbd.set_mode(:command)
-  minibuffer_input = $minibuffer.to_s[0..-2]
-  return $minibuffer.call_func.call(minibuffer_input)
-end
-
-def minibuffer_cancel()
-  debug "minibuffer_cancel"
-  vma.kbd.set_mode(:command)
-  minibuffer_input = $minibuffer.to_s[0..-2]
-  # $minibuffer.call_func.call('')
-end
-
-def minibuffer_new_char(c)
-  if c == "\r"
-    raise "Should not come here"
-    debug "MINIBUFFER END"
-  else
-    $minibuffer.insert_txt(c)
-    debug "MINIBUFFER: #{c}"
+def if_cmd_exists(cmd)
+  cmd = cmd.gsub(/[^a-zA-Z0-9_\-]/, '')
+  if !system("which #{cmd} > /dev/null 2>&1")
+    message("Command \"#{cmd}\" not found!")
+    return false
   end
-  #vma.buf = $minibuffer
-end
-
-# def readchar_new_char(c)
-# $input_char_call_func.call(c)
-# end
-
-def minibuffer_delete()
-  $minibuffer.delete(BACKWARD_CHAR)
+ return true
 end
 
 def error(str)
@@ -515,10 +522,13 @@ def load_buffer(fname)
   # If file already open in existing buffer
   existing_buffer = vma.buffers.get_buffer_by_filename(fname)
   if existing_buffer != nil
-    vma.buffers.add_buf_to_history(existing_buffer)
     return
   end
   return if !File.exist?(fname)
+  if Encrypt.is_encrypted?(fname)
+    decrypt_dialog(filename: fname)
+    return nil
+  end
   debug("LOAD BUFFER: #{fname}")
   buffer = Buffer.new(read_file("", fname), fname)
   # gui_set_current_buffer(buffer.id)
@@ -527,7 +537,6 @@ def load_buffer(fname)
   #buf = filter_buffer(buffer)
   #    debug("END FILTER: #{fname}")
   vma.buffers << buffer
-  #$buffer_history << vma.buffers.size - 1
   return buffer
 end
 
@@ -585,6 +594,7 @@ def open_new_file(filename, file_contents = "")
     fname = filename
     bu = load_buffer(fname)
     vma.buffers.set_current_buffer_by_id(bu.id)
+    bu.check_autosave_load
   end
   return bu
 end
@@ -595,14 +605,9 @@ def scan_word_start_marks(search_str)
   return wsmarks
 end
 
-def hook_draw()
-  # TODO: as hook.register
-  # easy_jump_draw()
-end
-
 def get_dot_path(sfx)
   dot_dir = File.expand_path("~/.config/vimamsa")
-  Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
+  FileUtils.mkdir_p(dot_dir) unless File.exist?(dot_dir)
   dpath = "#{dot_dir}/#{sfx}"
   return dpath
 end
@@ -619,6 +624,24 @@ def get_file_line_pointer(s)
   return nil
 end
 
+# Try to resolve a bare "filename.ext:line" reference (no directory component).
+# Searches the current buffer's directory and the last visited directory.
+def resolve_bare_file_line_pointer(s)
+  m = s.match(/\A([\w.\-]+\.[a-zA-Z0-9]+):(c?)(\d+)\z/)
+  return nil unless m
+  fname = m[1]
+  col   = m[2]
+  line  = m[3].to_i
+  dirs = []
+  dirs << File.dirname(vma.buf.fname) if vma.buf&.fname
+  dirs << bufs.last_dir              if bufs.last_dir
+  dirs.uniq.each do |dir|
+    candidate = File.join(dir, fname)
+    return [candidate, line, col] if File.exist?(candidate)
+  end
+  nil
+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
@@ -647,3 +670,49 @@ def find_project_dir_of_cur_buffer()
   # debug "Proj dir of current file: #{pdir}"
   return pdir
 end
+
+def reload_customrb
+  custom_fn = get_dot_path("custom.rb")
+  custom_script = read_file("", custom_fn)
+  eval(custom_script) if custom_script
+  message("Reloaded #{custom_fn}")
+end
+
+def save_settings_to_file
+  settings_path = get_dot_path("settings.rb")
+  lines = all_settings_defs.flat_map { |section| section[:settings] }.map do |s|
+    key_str = "cnf." + s[:key].join(".")
+    val = cnf_get(s[:key])
+    "#{key_str} = #{val.inspect}"
+  end
+  IO.write(settings_path, lines.join("\n") + "\n")
+  message("Settings saved to #{settings_path}")
+end
+
+DEMO_FILES = ["demo.txt", "sheep.jpg", "README.md"]
+
+def install_demo_files
+  dest_dir = File.expand_path("~/Documents/VimamsaDemo")
+  mkdir_if_not_exists dest_dir
+  title = "Install demo files to #{dest_dir}?"
+  Gui.confirm(title, proc { |x| install_demo_files_callback(x) })
+end
+
+def install_demo_files_callback(x)
+  return unless x["yes_btn"] == "submit"
+  src_dir = File.expand_path("../..", __dir__)
+  dest_dir = File.expand_path("~/Documents/VimamsaDemo")
+  FileUtils.mkdir_p(dest_dir)
+  DEMO_FILES.each do |fname|
+    src = File.join(src_dir, fname)
+    dst = File.join(dest_dir, fname)
+    if File.exist?(src)
+      FileUtils.cp(src, dst)
+    else
+      message("Demo file not found: #{src}")
+    end
+  end
+  open_new_file(File.join(dest_dir, "demo.txt"))
+  message("Demo files installed to #{dest_dir}")
+end
+

data/lib/vimamsa/file_finder.rb

@@ -39,12 +39,16 @@ class FileFinder
 
   def initialize()
     vma.hook.register(:shutdown, self.method("save"))
-    @@dir_list = vma.marshal_load("file_index")
+    # Load saved file list on startup (disabled for now, TODO)
+    # @@dir_list = vma.marshal_load("file_index")
     @@dir_list ||= []
-    update_search_idx
+    # update_search_idx
+    FileFinder.recursively_find_files
+    message("FileFinder initialized, directories: #{cnf.search_dirs!}")
   end
 
   def self.update_search_idx
+  
     Thread.new {
       sleep 0.1
       @@idx = StringIndex.new