Merge branch 'release/0.5'

vim-php · Jun 24, 2013 · bedf65d · bedf65d
2 parents 9359618 + e9f7b6b
commit bedf65d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,8 @@
+Version 0.5
+-----------
+
+* work with phpctags v0.5
+
 Version 0.4.2
 -------------
 

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ source := README.md \
           bin/phpctags \
           plugin/tagbar-phpctags.vim
 
-version := 0.4.2
+version := 0.5
 
 .PHONY: all
 all: bin/phpctags

diff --git a/plugin/tagbar-phpctags.vim b/plugin/tagbar-phpctags.vim
@@ -24,19 +24,25 @@ let g:tagbar_type_php = {
         \ 'i:Interfaces:0',
         \ 'c:Classes:0',
         \ 'p:Properties:0:0',
-        \ 'm:Methods:1'
+        \ 'm:Methods:1',
+        \ 'n:Namespaces:0',
+        \ 't:Traits:0',
     \ ],
     \ 'sro'        : '::',
     \ 'kind2scope' : {
         \ 'c' : 'class',
         \ 'm' : 'method',
         \ 'f' : 'function',
-        \ 'i' : 'interface'
+        \ 'i' : 'interface',
+        \ 'n' : 'namespace',
+        \ 't' : 'trait',
     \ },
     \ 'scope2kind' : {
         \ 'class'     : 'c',
         \ 'method'    : 'm',
         \ 'function'  : 'f',
-        \ 'interface' : 'i'
+        \ 'interface' : 'i',
+        \ 'namespace' : 'n',
+        \ 'trait'     : 't',
     \ }
 \ }