vimamsa 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 510c17ec3221823fe5e8c800b4146879c11f278b37a0ad807d57729210af6b3a
-  data.tar.gz: 211596938920f6a785830d9d516cd9c999b4c8f54a67610eaf971ce127c4b8e5
+  metadata.gz: 4603a715f3fd3b549cc38a9744d93617b3a87ba3d95268f77ed2c98c2c04643d
+  data.tar.gz: 26e82f3a6564a78dcd7188a69037f97bae3fb53c43be807560facfab8e70dd51
 SHA512:
-  metadata.gz: '08b64e33fe9c031326ac005bf42da69f5e3ed9ce7ffe73d84a387ede95be8e37a44d0c57d6b5b62d3d2842b8de855dc6145e42cf4cd4a4eb8341cab33cb2b86d'
-  data.tar.gz: 3057288ea2ab7b13939a96282da7540287ebba518714b8aa2db7a285d9aff99e435142ab915d13d92684d229069388a0b52c86a971abad8acb817c5343ba2fff
+  metadata.gz: 1f05aad90407dfdd0e9c310f08f5e79274a5901f714d63e353e7291f25c7f4dba3d402163f338cebf01fef4f8fae07522f85a58d62e76086661007f24b14a0bd
+  data.tar.gz: f503976439de2a311778b48a427354fc21a1b42434eb6a0bcfa5e3c00144fc3508abe029a058249c2b433e9f41f983679f44927ae095b1ec4a4eb36fafdbfe93

data/custom_example.rb

@@ -16,8 +16,15 @@
 # setcnf :startup_file, "~/Documents/startup.txt"
 
 # To enable 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"}
+# cnf.lsp.enabled = true
+# cnf.lsp.server.solargraph = { name: "solargraph", command: "solargraph stdio", type: "stdio" }
+# cnf.lsp.server.solargraph.languages = ["ruby"]
+
+# cnf.lsp.server.clangd = { name: "clangd", command: "clangd-12 --offset-encoding=utf-8", type: "stdio" }
+# cnf.lsp.server.clangd.languages = ["c", "cpp"]
+
+
+
 
 
 def insert_date()

data/lib/vimamsa/actions.rb

@@ -121,9 +121,8 @@ def search_actions_select_callback(search_str, idx)
 end
 
 def filter_items(item_list, item_key, search_str)
-  #    Ripl.start :binding => binding
   item_hash = {}
-  puts item_list.inspect
+  # debug item_list.inspect
   scores = Parallel.map(item_list, in_threads: 8) do |item|
     if item[:str].class != String
       puts item.inspect

data/lib/vimamsa/buffer.rb

@@ -12,7 +12,7 @@ $update_highlight = false
 $ifuncon = false
 
 class Buffer < String
-  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save
+  attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save, :access_time
   attr_writer :call_func, :update_highlight
   attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle, :paste_lines, :mode_stack, :default_mode
 
@@ -22,14 +22,15 @@ class Buffer < String
     debug "Buffer.rb: def initialize"
     super(str)
 
+    update_access_time
     @images = []
     @audiofiles = []
     @lang = nil
     @id = @@num_buffers
     @@num_buffers += 1
     @version = 0
-    @mode_stack = [:command] # TODO
-    @default_mode = :command # TODO
+    @default_mode = vma.kbd.default_mode
+    @mode_stack = [@default_mode]
     gui_create_buffer(@id, self)
     debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
@@ -76,7 +77,7 @@ class Buffer < String
     self << "\n" if self[-1] != "\n"
     @current_word = nil
     @active_kbd_mode = nil
-    if conf(:enable_lsp)
+    if cnf.lsp.enabled?
       init_lsp
     end
     return self
@@ -91,14 +92,34 @@ class Buffer < String
     return x
   end
 
+  #Check if this buffer is attached to any windows
+  def is_active?
+    for k in vma.gui.windows.keys
+      next if vma.gui.windows[k][:sw].child.nil?
+      return true if vma.gui.windows[k][:sw].child.bufo == self
+    end
+    return false
+  end
+
+  def update_access_time
+    @access_time = Time.now
+  end
+
+  # This function is to be called whenever keyboard events start affecting this buffer
+  # e.g. switching between buffers, opening a new (this) file
   def set_active
-    if !@active_kbd_mode.nil?
-      # $kbd.set_mode(@active_kbd_mode) #TODO: remove?
-    else
-      $kbd.set_mode_to_default
+    debug "def set_active", 2
+    if vma.kbd.get_scope != :editor
+      # If current keyboard mode is not an editor wide mode spanning multiple buffers(e.g. browsing)
+      restore_kbd_mode
     end
   end
 
+  # Restore the previous keyboard mode specific to this buffer
+  def restore_kbd_mode
+    vma.kbd.set_mode_stack(@mode_stack.clone)
+  end
+
   def set_executable
     if File.exist?(@fname)
       FileUtils.chmod("+x", @fname)
@@ -114,6 +135,7 @@ class Buffer < String
   end
 
   def lsp_jump_to_def()
+    message("LSP not activated") if @lsp.nil?
     if !@lsp.nil?
       fpuri = URI.join("file:///", @fname).to_s
       r = @lsp.get_definition(fpuri, @lpos, @cpos)
@@ -124,8 +146,9 @@ class Buffer < String
   end
 
   def init_lsp()
-    if conf(:enable_lsp) and !@lang.nil?
-      @lsp = LangSrv.get(@lang.to_sym)
+    if cnf.lsp.enabled?
+      @lsp = LangSrv.get(@lang)
+
       if @lang == "php"
         # Ripl.start :binding => binding
       end
@@ -157,7 +180,7 @@ class Buffer < String
       debug "Guessed LANG: #{lang.id}"
       @lang = lang.id
     end
-    puts @lang.inspect
+    debug @lang.inspect
 
     if @lang
       gui_set_file_lang(@id, @lang)
@@ -224,6 +247,11 @@ class Buffer < String
     return false
   end
 
+  def scan_all_words
+    words = self.scan(/\b\w+\b/).uniq
+    return words
+  end
+
   def add_image(imgpath, pos)
     return if !is_legal_pos(pos)
 
@@ -350,6 +378,8 @@ class Buffer < String
 
     self.replace(str)
     @line_ends = scan_indexes(self, /\n/)
+    words = scan_all_words
+    Autocomplete.add_words(words)
 
     if cnf.btree.experimental?
       @bt = BufferTree.new(self)
@@ -515,7 +545,6 @@ class Buffer < String
     end
   end
 
-
   def undo()
     debug @edit_history.inspect
     return if !@edit_history.any?
@@ -677,11 +706,6 @@ class Buffer < String
     end
   end
 
-  def replace_range(range, text)
-    delete_range(range.first, range.last)
-    insert_txt_at(text, range.begin)
-  end
-
   def current_line_range()
     range = line_range(@lpos, 1)
     return range
@@ -792,7 +816,7 @@ class Buffer < String
       @line_ends.sort!
     end
   end
-  
+
   # Ranges to use in delete or copy operations
   def get_range(range_id, mark: nil)
     range = nil
@@ -1036,15 +1060,28 @@ class Buffer < String
     end
   end
 
-  def get_cur_nonwhitespace_word()
-    wem = scan_marks(@pos, @pos + 200, /(?<=\S)\s/, -1)
-    wsm = scan_marks(@pos - 200, @pos, /((?<=\s)\S)|^\S/)
+  def get_word_in_pos(p, boundary: :space)
+    maxws = 200 # max word size
+    if boundary == :space
+      wem = scan_marks(p, p + maxws, /(?<=\S)\s/, -1)
+      wsm = scan_marks(p - maxws, p, /((?<=\s)\S)|^\S/)
+      word_start = wsm[-1]
+      word_end = wem[0]
+    elsif boundary == :word
+      wsm = scan_marks(p - maxws, p, /\b\w/)
+      word_start = wsm[-1]
+      word_end = p
+    end
 
-    word_start = wsm[-1]
-    word_end = wem[0]
-    word_start = pos if word_start == nil
-    word_end = pos if word_end == nil
+    word_start = p if word_start == nil
+    word_end = p if word_end == nil
     word = self[word_start..word_end]
+
+    return [word, (word_start..word_end)]
+  end
+
+  def get_cur_nonwhitespace_word()
+    (word, range) = get_word_in_pos(@pos, boundary: :space)
     debug "'WORD: #{word}'"
     # message("Open link #{word}")
     linep = get_file_line_pointer(word)
@@ -1097,7 +1134,6 @@ class Buffer < String
     end
   end
 
-
   def replace_with_char(char)
     debug "self_pos:'#{self[@pos]}'"
     return if self[@pos] == "\n"
@@ -1228,6 +1264,13 @@ class Buffer < String
     $kbd.set_mode(:visual)
   end
 
+  def start_selection()
+    @visual_mode = true
+    @selection_start = @pos
+    $kbd.set_mode(:visual)
+    #TODO: implement without setting kbd mode
+  end
+
   def copy_active_selection(x = nil)
     debug "!COPY SELECTION"
     @paste_lines = false
@@ -1330,10 +1373,14 @@ class Buffer < String
   end
 
   def end_visual_mode()
-    return if !visual_mode?
+    debug "end_visual_mode, #{vma.kbd.get_mode}, #{visual_mode?}", 2
+    return if vma.kbd.get_mode != :visual
+    if !visual_mode?
+      debug "end_visual_mode, !visual_mode?"
+      # TODO: should not happen
+    end
     debug "End visual mode"
-    #TODO:take previous mode (insert|command) from stack?
-    $kbd.set_mode(:command)
+    vma.kbd.to_previous_mode
     @visual_mode = false
     return true
   end
@@ -1462,7 +1509,7 @@ class Buffer < String
         #TODO: show message box
       end
       @last_save = Time.now
-      puts "file saved on #{@last_save}"
+      debug "file saved on #{@last_save}"
       sleep 3
     }
   end
@@ -1501,13 +1548,14 @@ class Buffer < String
   end
 
   def save()
-    check_if_modified_outside
+    check_if_modified_outside #TODO
     if !@fname
       save_as()
       return
     end
     message("Saving file #{@fname}")
     write_contents_to_file(@fname)
+    hook.call(:file_saved, self)
   end
 
   def close()

data/lib/vimamsa/buffer_changetext.rb

@@ -135,10 +135,26 @@ class Buffer < String
     return true
   end
 
+  def complete_current_word(rep)
+    debug "complete_current_word", 2
+    p = @pos - 1
+    return if !is_legal_pos(p)
+    (word, range) = get_word_in_pos(p, boundary: :word)
+    debug [word, range].to_s, 2
+    endpos = range.begin+rep.size
+    replace_range(range, rep)
+    set_pos(endpos)
+  end
+
+  def replace_range(range, text)
+    delete_range(range.first, range.last)
+    insert_txt_at(text, range.begin)
+  end
+
   def delete2(range_id, mark = nil)
     @paste_lines = false
     range = get_range(range_id, mark: mark)
-    return if range == nil
+    return false if range == nil
     debug "RANGE"
     debug range.inspect
     debug range.inspect
@@ -146,6 +162,7 @@ class Buffer < String
     delete_range(range.first, range.last)
     pos = [range.first, @pos].min
     set_pos(pos)
+    return true
   end
 
   def delete(op, x = nil)