vimamsa 0.1.19 → 0.1.20

data/lib/vimamsa/gui_sourceview.rb

@@ -119,6 +119,21 @@ class VSourceView < GtkSource::View
     end
   end
 
+  def focus_out()
+      set_cursor_color(:inactive)
+      
+      # This does not seem to work: (TODO:why?)
+      # self.cursor_visible = false
+  end
+  
+  def focus_in()
+      set_cursor_color(@ctype)
+      self.cursor_visible = false
+      self.cursor_visible = true
+      self.grab_focus
+  end
+ 
+  
   def register_signals()
     check_controllers
 
@@ -581,34 +596,29 @@ class VSourceView < GtkSource::View
   end
 
   def draw_cursor
-    # if @tt.nil?
-    # @tt = buffer.create_tag("font_tag")
-    # @tt.font = "Arial"
-    # end
 
-    sv = vma.gui.sw.child
-    return if sv.nil? #TODO: should not happen?
+    sv = vma.gui.active_window[:sw].child
+    return if sv.nil?
+    if sv != self # if we are not the current buffer
+      sv.draw_cursor
+      return
+    end
+
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
     ctype = :visual if vma.buf.selection_active?
 
-    vma.gui.remove_overlay_cursor
     if [:command, :replace, :browse].include?(ctype)
       set_cursor_color(ctype)
 
-      sv.overwrite = true
-      # sv.cursor_visible = true
-      # sv.reset_cursor_blink
-      
-      # (Via trial and error) This combination is needed to make cursor visible:
-      sv.cursor_visible = false
-      sv.cursor_visible = true
-      
-      # sv.reset_cursor_blink
-      Gtk::Settings.default.gtk_cursor_blink = false
-      # Gtk::Settings.default.gtk_cursor_blink_time = 8000
-      # vma.gui.sw.child.toggle_cursor_visible
-      # vma.gui.sw.child.cursor_visible = true
+      if !self.overwrite?
+        self.overwrite = true
+
+        # (Via trial and error) This combination is needed to make cursor visible:
+        # TODO: determine why "self.cursor_visible = true" is not enough
+        self.cursor_visible = false
+        self.cursor_visible = true
+      end
     elsif ctype == :visual
       set_cursor_color(ctype)
       # debug "VISUAL MODE"
@@ -620,12 +630,11 @@ class VSourceView < GtkSource::View
       buffer.select_range(itr, itr2)
     elsif ctype == :insert
       set_cursor_color(ctype)
-      sv.overwrite = false
-      # sv.cursor_visible = false
-      # sv.cursor_visible = true
+      self.overwrite = false
       debug "INSERT MODE"
     else # TODO
     end
+
     if [:insert, :command, :replace, :browse].include?(ctype)
       # Place cursor where it already is
       # Without this hack, the cursor doesn't always get drawn
@@ -633,5 +642,13 @@ class VSourceView < GtkSource::View
       itr = buffer.get_iter_at(:offset => pos)
       buffer.place_cursor(itr)
     end
-  end
+
+    # Sometimes we lose focus and the cursor vanishes because of that
+    # TODO: determine why&when
+    if !self.has_focus?
+      self.grab_focus
+      self.cursor_visible = false
+      self.cursor_visible = true
+    end
+  end #end draw_cursor
 end

data/lib/vimamsa/key_actions.rb

@@ -46,8 +46,9 @@ reg_act(:create_new_file, "create_new_file", "Create new file", { :group => :fil
 reg_act(:backup_all_buffers, proc { backup_all_buffers }, "Backup all buffers", { :group => :file })
 reg_act(:e_move_forward_char, "e_move_forward_char", "", { :group => [:move, :basic] })
 reg_act(:e_move_backward_char, "e_move_backward_char", "", { :group => [:move, :basic] })
-reg_act(:history_switch_backwards, "history_switch_backwards", "", { :group => :file })
-reg_act(:history_switch_forwards, "history_switch_forwards", "", { :group => :file })
+# reg_act(:history_switch_backwards, proc{bufs.history_switch_backwards}, "", { :group => :file })
+reg_act(:history_switch_backwards, proc{bufs.history_switch(-1)}, "", { :group => :file })
+reg_act(:history_switch_forwards, proc{bufs.history_switch(+1)}, "", { :group => :file })
 reg_act(:center_on_current_line, "center_on_current_line", "", { :group => :view })
 reg_act(:run_last_macro, proc { vma.macro.run_last_macro }, "Run last recorded or executed macro", { :group => :macro })
 reg_act(:jump_to_next_edit, "jump_to_next_edit", "")
@@ -169,11 +170,14 @@ act_list = {
   :search_actions => { :proc => proc { vma.actions.gui_search },
                        :desc => "Search actions", :group => :search },
 
+  :edit_customrb => { :proc => proc { jump_to_file("~/.config/vimamsa/custom.rb") },
+                      :desc => "Customize (edit custom.rb)", :group => :search },
+
   :toggle_active_window => { :proc => proc { vma.gui.toggle_active_window },
-                             :desc => "Toggle active window", :group => :search },
+                             :desc => "Switch active column in two column mode", :group => :search },
 
   :toggle_two_column => { :proc => proc { vma.gui.toggle_two_column },
-                          :desc => "Set two column mode", :group => :search },
+                          :desc => "Toggle two column mode", :group => :search },
 
   :content_search => { :proc => proc { FileContentSearch.start_gui },
                        :desc => "Search content of files", :group => :search },
@@ -188,15 +192,14 @@ act_list = {
                       :desc => "Output SHA256 hex digest of curent buffer" },
 
   :start_autocomplete => { :proc => proc { vma.buf.view.start_autocomplete },
-                      :desc => "Start autocomplete" },
-                      
-  :show_autocomplete => { :proc => proc { 
-  # vma.buf.view.signal_emit("show-completion")
-  # vma.buf.view.show_completion
-  vma.buf.view.show_completions
-   },
-                      :desc => "Show autocomplete" },
-                     
+                           :desc => "Start autocomplete" },
+
+  :show_autocomplete => { :proc => proc {
+    # vma.buf.view.signal_emit("show-completion")
+    # vma.buf.view.show_completion
+    vma.buf.view.show_completions
+  },
+                          :desc => "Show autocomplete" },
 
 }
 

data/lib/vimamsa/key_binding_tree.rb

@@ -18,8 +18,6 @@
 # 'I ctrl-a'=> 'vma.buf.jump(BEGINNING_OF_LINE)',
 #
 
-setcnf :indent_based_on_last_line, true
-setcnf :extensions_to_open, [".txt", ".h", ".c", ".cpp", ".hpp", ".rb", ".inc", ".php", ".sh", ".m", ".gd", ".js"]
 
 class State
   attr_accessor :key_name, :eval_rule, :children, :action, :label, :major_modes, :level, :cursor_type

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -18,6 +18,7 @@ cnf.mode.visual.cursor.background = "#bc6040"
 cnf.mode.replace.cursor.background = "#fc0331"
 cnf.mode.browse.cursor.background = "#f803fc"
 cnf.mode.insert.cursor.background = "#ffffff"
+cnf.mode.inactive.cursor.background = "#777777"
 
 def _insert_move(op)
   if op == :pagedown
@@ -100,9 +101,7 @@ bindkey "VC h", :e_move_backward_char
 bindkey "C , , .", :backup_all_buffers
 bindkey "C z ", :start_browse_mode
 bindkey "B h", :history_switch_backwards
-# bindkey "B h", [:browse_file_backwards, proc { vma.kbd.to_previous_mode; call_action(:history_switch_backwards);  }, "Browse previous file"]
 bindkey "B l", :history_switch_forwards
-#bindkey 'B z', :center_on_current_line
 bindkey "B z", "center_on_current_line();call_action(:exit_browse_mode)"
 bindkey "B enter || B return || B esc || B j || B ctrl!", :exit_browse_mode
 bindkey "B s", :page_up

data/lib/vimamsa/langservp.rb

@@ -52,7 +52,7 @@ class LangSrv
     @id = 0
 
     wf = []
-    for c in conf(:workspace_folders)
+    for c in cnf.workspace_folders!
       wf << LSP::Interface::WorkspaceFolder.new(uri: c[:uri], name: c[:name])
     end
     debug "WORKSPACE FOLDERS", 2
@@ -157,7 +157,6 @@ class LangSrv
     @writer.write(id: id, params: a, method: "textDocument/definition")
     r = wait_for_response(id)
     return nil if r.nil?
-    # Ripl.start :binding => binding
     pp r
     line = HSafe.new(r)[:result][0][:range][:start][:line].val
     uri = HSafe.new(r)[:result][0][:uri].val

data/lib/vimamsa/text_transforms.rb

@@ -30,5 +30,8 @@ Converter.new(lambda { |x|
   x + "\n" + nums.join("+") + "=#{sum}"
 }, :lambda, :sum_of_numbers)
 
-c = Converter.new(lambda { |x| x.scan(/[\w\.]+@[\w\.]+/).join("\n") }, :lambda, :get_emails)
+Converter.new(lambda { |x| x.scan(/[\w\.]+@[\w\.]+/).join("\n") }, :lambda, :get_emails)
+
+# Eval selection as ruby code
+Converter.new(lambda { |x| b = "eval failed"; begin; b = eval(x, TOPLEVEL_BINDING); rescue; end; "#{x}\n#{b}\n" }, :lambda, :eval)
 

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/lib/vimamsa.rb

@@ -2,6 +2,9 @@ require "vimamsa/version"
 
 require "vmaext"
 
+$:.unshift File.expand_path(File.dirname(__FILE__)+"/../ext/stridx")
+require "stridx"
+
 require "vimamsa/rbvma"
 
 module Vimamsa

data/vimamsa.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(refcode|spec|features)/})
   end
+  # spec.files         = Dir["{ext}/**/*"]
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib","ext"]
@@ -36,10 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'differ', '~>  0.1.2'
   spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?
   spec.add_runtime_dependency 'listen', '~> 3.4'  #TODO: update?
+  spec.add_runtime_dependency 'StrIdx', '~> 0.1.1'
   spec.add_runtime_dependency 'language_server-protocol', '~> 3.17.0.3'
 
   spec.extensions = ["ext/vmaext/extconf.rb"]
   spec.licenses    = ['GPL-3.0+']
-  # FileList["ext/**/extconf.rb"]
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: StrIdx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".vma_project"
 - Gemfile
 - README.md
 - Rakefile