Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow custom language definitions #876

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow custom language definitions #876

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
826c82c
Add second --option directive
AndyMcAliley Mar 8, 2024
1689f81
Only add first --options for custom language
wmcaliley-usgs Mar 8, 2024
008ccee
Save supported_types to avoid extra ctags calls
wmcaliley-usgs Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions autoload/tagbar.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,18 @@ endfunction
function! s:InitTypes() abort
call tagbar#debug#log('Initializing types')

let supported_types = s:GetSupportedFiletypes()
let s:supported_types = s:GetSupportedFiletypes()

if s:ctags_is_uctags
let s:known_types = tagbar#types#uctags#init(supported_types)
let s:known_types = tagbar#types#uctags#init(s:supported_types)
else
let s:known_types = tagbar#types#ctags#init(supported_types)
let s:known_types = tagbar#types#ctags#init(s:supported_types)
endif

" Use dart_ctags if available
let dart_ctags = s:CheckFTCtags('dart_ctags', 'dart')
if dart_ctags !=# ''
let supported_types['dart'] = 1
let s:supported_types['dart'] = 1
call tagbar#debug#log('Detected dart_ctags, overriding typedef')
let type_dart = tagbar#prototypes#typeinfo#new()
let type_dart.ctagstype = 'dart'
Expand Down Expand Up @@ -806,14 +806,14 @@ function! s:GetSupportedFiletypes() abort

let types = split(ctags_output, '\n\+')

let supported_types = {}
let ctags_supported_types = {}
for type in types
if match(type, '\[disabled\]') == -1
let supported_types[tolower(type)] = 1
let ctags_supported_types[tolower(type)] = 1
endif
endfor

return supported_types
return ctags_supported_types
endfunction

" Known files {{{1
Expand Down Expand Up @@ -1419,6 +1419,14 @@ function! s:ExecuteCtagsOnFile(fname, realfname, typeinfo) abort
endif
endfor

" Must define custom languages before --language-force
if has_key(a:typeinfo, 'deffile') && filereadable(expand(a:typeinfo.deffile))
" check if ftype is a custom language (unknown to ctags)
if has_key(a:typeinfo, 'ftype') && !has_key(s:supported_types, a:typeinfo.ftype)
let ctags_args += ['--options=' . expand(a:typeinfo.deffile)]
endif
endif

let ctags_args += ['--language-force=' . ctags_type]
let ctags_args += ['--' . ctags_type . '-kinds=' . ctags_kinds]
endif
Expand Down