From 49697a751fb865a7b877f1f31768b30312afe06b Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Wed, 4 Feb 2015 05:10:33 +0700
Subject: [PATCH] Add preview window support

Generalizes the approach so that the function doesn't need logic to
handle split, preview, etc. Also no longer results in the cursor being
moved to beginning of the function call (or record/macro after #15) in
the original buffer.
---
 plugin/vim-erlang-tags.vim | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/plugin/vim-erlang-tags.vim b/plugin/vim-erlang-tags.vim
index 839b699..6fcf96b 100644
--- a/plugin/vim-erlang-tags.vim
+++ b/plugin/vim-erlang-tags.vim
@@ -50,25 +50,29 @@ endfunction
 
 command! ErlangTags call VimErlangTags()
 
-function! VimErlangTagsSelect(split)
-    if a:split
-        split
-    endif
+" Execute the given tag lookup for current word, where 'iskeyword' is
+" temporarily set such that modules, records, and macros are included.
+function! s:GoToErlangTag(cmd)
     let orig_isk = &isk
-    set isk+=:
-    normal "_vawo
-    if getline('.')[col('.') - 2] =~# '[#?]'
-        normal h
-    endif
+    set isk+=:,#,?
+    let ident = expand('<cword>')
     let &isk = orig_isk
+
+    execute a:cmd ident
 endfunction
 
 function! VimErlangTagsDefineMappings()
-    nnoremap <buffer> <c-]>         :call VimErlangTagsSelect(0)<cr><c-]>
-    nnoremap <buffer> g<LeftMouse>  :call VimErlangTagsSelect(0)<cr><c-]>
-    nnoremap <buffer> <c-LeftMouse> :call VimErlangTagsSelect(0)<cr><c-]>
-    nnoremap <buffer> g]            :call VimErlangTagsSelect(0)<cr>g]
-    nnoremap <buffer> g<c-]>        :call VimErlangTagsSelect(0)<cr>g<c-]>
-    nnoremap <buffer> <c-w><c-]>    :call VimErlangTagsSelect(1)<cr><c-]>
-    nnoremap <buffer> <c-w>]        :call VimErlangTagsSelect(1)<cr><c-]>
+    nnoremap <buffer> <c-]>         :<C-U>call <SID>GoToErlangTag('tag')<cr>
+    nnoremap <buffer> g<LeftMouse>  :<C-U>call <SID>GoToErlangTag('tag')<cr>
+    nnoremap <buffer> <c-LeftMouse> :<C-U>call <SID>GoToErlangTag('tag')<cr>
+    nnoremap <buffer> g]            :<C-U>call <SID>GoToErlangTag('tselect')<cr>
+    nnoremap <buffer> g<c-]>        :<C-U>call <SID>GoToErlangTag('tjump')<cr>
+    nnoremap <buffer> <c-w><c-]>    :<C-U>call <SID>GoToErlangTag('stag')<cr>
+    nnoremap <buffer> <c-w>]        :<C-U>call <SID>GoToErlangTag('stag')<cr>
+    nnoremap <buffer> <c-w>g]       :<C-U>call <SID>GoToErlangTag('stselect')<cr>
+    nnoremap <buffer> <c-w>g<c-]>   :<C-U>call <SID>GoToErlangTag('stjump')<cr>
+    nnoremap <buffer> <c-w>}        :<C-U>call <SID>GoToErlangTag('ptag')<cr>
+    nnoremap <buffer> <c-w>g}       :<C-U>call <SID>GoToErlangTag('ptjump')<cr>
 endfunction
+
+" vim:set expandtab sw=4 ts=4: