vim-tags 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24862170a8fd6195f07f07160c5c810336e859a5297712dac58b515cca323c60
-  data.tar.gz: aab67522bb493fa0308d01b715030a0b66c3663471d121db9e54d4aeefb3c22c
+  metadata.gz: 4bc33aff0be21dfcf28ac60662708d2c0a7605bd3afe07d111006058ea3414f2
+  data.tar.gz: 8402bf3eaa4791579010a70cb5ced680114a0b32d3f36535fbfde52189eeec10
 SHA512:
-  metadata.gz: '0890772903f0e49d8037c62c024742fb7b8c6a218e86b26c5f708c13a5fdecfccb428ddb4b04ec80a40043579d430d65026385505557ddc9b70d74f3626a5e61'
-  data.tar.gz: 224d233cd91b633bc94967523665da3a2c4e8cfabd28b671c75f7064c914ad2b988e5b4fc67c09a7e9e3cc14a9f690209a326f7773523cb78a0d86bcc1c08c3b
+  metadata.gz: e4421652fb5563fe9ea28742d5db907477379f52be922b0fb040a7b128b1e808adbeb657743ca6cc0102b9c11b73e96ded702c7dcb1a90b7d4dade8f54d7e68d
+  data.tar.gz: f04f668af0c693c8c6d4e4aebd0acf88e65c6921d1349d98a871689cb0476ca96f090cf7feaa511b10592121423e9f234122975ae935310164a6a9ceaa109c08

data/plugin/vim-tags.vim

@@ -1,19 +1,24 @@
 function! LoadRubyTags()
-  if exists("g:vim_tags_loaded")
-    return
-  endif
+  let l:load_ruby_tags_dir = finddir('.git/..', expand('%:p:h').';')
 
-  let s:load_ruby_tags_fp = finddir('.git/..', expand('%:p:h').';') . '/.bundle/.tag_files'
+  if !empty(l:load_ruby_tags_dir)
+    let l:load_ruby_tags_gem_tags_path = l:load_ruby_tags_dir . '/.bundle/.gem_tag_files'
 
-  if !filereadable(s:load_ruby_tags_fp)
-    let s:install_response = system('bundler plugin install vim-tags')
-    let s:command_response = system('bundler vim-tags')
-  endif
+    if !filereadable(l:load_ruby_tags_gem_tags_path)
+      let l:install_response = system('bundler plugin install vim-tags')
+      let l:command_response = system('bundler vim-tags')
+    endif
 
-  let s:comma_tags = system("cat " . s:load_ruby_tags_fp . " | paste -sd ',' -")
-  let g:vim_tags_loaded = 1
+    let g:gem_files = json_decode(readfile(l:load_ruby_tags_gem_tags_path))
+    let l:gem_comma_tags = join(values(g:gem_files), "/tags,") . '/tags'
+    let l:ruby_comma_tags = join(readfile(l:load_ruby_tags_dir . '/.bundle/.ruby_tag_files'), "/tags,") . '/tags'
 
-  let &l:tags = &tags . ',' . s:comma_tags
+    setlocal includeexpr=get(g:gem_files,v:fname,v:fname)
+    setlocal suffixesadd=/
+    cnoremap <buffer><expr> <Plug><cfile> get(g:gem_files,expand("<cfile>"),"\022\006")
+
+    let &l:tags = &tags . ',' . l:gem_comma_tags . ',' . l:ruby_comma_tags
+  endif
 endfunction
 
 autocmd FileType ruby :call LoadRubyTags()

data/plugins.rb

@@ -1,33 +1,64 @@
 # frozen_string_literal: true
 
 require "bundler"
+require "json"
 
 class VimTagsCommand < Bundler::Plugin::API
   command "vim-tags"
 
   def exec(*)
-    cache_file = File.join(Bundler.app_config_path, ".tag_files")
+    write_gem_file
+    write_ruby_file
+  end
 
-    puts "\nWriting tag cache to #{cache_file}"
+  private
 
-    File.open(cache_file, "w") do |f|
-      f.truncate(0)
+  def write_gem_file
+    write_to_file(
+      File.join(Bundler.app_config_path, ".gem_tag_files"),
+      "\nWriting gem file tag cache",
+      { tags: gem_tags, paths: gem_paths }
+    )
+  end
+
+  def write_ruby_file
+    write_to_file(
+      File.join(Bundler.app_config_path, ".ruby_tag_files"),
+      "Writing ruby tag cache to",
+      { tags: ruby_tags, paths: $: }
+    )
+  end
+
+  def ruby_tags
+    $:.select { |path| File.exist?(File.join(path, "tags")) }
+  end
+
+  def gem_tags
+    gem_specs.filter_map do |spec|
+      tag_path = File.join(spec.full_gem_path, "tags")
 
-      f.write (gem_paths + ruby_paths).uniq.join("\n")
+      next unless File.exist?(tag_path)
+
+      tag_path
     end
   end
 
   def gem_paths
-    Bundler.load.specs.filter_map do |spec|
-      next if spec.name == "bundler" ||
-        !File.exist?(File.join(spec.full_gem_path, "tags"))
+    gem_specs.to_h { |spec| [spec.name, spec.full_gem_path] }
+  end
 
-      spec.full_gem_path
-    end
+  def gem_specs
+    @gem_specs ||= Bundler.load.specs
   end
 
-  def ruby_paths
-    $:.select { |path| File.exist?(File.join(path, "tags")) }
+  def write_to_file(file_path, description, payload)
+    puts "#{description} to #{cache_file}"
+
+    File.open(file_path, "w") do |f|
+      f.truncate(0)
+
+      f.write payload.to_json
+    end
   end
 end
 

data/vim-tags.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "vim-tags"
-  spec.version = "0.2.0"
+  spec.version = "0.3.0"
   spec.authors = ["Nick Pezza"]
   spec.email   = ["pezza@hey.com"]
 
-  spec.summary = "Generate cache file of all paths to tags files of dependencies"
+  spec.summary =
+    "Generate cache file of all paths to tags files of dependencies"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-tags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Pezza