vimamsa 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a71f8392835d7a5a3245366764eb79f6058ea3ded74cc1a308f021f950881ba
-  data.tar.gz: 590ea0409a43aabafe349cfcff0cb91712e2a269e334b3663b64f6b895ae666f
+  metadata.gz: bfc14cb231bc93909b4866e08cbd4503b4f4444527c0b65b4a9edb11d863faa0
+  data.tar.gz: 7b63cdbff33cdcdbf7d6f5d025d8ec13a6f39a3ee937f716ec990bba743f3239
 SHA512:
-  metadata.gz: 1bf328f8cbe0b69e85a9720790c8f4616e1996466ad65f6473cf1cff1173d78b9cec197145c653a5d33804571d383246492e593445da390cbe567fc6ccfbb24a
-  data.tar.gz: 799f836afc3c0e304cac07f44e1b5c96affa3f6b5775b4d654b43a81168f2ab14cb4ee1218a3345ae3189203520885fd6cc1de7ce48205e78386b060c700f8ca
+  metadata.gz: 2176d7aaa01be873deb8687cf2b8d75044edba4ccfc3685cf334cae973c93e15ba6dc47d9667a9848209329b043f2ba8daf049f4340ddb130538584e17b5a5de
+  data.tar.gz: afcdd6c30018dc971fc165d8ed6f63f5b2ccf109a167d0ec39cf03c150ac03d7765c4c0d83e3a6ceabaae74cf44f759144dbe5e2d9aee1b191182ca7fb622035

data/README.md

@@ -26,11 +26,16 @@ Packages for optional features:
 sudo apt install ack-grep clang-format
 ```
 
-For customization, edit dot_vimamsarc.rb and copy to ~/.vimamsarc
+For customization, edit ~/.vimamsa/custom.rb
+
+## Screenshots
+
+<a href="https://samiddhi.net/vimamsa/screenshot1.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot1.png" width="400"/></a>
+<a href="https://samiddhi.net/vimamsa/screenshot2.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot2.png" width="400"/></a>
 
 ## Key bindings
 
-Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/default_bindings.rb
+Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/key_bindings_vimlike.rb
 
 Keys that work somewhat similarly as in Vim:
 
@@ -72,7 +77,7 @@ ctrl-x means press and hold ctrl key, press x
 </td></tr>
 <tr> <td style="text-align:center;">,b</td> <td style="text-align:left;"> Switch buffer (jump to other open file)</td></tr>
 <tr> <td style="text-align:center;">,g</td> <td style="text-align:left;">search for input string inside current buffer</td></tr>
-<tr> <td style="text-align:center;">,f</td> <td style="text-align:left;">Fuzzy filename search</td></tr>
+<tr> <td style="text-align:center;">,f</td> <td style="text-align:left;">File finder</td></tr>
 <tr> <td style="text-align:center;">space c</td> <td style="text-align:left;">insert character "c"</td></tr>
 </tbody>
 </table>
@@ -116,7 +121,7 @@ ctrl-x means press and hold ctrl key, press x
 </tbody>
 </table>
 
-Bindings can be customized in ~/.vimamsarc  
+Bindings can be customized in ~/.vimamsa/custom.rb
 For example, to bind ctrl-n to action "create new file":  
 ```
 bindkey 'C ctrl-n',  'create_new_file()'

data/custom_example.rb

@@ -0,0 +1,47 @@
+# Examples for customization
+
+# Extract unique words
+# c = Converter.new(lambda { |x| h = {}; x.split(/\s+/).each { |y| h[y] = 1 }; h.keys.join(" ") }, :lambda, :uniqwords)
+
+# Eval selected text as ruby code (e.g. use as calculator)
+# bindkey "V , e", "vma.buf.convert_selected_text(:eval)"
+# syntax: bindkey "mode key1 key2 ..."
+
+# Execute in new gnome-terminal tab
+# bindkey "C , , t", :execute_current_line_in_terminal
+
+# setcnf :tab_width, 4
+
+# Open this file every time the program starts
+# setcnf :startup_file, "~/Documents/startup.txt"
+
+def insert_date()
+  # $buffer.insert_txt("#{DateTime.now().strftime("==========\n%Y-%m-%d")}\n")
+  vma.buf.insert_txt("#{DateTime.now().strftime("%Y-%m-%d")}\n")
+end
+
+def collect_c_header()
+  # Matches e.g.:
+  # static void funcname(parameters)
+  s = buf.scan(/^(([\w]+\s*){1,3} \w+\((.|\n)+?\))/).collect { |x| x[0] + ";" }.join("\n")
+  buf.insert_txt(s)
+end
+reg_act(:collect_c_header, proc { collect_c_header }, "Collect function definitions for c header file")
+
+# Extract all numbers from txt selection
+c = Converter.new(lambda { |x| x.scan(/([\+\-]?\d+(\.\d+)?)/).collect { |x| x[0] }.join(" ") }, :lambda, :getnums)
+# (find converter using action search input:"conv getnum")
+
+
+def insert_lorem_ipsum()
+  lorem_ipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst."
+
+  vma.buf.insert_txt(lorem_ipsum)
+end
+
+# Find with action search ([C] , , s) 
+reg_act(:insert_lorem_ipsum, proc { insert_lorem_ipsum }, "Insert lorem ipsum")
+
+

data/demo.txt

@@ -0,0 +1,25 @@
+❙Demo❙
+
+◼ General
+Links: press ⦁enter⦁  while cursor on
+⟦README.md⟧
+
+Extension .txt can be omitted:
+⟦demo⟧
+
+◼◼ Level 2
+◼◼◼ Level 3
+◼◼◼◼ Level 4
+◼ Help
+⟦help:keybindings⟧
+
+Customizations:
+⟦~/.vimamsa/custom.rb⟧
+
+◼ Images
+Images work in .txt-files by drag&drop. (experimental)
+⟦img:sheep.jpg⟧
+ 
+ 
+ 
+ 

data/lang/hyperplaintext.lang

@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- This file is part of GtkSourceView
-
- Authors: Marco Barisione, Emanuele Aina
- Copyright (C) 2005-2007 Marco Barisione <barisione@gmail.com>
- Copyright (C) 2005-2007 Emanuele Aina
-
- GtkSourceView is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- GtkSourceView is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>.
-
--->
 <language id="hyperplaintext" name="HyperPlainText" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-c;text/x-csrc;image/x-xpixmap</property>
@@ -32,9 +10,10 @@
     <style id="title"           name="title"               map-to="def:title"/>
     <style id="hyperlink"           name="hyperlink"               map-to="def:hyperlink"/>
     <style id="heading1"           name="heading1"               map-to="def:heading1"/>
-    <style id="heading2"           name="heading1"               map-to="def:heading2"/>
-    <style id="heading3"           name="heading1"               map-to="def:heading3"/>
-    <style id="heading4"           name="heading1"               map-to="def:heading4"/>
+    <style id="heading2"           name="heading2"               map-to="def:heading2"/>
+    <style id="heading3"           name="heading4"               map-to="def:heading3"/>
+    <style id="heading4"           name="heading4"               map-to="def:heading4"/>
+    <style id="bold"           name="bold"               map-to="def:bold"/>
     <style id="string"            name="String"                map-to="def:string"/>
     <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
   </styles>
@@ -86,6 +65,10 @@
      <context id="title" style-ref="title">
       <match>(^❙.*❙)</match>
      </context>
+     
+      <context id="bold" style-ref="bold">
+      <match>(⦁.*⦁)</match>
+     </context>
     
       <context id="hyperlink" style-ref="hyperlink">
       <match>(⟦.*⟧)</match>
@@ -121,6 +104,7 @@
         <context ref="heading2"/>
         <context ref="heading3"/>
         <context ref="heading4"/>
+        <context ref="bold"/>
         <context ref="float"/>
       </include>
     </context>

data/lib/vimamsa/ack.rb

@@ -1,26 +1,73 @@
 # Interface for ack! https://beyondgrep.com/
 
+class FileContentSearch
+  def self.start_gui()
+    search_paths = vma.get_content_search_paths.join("<br/>")
+
+  nfo = "<span size='x-large'>Search contents of text files</span>
+Will search all .txt files in the following directories:
+#{search_paths}
+  
+<span>Hint: add empty file named .vma_project to directories you want to search in. 
+ If .vma_project exists in parent directory of current file, searches within that directory.
+  </span>"
+
+    callback = proc { |x| FileContentSearch.search_buffer(x) }
+    gui_one_input_action(nfo, "Search:", "search", callback)
+  end
+
+  def self.search_buffer(instr, b = nil)
+    # instr = Shellwords.escape(instr)
+    fext = Set[".txt"]
+    dlist = []
+    for d in vma.get_content_search_paths
+      # Search for files with extension .txt and size < 200k
+      dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and fext.include?(File.extname(e)) and File.size(e) < 200e3 }
+    end
+    bufstr = "Results:\n\n"
+    for fp in dlist
+      txt = read_file("",fp)
+      ind = scan_indexes(txt, /#{instr}/i)
+      if !ind.empty?
+        for x in ind
+          starti = x - 30
+          endi = x + 30
+          starti = 0 if starti < 0
+          endi = txt.size - 1 if endi >= txt.size
+          bufstr << "#{fp}:c#{x} "
+          bufstr << txt[starti..endi].gsub("\n"," ")
+          bufstr << "\n"
+        end
+      end
+    end
+    create_new_file(nil, bufstr)
+  end
+end
+
 def gui_ack()
+  search_paths = vma.get_content_search_paths.join("<br/>")
+
   nfo = "<html><h2>Search contents of all files using ack</h2>
   <div style='width:300px'>
   <p>Hint: add empty file named .vma_project to dirs you want to search.</p>\n<p>If .vma_project exists in parent dir of current file, searches within that dir</p></div></html>"
-  
+
   nfo = "<span size='x-large'>Search contents of all files using ack</span>
+Will search the following directories:
+#{search_paths}
   
-  <span>Hint: add empty file named .vma_project to directories you want to search in. 
+<span>Hint: add empty file named .vma_project to directories you want to search in. 
  If .vma_project exists in parent directory of current file, searches within that directory.
   </span>"
- 
-  
-  callback = proc{|x| ack_buffer(x)}
+
+  callback = proc { |x| ack_buffer(x) }
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
 def ack_buffer(instr, b = nil)
-  instr = instr.gsub("'", ".") # TODO
+  instr = Shellwords.escape(instr)
   bufstr = ""
-  for path in $vma.get_content_search_paths
-    bufstr += run_cmd("ack -Q --type-add=gd=.gd -k --nohtml --nojs --nojson '#{instr}' #{path}")
+  for path in vma.get_content_search_paths
+    bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
   end
   if bufstr.size > 5
     create_new_file(nil, bufstr)
@@ -28,4 +75,3 @@ def ack_buffer(instr, b = nil)
     message("No results for input:#{instr}")
   end
 end
-

data/lib/vimamsa/actions.rb

@@ -28,7 +28,7 @@ def reg_act(id, callfunc, name = "", opt = {})
 end
 
 def missing_callfunc
-  puts "missing_callfunc"
+  debug "missing_callfunc"
 end
 
 #TODO: remove
@@ -47,10 +47,12 @@ end
 
 def search_actions()
   l = []
+  opt = { :title => "Search actions.", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
   $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
   gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
                            "search_actions_select_callback",
-                           "search_actions_update_callback")
+                           "search_actions_update_callback",
+                           opt)
 end
 
 $item_list = []
@@ -63,6 +65,16 @@ def search_actions_update_callback(search_str = "")
     act = $actions[act_id]
     item = {}
     item[:key] = ""
+
+    for mode_str in ["C", "V"]
+      c_kbd = vma.kbd.act_bindings[mode_str][act_id]
+      if c_kbd.class == String
+        item[:key] = "[#{mode_str} #{c_kbd}] "
+        break
+      end
+    end
+    # c_kbd = vma.kbd.act_bindings[mode_str][nfo[:action]]
+    # Ripl.start :binding => binding
     item[:action] = act_id
     item[:str] = act_id.to_s
     if $actions[act_id].method_name != ""
@@ -74,13 +86,15 @@ def search_actions_update_callback(search_str = "")
   item_list = item_list2
 
   a = filter_items(item_list, 0, search_str)
-  puts a.inspect
+  debug a.inspect
 
   r = a.collect { |x| [x[0][0], 0, x] }
-  puts r.inspect
+  debug r.inspect
   $item_list = r
 
-  r = a.collect { |x| ["[#{x[0][:key]}] #{x[0][:str]}", 0, x] }
+  # Ripl.start :binding => binding
+
+  r = a.collect { |x| ["#{x[0][:key]}#{x[0][:str]}", 0, x] }
   return r
 end
 
@@ -88,13 +102,13 @@ def search_actions_select_callback(search_str, idx)
   item = $item_list[idx][2]
   acc = item[0][:action]
 
-  puts "Selected:" + acc.to_s
+  debug "Selected:" + acc.to_s
   gui_select_window_close(0)
 
   if acc.class == String
     eval(acc)
   elsif acc.class == Symbol
-    puts "Symbol"
+    debug "Symbol"
     call(acc)
   end
 end
@@ -102,11 +116,16 @@ end
 def filter_items(item_list, item_key, search_str)
   #    Ripl.start :binding => binding
   item_hash = {}
+  puts item_list.inspect
   scores = Parallel.map(item_list, in_threads: 8) do |item|
+    if item[:str].class != String
+      puts item.inspect
+      exit!
+    end
     [item, srn_dst(search_str, item[:str])]
   end
   scores.sort_by! { |x| -x[1] }
-  puts scores.inspect
+  debug scores.inspect
   scores = scores[0..30]
 
   return scores