Updatev1.13.1

2 files changed, 26 insertions, 25 deletions

diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index 19353ef1..5e1f2af6 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -10,35 +10,19 @@ endif
 
 let g:tagbar_type_scala = {
     \ 'ctagstype' : 'scala',
+    \ 'sro'        : '.',
     \ 'kinds'     : [
-      \ 'p:packages:1',
-      \ 'V:values',
-      \ 'v:variables',
-      \ 'T:types',
+      \ 'p:packages',
+      \ 'T:types:1',
       \ 't:traits',
       \ 'o:objects',
-      \ 'a:aclasses',
+      \ 'O:case objects',
       \ 'c:classes',
-      \ 'r:cclasses',
-      \ 'm:methods'
-    \ ],
-    \ 'sro'        : '.',
-    \ 'kind2scope' : {
-        \ 'T' : 'type',
-        \ 't' : 'trait',
-        \ 'o' : 'object',
-        \ 'a' : 'abstract class',
-        \ 'c' : 'class',
-        \ 'r' : 'case class'
-    \ },
-    \ 'scope2kind' : {
-      \ 'type' : 'T',
-      \ 'trait' : 't',
-      \ 'object' : 'o',
-      \ 'abstract class' : 'a',
-      \ 'class' : 'c',
-      \ 'case class' : 'r'
-    \ }
+      \ 'C:case classes',
+      \ 'm:methods',
+      \ 'V:values:1',
+      \ 'v:variables:1'
+    \ ]
 \ }
 
 " In case you've updated/customized your ~/.ctags and prefer to use it.
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 9e98e790..ed1b8aae 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,2 +1,19 @@
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
 compiler typescript
 setlocal commentstring=//\ %s
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" " and insert the comment leader when hitting <CR> or using "o".
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setl fo< ofu< com< cms<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save