rb_nav 0.1.3 → 0.1.4

data/README.markdown

@@ -5,12 +5,15 @@ modules, and methods in your Ruby project
 
 [screenshots]
 
-Benefits
+Benefits:
 
 * navigate the classes and modules in your Ruby projects with less typing
 * jump to methods on current page more quickly
 * symbol-centric approach to navigation might suit you better than the file-centric approach
 
+Please check out my related Vim plugin
+[ri.vim](http://danielchoi.com/software/ri_vim.html) for Ruby
+documentation-browsing features.
 
 ## Prerequisites
 
@@ -40,16 +43,13 @@ For the all the commands below, the mapleader is assumed to be `,`. If it is
 ### Invoking the plugin
 
 * `,N` navigate the classes and modules in your project
-* `,n` navigating the methods in the current file
+* `,n` navigate the methods in the current file
 
-To change these keymappings, edit the two `nnoremap` lines at the end of
+To change these keymappings, edit the two lines at the end of
 `~/.vim/plugin/rb_nav.vim`.
 
-Use the standard Vim autocompletion commands to move up and down the match
-list.
-
-* `CTRL-p` and `CTRL-n` let you navigate the drop-down matches. Press `ENTER` to select
-one.
+* `CTRL-p` and `CTRL-n` let you navigate the drop-down matches
+* `<TAB><ENTER>` selects an item
 * `CTRL-e` closes the match list and lets you continue typing
 * `CTRL-u`: when the match list is active, cycles forward through the match
   list and what you've typed so far; when the match list is inactive, erases
@@ -58,6 +58,8 @@ one.
 * `CTRL-y` selects the highlighted match without triggering ENTER
 
 
+
+
 ### The search path
 
 By default RbNav searches files using these `grep` command flags:

data/bin/rb_nav_methods

@@ -6,7 +6,7 @@
 xs = STDIN.readlines.
   map {|x| 
     line, method = *x.strip.split(/:/) 
-    method = method.strip
+    method = method.strip.sub(/^\s*def\s*/, '')
     [method, line]
   }
 

data/lib/rb_nav.vim

@@ -7,6 +7,7 @@
 let g:RbNavPaths = " . --exclude-dir='\.git' --exclude-dir='vendor' --exclude-dir='db' --include='*.rb' "
 
 let s:last_class_search = ""
+let s:selection_list = []
 
 func! RbNavClasses()
 endfunc
@@ -51,7 +52,8 @@ function! AutocompleteRbNavClasses(findstart, base)
     return start
   else
     let res = [] 
-    for m in RbNavClasses()
+    let s:selection_list = RbNavClasses()
+    for m in s:selection_list
       " why doesn't case insensitive flag work?
       if m =~ substitute(a:base, '\*', '\\*', '')
         call add(res, m)
@@ -86,8 +88,8 @@ function! AutocompleteRbNavMethods(findstart, base)
     return start
   else
     let res = [] 
-    for m in RbNavMethods()
-      " why doesn't case insensitive flag work?
+    let s:selection_list = RbNavMethods()
+    for m in s:selection_list 
       if m =~ '^\c.\?' . substitute(a:base, '\*', '\\*', '')
         call add(res, m)
       endif
@@ -110,6 +112,14 @@ func! s:open_class_file()
   endif
   let selection = s:trimString(getline(2))
   close
+  if len(split(selection, '\s\+')) == 1
+    " user pressed return without autocompleting, so find the first match
+    for x in s:selection_list
+      if get(split(x, '\s\+'), 0) == selection
+        let selection = x
+      endif
+    endfor
+  endif
   let query = get(split(selection, '\s\+'), 0)
   let location = get(split(selection, '\s\+'), -1)
   let path = get(split(location, ':'), 0)
@@ -131,6 +141,14 @@ func! s:jump_to_method()
   endif
   let selection = s:trimString(getline(2))
   close
+  if len(split(selection, '\s\+')) == 1
+    " user pressed return without autocompleting, so find the first match
+    for x in s:selection_list
+      if get(split(x, '\s\+'), 0) == selection
+        let selection = x
+      endif
+    endfor
+  endif
   let line = get(split(selection, '\s\+'), -1)
   exec 'normal '.line.'G'
   call feedkeys("z\<cr>", "t")

data/lib/rb_nav/version.rb

@@ -1,4 +1,4 @@
 module RbNav
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -2,7 +2,7 @@
 name: rb_nav
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Daniel Choi