Merge branch 'master' into large-file-handling

autoload/tagbar.vim

@@ -954,10 +954,19 @@ function! s:InitWindow(autoclose) abort
     " Window-local options
 
     setlocal nolist
-    setlocal nowrap
     setlocal winfixwidth
     setlocal nospell
 
+    if g:tagbar_wrap == 0
+        setlocal nowrap
+    else
+        setlocal wrap
+        if exists('+linebreak')
+            setlocal breakindent
+            setlocal breakindentopt=shift:4
+        endif
+    endif
+
     if g:tagbar_show_linenumbers == 0
         setlocal nonumber
         if exists('+relativenumber')

autoload/tagbar/prototypes/basetag.vim

@@ -3,6 +3,9 @@ let s:visibility_symbols = {
     \ 'protected' : '#',
     \ 'private'   : '-'
 \ }
+if exists('g:tagbar_visibility_symbols') && !empty(g:tagbar_visibility_symbols)
+    let s:visibility_symbols = g:tagbar_visibility_symbols
+endif
 
 function! tagbar#prototypes#basetag#new(name) abort
     let newobj = {}

autoload/tagbar/prototypes/normaltag.vim

@@ -1,3 +1,12 @@
+function! s:maybe_map_scope(scopestr) abort
+    if !empty(g:tagbar_scopestrs)
+        if has_key(g:tagbar_scopestrs, a:scopestr)
+            return g:tagbar_scopestrs[a:scopestr]
+        endif
+    endif
+    return a:scopestr
+endfunction
+
 function! tagbar#prototypes#normaltag#new(name) abort
     let newobj = tagbar#prototypes#basetag#new(a:name)
 
@@ -22,7 +31,8 @@ function! s:strfmt() abort dict
     if has_key(self.fields, 'type')
         let suffix .= ' : ' . self.fields.type
     elseif has_key(get(typeinfo, 'kind2scope', {}), self.fields.kind)
-        let suffix .= ' : ' . typeinfo.kind2scope[self.fields.kind]
+        let scope = s:maybe_map_scope(typeinfo.kind2scope[self.fields.kind])
+        let suffix .= ' : ' . scope
     endif
 
     return self._getPrefix() . self.name . suffix