Commit: 191de01af32cf9110cc40b8655d76161ec537fb5 - vim (git)

Commit MetaInfo

• Révision: 191de01af32cf9110cc40b8655d76161ec537fb5 (tree)
• l'heure: 2018-12-12 07:34:38
• Auteur: Markus <Markus@dark...>
• Commiter: Markus

Message de Log

put highlighting of tagged types and functions in a single function

Change Summary

• modified: after/ftplugin/c.vim
• modified: autoload/c.vim

Modification

--- a/after/ftplugin/c.vim
+++ b/after/ftplugin/c.vim
@@ -2,10 +2,9 @@
 " Description:   Some support functions and mappings for C code files.
 " Maintainer:    markus prepens (markus dot prepens at gmail dot com)
 
-command! -buffer -nargs=0 ShowFunctions           call c#HighlightTaggedFunctions()
-command! -buffer -nargs=0 ShowTypes               call c#HighlightTaggedTypes()
-command! -buffer -nargs=0 ToggleSourceHeaderFile  call c#ToggleSourceHeaderFile()
-command! -buffer -nargs=0 PrettifyCode            call c#CodeCleanup()
+command! -buffer -nargs=0 ShowTags               call c#HighlightTaggedFunctions()
+command! -buffer -nargs=0 ToggleSourceHeaderFile call c#ToggleSourceHeaderFile()
+command! -buffer -nargs=0 PrettifyCode           call c#CodeCleanup()
 
 nnoremap <buffer> <LocalLeader><TAB> :ToggleSourceHeaderFile<CR>
 

--- a/autoload/c.vim
+++ b/autoload/c.vim
@@ -56,28 +56,21 @@ function! c#ToggleSourceHeaderFile()
   endfor
 endfunction
 
-" Description: scan trough current TAG file, find the function symbols and
-" highlight them as keyword.
-function! c#HighlightTaggedFunctions()
-  for l:tagsfile in tagfiles()
-    for l:line in readfile(l:tagsfile)
-      if match(l:line, '\<f\>') > 0
-        let l:symbolStr = split(l:line, '\s\+')[0]
-        execute "syntax keyword Function " . l:symbolStr
-      endif
-    endfor
-  endfor
-endfunction
-
-" Description: scan trough current TAG file, find the type symbols and
-" highlight them as keyword.
-function! c#HighlightTaggedTypes()
+" Description: scan trough current TAG file, find the type and function symbols
+" and highlight them as keyword.
+function! c#HighlightTags()
+  let g:tagged_files = []
   for l:tagsfile in tagfiles()
     for l:line in readfile(l:tagsfile)
+      let l:line_split = split(l:line, '\s\+');
       if match(l:line, '\<t\>') > 0
-        let l:typeStr = split(l:line, '\s\+')[0]
-        execute "syntax keyword cType " . l:typeStr
+        execute "syntax keyword cType l:line_split[0]"
+        call insert(g:tagged_files, line_split[1])
+      elseif match(l:line, '\<f\>') > 0
+        execute "syntax keyword Function l:line_split[0]"
+        call insert(g:tagged_files, line_split[1])
       endif
     endfor
+    call uniq(sort(g:tagged_files))
   endfor
 endfunction