diff options
Diffstat (limited to 'ftdetect/polyglot.vim')
| -rw-r--r-- | ftdetect/polyglot.vim | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 7e3dc45f..6e00b8d3 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -1425,11 +1425,15 @@ endif if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 augroup filetypedetect - " typescript, from typescript.vim in leafgarland/typescript-vim -" use `set filetype` to override default filetype=xml for *.ts files -autocmd BufNewFile,BufRead *.ts set filetype=typescript -" use `setfiletype` to not override any other plugins like ianks/vim-tsx -autocmd BufNewFile,BufRead *.tsx setfiletype typescript + " typescript, from tsx.vim in HerringtonDarkholme/yats.vim +autocmd BufNewFile,BufRead *.tsx setlocal filetype=typescript.tsx + augroup end +endif + +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 + augroup filetypedetect + " typescript, from typescript.vim in HerringtonDarkholme/yats.vim +autocmd BufNewFile,BufRead *.ts setlocal filetype=typescript augroup end endif |