From 3fe80bfbd61e50b5b92330d5f074b6af75a4511c Mon Sep 17 00:00:00 2001
From: Jan Larres <jan@majutsushi.net>
Date: Sun, 24 Apr 2011 13:58:06 +1200
Subject: [PATCH] Add ability to jump to next/previous top-level tag, closes #9

---
 doc/tagbar.txt    |  2 ++
 plugin/tagbar.vim | 38 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/doc/tagbar.txt b/doc/tagbar.txt
index 134971c..2ed33d1 100644
--- a/doc/tagbar.txt
+++ b/doc/tagbar.txt
@@ -249,6 +249,8 @@ o/za          Toggle the fold under the cursor or the current one if there is
               no fold under the cursor.
 */zR          Open all folds by setting foldlevel to 99.
 =/zM          Close all folds by setting foldlevel to 0.
+<C-N>         Go to the next top-level tag.
+<C-P>         Go to the previous top-level tag.
 s             Toggle sort order between name and file order.
 x             Toggle zooming the window.
 q             Close the Tagbar window.
diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index 015bdbd..407e49d 100644
--- a/plugin/tagbar.vim
+++ b/plugin/tagbar.vim
@@ -810,6 +810,11 @@ function! s:MapKeys()
     nnoremap <script> <silent> <buffer> =    :call <SID>SetFoldLevel(0)<CR>
     nnoremap <script> <silent> <buffer> zM   :call <SID>SetFoldLevel(0)<CR>
 
+    nnoremap <script> <silent> <buffer> <C-N>
+                                        \ :call <SID>GotoNextToplevelTag(1)<CR>
+    nnoremap <script> <silent> <buffer> <C-P>
+                                        \ :call <SID>GotoNextToplevelTag(-1)<CR>
+
     nnoremap <script> <silent> <buffer> s    :call <SID>ToggleSort()<CR>
     nnoremap <script> <silent> <buffer> x    :call <SID>ZoomWindow()<CR>
     nnoremap <script> <silent> <buffer> q    :close<CR>
@@ -2160,6 +2165,36 @@ function! s:ToggleHelp()
     redraw
 endfunction
 
+" s:GotoNextToplevelTag() {{{2
+function! s:GotoNextToplevelTag(direction)
+    let curlinenr = line('.')
+    let newlinenr = line('.')
+
+    if a:direction == 1
+        let range = range(line('.') + 1, line('$'))
+    else
+        let range = range(line('.') - 1, 1, -1)
+    endif
+
+    for tmplinenr in range
+        let taginfo = s:GetTagInfo(tmplinenr, 0)
+
+        if empty(taginfo)
+            continue
+        elseif empty(taginfo.parent)
+            let newlinenr = tmplinenr
+            break
+        endif
+    endfor
+
+    if curlinenr != newlinenr
+        execute newlinenr
+        call winline()
+    endif
+
+    redraw
+endfunction
+
 " Folding {{{1
 " s:OpenFold() {{{2
 function! s:OpenFold()
@@ -2395,8 +2430,7 @@ function! s:GetTagInfo(linenr, ignorepseudo)
     let taginfo = fileinfo.tline[a:linenr]
 
     " Check if the current tag is not a pseudo-tag
-    if !has_key(taginfo, 'numtags') &&
-     \ (a:ignorepseudo && taginfo.fields.line == 0)
+    if a:ignorepseudo && taginfo.isPseudoTag()
         return {}
     endif