vimamsa 0.1.22 → 0.1.24

data/lib/vimamsa/gui_form_generator.rb

@@ -25,6 +25,8 @@ class PopupFormGenerator
 
     @callback = params[:callback]
     @window.title = ""
+    @window.set_transient_for($vmag.window) if $vmag&.window
+    @window.modal = true
 
     frame = Gtk::Frame.new()
     frame.margin_bottom = 8
@@ -56,7 +58,7 @@ class PopupFormGenerator
     @vals = {}
     @default_button = nil
 
-    for id, elem in params["inputs"]
+    params["inputs"].each do |id, elem|
       if elem[:type] == :button
         button = Gtk::Button.new(:label => elem[:label])
         hbox.append(button)
@@ -92,7 +94,7 @@ class PopupFormGenerator
           end
         end
       end
-    end
+    end  # each
 
     vbox.append(hbox)
 

data/lib/vimamsa/gui_func_panel.rb

@@ -0,0 +1,127 @@
+# Left-side panel that displays LSP-provided functions/methods for the current buffer,
+# grouped by the class or module they belong to.
+class FuncPanel
+  COL_NAME = 0  # Tree column index: display name (class name or function name)
+  COL_LINE = 1  # Tree column index: 1-based line number to jump to; 0 = not a jump target
+
+  def initialize
+    # @store is the data model: a tree (not flat list) so we can nest functions
+    # under their parent class. Two columns: the display string and the line number.
+    @store = Gtk::TreeStore.new(String, Integer)
+
+    # @tree is the GTK widget that renders @store. It holds expand/collapse state
+    # and handles row selection. Backed by @store — clearing @store clears the view.
+    @tree = Gtk::TreeView.new(@store)
+    @tree.headers_visible = false
+    @tree.activate_on_single_click = true
+
+    # Single text column; ellipsize at end so long names don't overflow the panel width.
+    renderer = Gtk::CellRendererText.new
+    renderer.ellipsize = Pango::EllipsizeMode::END
+    col = Gtk::TreeViewColumn.new("", renderer, text: COL_NAME)
+    col.expand = true
+    @tree.append_column(col)
+
+    # Jump to the function's line when a row is clicked.
+    # Class header rows have COL_LINE = 0 and are skipped (no jump).
+    @tree.signal_connect("row-activated") do |_tv, path, _col|
+      iter = @store.get_iter(path)
+      next if iter.nil?
+      line = iter[COL_LINE]
+      next if line <= 0
+      vma.buf.jump_to_line(line)
+    end
+
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:never, :automatic)
+    sw.set_child(@tree)
+    sw.vexpand = true
+
+    header = Gtk::Label.new("<span weight='ultrabold'>Functions</span> (click to jump)")
+    header.use_markup = true
+
+    header.xalign = 0.0
+    header.margin_start = 6
+    header.margin_top = 4
+    header.margin_bottom = 2
+
+    # @box is the outermost widget: header label on top, scrollable tree below.
+    @box = Gtk::Box.new(:vertical, 0)
+    @box.set_size_request(160, -1)
+    @box.append(header)
+    @box.append(sw)
+  end
+
+  # Returns the outermost widget to embed in the paned layout.
+  def widget
+    @box
+  end
+
+  # Asynchronously fetch functions from the LSP server and repopulate @store.
+  # The LSP call runs in a background thread; the GTK update is marshalled back
+  # to the main thread via GLib::Idle.add to avoid threading issues.
+  def refresh
+    buf = vma.buf
+    unless buf&.fname
+      set_placeholder("(no file)")
+      return
+    end
+    lsp = LangSrv.get(buf.lang)
+    unless lsp
+      set_placeholder("(no LSP)")
+      return
+    end
+    fpath = buf.fname
+    Thread.new {
+      # groups: [{name:, line:, functions: [{name:, line:}, ...]}, ...]
+      # name: nil means top-level functions with no enclosing class.
+      groups = lsp.document_functions_grouped(fpath)
+      GLib::Idle.add {
+        @store.clear
+        if groups.nil? || groups.empty?
+          set_placeholder("(no functions)")
+        else
+          populate(groups)
+        end
+        false  # returning false removes this idle callback after one run
+      }
+    }
+  end
+
+  private
+
+  # Fill @store from the grouped function list.
+  # Named groups become collapsible parent rows; top-level functions are root rows.
+  def populate(groups)
+    groups.each do |g|
+      if g[:name]
+        # Class/module header: parent row with the class name (and its own line number
+        # so clicking it jumps to the class definition when line > 0).
+        header = @store.append(nil)
+        header[COL_NAME] = g[:name]
+        header[COL_LINE] = g[:line] || 0
+        g[:functions].each do |f|
+          child = @store.append(header)  # appended under the class header
+          child[COL_NAME] = f[:name]
+          child[COL_LINE] = f[:line]
+        end
+      else
+        # Top-level functions (not inside any class): added as root rows directly.
+        g[:functions].each do |f|
+          row = @store.append(nil)
+          row[COL_NAME] = f[:name]
+          row[COL_LINE] = f[:line]
+        end
+      end
+    end
+    @tree.expand_all  # show all classes expanded by default
+  end
+
+  # Replace the entire store contents with a single non-clickable status message.
+  def set_placeholder(text)
+    @store.clear
+    iter = @store.append(nil)
+    iter[COL_NAME] = text
+    iter[COL_LINE] = 0
+  end
+end

data/lib/vimamsa/gui_image.rb

@@ -36,14 +36,12 @@ class ResizableImage < Gtk::DrawingArea
     @draw_image = pb
     @oldimg = pb
     #TODO: Should be better way to compensate for the gutter
-    self.set_size_request(pb.width+@view.gutter_width, pb.height)
+    self.set_size_request(pb.width, pb.height) # +@view.gutter_width?
   end
 
   def do_draw(da, cr)
     # puts @fpath
-    # Ripl.start :binding => binding
-
-    cr.set_source_pixbuf(@draw_image, @view.gutter_width, 0)
+    cr.set_source_pixbuf(@draw_image, 0, 0) # @view.gutter_width
     cr.paint
   end
 end

data/lib/vimamsa/gui_menu.rb

@@ -29,6 +29,7 @@ module Vimamsa
       add_to_menu "File.New", { :label => "New file", :action => :buf_new }
       add_to_menu "File.Revert", { :label => "Reload file from disk", :action => :buf_revert }
       add_to_menu "File.List", { :label => "List open files", :action => :start_buf_manager }
+      add_to_menu "File.Close", { :label => "Close file", :action => :close_current_buffer }
 
       add_to_menu "File.Quit", { :label => "Quit", :action => :quit }
 
@@ -39,7 +40,10 @@ module Vimamsa
 
       # add_to_menu "Edit.StartCompletion", { :label => "StartCompletion", :action => :start_autocomplete }
       # add_to_menu "Edit.ShowCompletion", { :label => "ShowCompletion", :action => :show_autocomplete }
-      add_to_menu "Edit.CustomRb", { :action => :edit_customrb }
+
+      add_to_menu "Settings.Preferences", { :label => "Preferences...", :action => :show_settings }
+      add_to_menu "Settings.Customize", { :action => :edit_customrb }
+      add_to_menu "Settings.ReloadCustom", { :action => :reload_customrb }
 
       add_to_menu "Actions.SearchForActions", { :label => "Search for Actions", :action => :search_actions }
 
@@ -48,18 +52,29 @@ module Vimamsa
       add_to_menu "Actions.FileHistoryFinder", { :label => "Search files in history", :action => :gui_file_history_finder }
 
       add_to_menu "Actions.experimental.Diff", { :label => "Show Diff of\nunsaved changes", :action => :diff_buffer }
+      add_to_menu "Actions.experimental.GitDiff", { :label => "Show git diff", :action => :git_diff_buffer }
+      add_to_menu "Actions.experimental.GitDiffW", { :label => "Show git diff -w (repo)", :action => :git_diff_w }
 
+      add_to_menu "Actions.experimental.PrintBufferAccessList", { :label => "Print buffers by access time", :action => :print_buffer_access_list }
       add_to_menu "Actions.experimental.EnableDebug", { :label => "Enable debug", :action => :enable_debug }
       add_to_menu "Actions.experimental.DisableDebug", { :label => "Disable debug", :action => :disable_debug }
       add_to_menu "Actions.experimental.ShowImages", { :label => "Show images ⟦img:path⟧", :action => :show_images }
+      
+      add_to_menu "Actions.experimental.ShowImages", { :action => :experimental_eval }
+      
 
       add_to_menu "Actions.debug.dumpkbd", { :label => "Dump kbd state", :action => :kbd_dump_state }
+      add_to_menu "Actions.debug.ToggleKbdPassthrough", { :label => "Toggle kbd event passthrough", :action => :toggle_kbd_passthrough }
 
       add_to_menu "View.BufferManager", { :label => "Show open files", :action => :start_buf_manager }
       add_to_menu "View.TwoColumn", { :label => "Toggle two column mode", :action => :toggle_two_column }
+      add_to_menu "View.FilePanel", { :label => "Toggle file panel", :action => :toggle_file_panel }
+      add_to_menu "View.FuncPanel", { :label => "Toggle function panel (LSP)", :action => :toggle_func_panel }
+      add_to_menu "View.MsgHistory", { :label => "Message history", :action => :show_message_history }
 
       add_to_menu "Actions.EncryptFile", { :label => "Encrypt file", :action => :encrypt_file }
       add_to_menu "Help.KeyBindings", { :label => "Show key bindings", :action => :show_key_bindings }
+      add_to_menu "Help.InstallDemo", { :action => :install_demo_files }
 
       #TODO: :auto_indent_buffer
 
@@ -70,6 +85,11 @@ module Vimamsa
     def initialize(menubar, _app)
       @app = _app
       @nfo = {}
+      @menubar = menubar
+      # Gio::Menu for the "Modules" top-level menu, created on first use.
+      @module_menu = nil
+      # Ordered list of action symbols in @module_menu, used to find removal positions.
+      @module_actions = []
 
       add_menu_items
 
@@ -78,6 +98,39 @@ module Vimamsa
       end
     end
 
+    # Add a menu item under the top-level "Modules" menu.
+    # Creates the Modules menu the first time it is called.
+    def add_module_action(action, label)
+      if @module_menu.nil?
+        @module_menu = Gio::Menu.new
+        modules_item = Gio::MenuItem.new("Modules", nil)
+        modules_item.submenu = @module_menu
+        @menubar.append_item(modules_item)
+      end
+
+      act = Gio::SimpleAction.new(action.to_s)
+      @app.add_action(act)
+      act.signal_connect("activate") { call_action(action) }
+
+      item = Gio::MenuItem.new(label, "app.#{action}")
+      @module_menu.append_item(item)
+      @module_actions << action
+    end
+
+    # Remove a previously added module menu item.
+    def remove_module_action(action)
+      idx = @module_actions.index(action)
+      return if idx.nil?
+      @module_menu.remove(idx)
+      @module_actions.delete_at(idx)
+      @app.remove_action(action.to_s)
+    end
+
+    # Return true if action was added via add_module_action and not yet removed.
+    def module_action?(action)
+      @module_actions.include?(action)
+    end
+
     def build_menu(nfo, parent)
       menu = Gio::Menu.new
       if nfo[:action]

data/lib/vimamsa/gui_select_window.rb

@@ -30,18 +30,19 @@ class SelectUpdateWindow
   end
 
   def set_selected_row(rownum)
+    count = @model.count
+    return if count == 0
     rownum = 0 if rownum < 0
+    rownum = count - 1 if rownum >= count
     @selected_row = rownum
-
-    if @model.count > 0
-      path = Gtk::TreePath.new(@selected_row.to_s)
-      iter = @model.get_iter(path)
-      @tv.selection.select_iter(iter)
-    end
+    path = Gtk::TreePath.new(@selected_row.to_s)
+    iter = @model.get_iter(path)
+    @tv.selection.select_iter(iter)
   end
 
   def initialize(main_window, item_list, jump_keys, select_callback, update_callback, opt = {})
     @window = Gtk::Window.new()
+    @window.set_transient_for($vmag.window) if $vmag&.window
     # @window.screen = main_window.screen
     @window.title = ""
     if !opt[:title].nil?
@@ -125,6 +126,17 @@ class SelectUpdateWindow
         @window.destroy
         # debug iter[1].inspect
         true
+      elsif keyval == Gdk::Keyval::KEY_Delete && @opt[:delete_callback]
+        path = Gtk::TreePath.new(@selected_row.to_s)
+        iter = @model.get_iter(path)
+        next false unless iter
+        name = iter[COLUMN_DESCRIPTION]
+        refresh = proc {
+          update_item_list(@update_callback.call(@entry.text))
+          @window.present
+        }
+        @opt[:delete_callback].call(name, refresh)
+        true
       elsif keyval == Gdk::Keyval::KEY_Escape
         @window.destroy
         true