vimamsa 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca98d0950bc33d6c918e17c2092489ac69d5e5b722d781fe0f83736ccdfabb82
-  data.tar.gz: f4347a60b616dc3ea2575e3fe53c59397bf90d84f44fed7c28f0d792e5fc900d
+  metadata.gz: 97397b2b0eb7e2d07c23e67d4c9cebeec0df6925f43a70b2d42ad87d2f5383fb
+  data.tar.gz: fe0040694d69b1b860d942fb7cf3bea5fc671ba482b72a991f4d8f6d0031524c
 SHA512:
-  metadata.gz: f3254d05d66c7dd92f79d9393986da65f9401e3b48627c620c7c9bf0cfec20c039b640a72cd70100f01757637a8af17a645228e3f0f789a0f09c6fc6ecf710ea
-  data.tar.gz: 2391bb4e5a93ae86f180a7138799323dbe01bf8ac94385d8f523f109025a13511ea3ba10a31b9b9cedd02ee495822d2b162dda6bab2b8f8b0a2c61f068f6b42c
+  metadata.gz: 749aa7833a6db40dc85620884f2e7be97c3d54b4e681f96255f54aa1a76148d80640f78e194f3b688e80f770c4afedbba9c096ac58a56da455102fc2ece4bcec
+  data.tar.gz: 74df362a22e70517ababecf5a61d29cc5655147f3c163764d264febfb83fa8b65182cb0f2cfc92e26e157ed3e2618c03c53f06c0d73ba5c06a18a4aa4b162201

data/README.md

@@ -5,7 +5,7 @@ Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK
 
 ## Requirements
  - Ruby 2.0+
- - GTK 3
+ - GTK 4
 
 ## Installation
 
@@ -16,21 +16,43 @@ sudo apt install ruby-dev
 sudo gem install vimamsa
 ```
 
-Run:
+### Other install options
+
+Install from sources:
+
+```
+git clone https://github.com/SamiSieranoja/vimamsa.git
+cd vimamsa
+gem build vimamsa.gemspec 
+sudo gem install --local vimamsa-0.1.*.gem
+
+```
+
+Older version for GTK3:
+
+    sudo gem install vimamsa -v 0.1.10
+
+## Run
 ```
 vimamsa
 ```
 
-Packages for optional features:
+Install packages for optional features:
 ```
 sudo apt install ack-grep clang-format
+gem install ripl ripl-multi_line differ parallel listen rufo language_server-protocol
 ```
 
-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 +94,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 +138,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

@@ -13,7 +13,7 @@
 # setcnf :tab_width, 4
 
 # Open this file every time the program starts
-# setcnf :startup_file, "~/Documents/main.txt"
+# setcnf :startup_file, "~/Documents/startup.txt"
 
 def insert_date()
   # $buffer.insert_txt("#{DateTime.now().strftime("==========\n%Y-%m-%d")}\n")
@@ -23,9 +23,18 @@ 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")
+  s = buf.scan(/^(
+  ([\w\*\:&]+\s*){1,3}
+  [\*?\w\:&]+
+  \(
+     ([^\)]|\n)*?
+  \)
+  )
+  /x
+  ).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
@@ -38,6 +47,7 @@ def insert_lorem_ipsum()
 
 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."
 
+  # Insert to current position
   vma.buf.insert_txt(lorem_ipsum)
 end
 

data/demo.txt

@@ -1,7 +1,8 @@
 ❙Demo❙
 
+
 ◼ General
-Links: press ⦁enter⦁  while cursor on
+Links: press ⦁enter⦁  while text cursor on
 ⟦README.md⟧
 
 Extension .txt can be omitted:
@@ -22,4 +23,3 @@ Images work in .txt-files by drag&drop. (experimental)
  
  
  
- 

data/exe/vimamsa

@@ -5,12 +5,12 @@ require "tempfile"
 require "pathname"
 
 ENV["GTK_THEME"] = "Adwaita:dark"
+# ENV["GTK_THEME"] = "Adwaita:light"
 
 selfpath = __FILE__
 selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
 scriptdir = File.expand_path(File.dirname(selfpath) + "/..")
 
-
 # If process is already running, open the parameter file in the running process and exit.
 listen_dir = File.expand_path("~/.vimamsa/listen")
 if File.exist?(listen_dir) and !ARGV[0].nil?

data/lib/vimamsa/ack.rb

@@ -4,12 +4,8 @@ class FileContentSearch
   def self.start_gui()
     search_paths = vma.get_content_search_paths.join("<br/>")
 
-    nfo = "<html><h2>Search contents of text files</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:
+    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. 
@@ -17,67 +13,82 @@ Will search the following directories:
   </span>"
 
     callback = proc { |x| FileContentSearch.search_buffer(x) }
-    gui_one_input_action(nfo, "Search:", "search", callback)
+    # gui_one_input_action(nfo, "Search:", "search", callback)
+
+    params = {}
+    params["inputs"] = {}
+    params["inputs"]["search"] = { :label => "Search:", :type => :entry }
+    params["inputs"]["extensions"] = { :label => "Limit to file extensions:", :type => :entry }
+    params["inputs"]["extensions"][:initial_text] = conf(:default_search_extensions).join(",")
+    params["inputs"]["btn1"] = { :label => "Search", :type => :button }
+    # callback = proc { |x| gui_replace_callback(x) }
+
+    params[:callback] = callback
+    PopupFormGenerator.new(params).run
   end
 
-  def self.search_buffer(instr, b = nil)
+  def self.search_buffer(formdata, b = nil)
     # instr = Shellwords.escape(instr)
+
     fext = Set[".txt"]
+    # Include only word characters and dot
+    extstmp = formdata["extensions"].split(",").collect { |x| "." + x.gsub(/[^\w\.]/, "") }
+    fext = extstmp.to_set
+    if fext.empty?
+      return
+    end
+    instr = formdata["search"]
+
     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"
+    b = create_new_buffer(bufstr,"contentsearch")
+    lno = 1
+    @linep = {}
     for fp in dlist
-      txt = read_file("",fp)
+      txt = read_file("", fp)
       ind = scan_indexes(txt, /#{instr}/i)
       if !ind.empty?
-        for x in ind
-        # Ripl.start :binding => binding
+        # bufstr << "#{fp}\n"
+        # buf.insert_txt("#{fp}\n", AFTER)
+        b.append("#{fp}\n")
+        lno += 1
 
+        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"
+          b.append "  "
+          b.append txt[starti..endi].gsub("\n", " ")
+          b.append "\n"
+          @linep[lno] = { :fname => fp, :ind => x }
+          lno += 1
         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. 
- If .vma_project exists in parent directory of current file, searches within that directory.
-  </span>"
-
-  callback = proc { |x| ack_buffer(x) }
-  gui_one_input_action(nfo, "Search:", "search", callback)
-end
+    b.line_action_handler = proc { |lineno|
+      puts "SEARCH HANDLER:#{lineno}"
+      puts @linep[lineno]
+      lp = @linep[lineno]
+      if !lp.nil?
+        if lp.has_key?(:ind) and lp.has_key?(:fname)
+          jump_to_file(lp[:fname], lp[:ind], "c")
+        end
+      end
 
-def ack_buffer(instr, b = nil)
-  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}")
-  end
-  if bufstr.size > 5
-    create_new_file(nil, bufstr)
-  else
-    message("No results for input:#{instr}")
+      # jumpto = $grep_matches[lineno]
+      # if jumpto.class == Integer
+      # vma.buffers.set_current_buffer($grep_bufid, update_history = true)
+      # buf.jump_to_line(jumpto)
+      # end
+    }
+    # buf.insert_txt("\n")
+    # create_new_file(nil, bufstr)
   end
 end
 
@@ -107,7 +118,7 @@ def ack_buffer(instr, b = nil)
     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)
+  create_new_buffer(bufstr,"ack")
   else
     message("No results for input:#{instr}")
   end

data/lib/vimamsa/actions.rb

@@ -49,6 +49,7 @@ 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",
@@ -74,7 +75,6 @@ def search_actions_update_callback(search_str = "")
       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 != ""