Mercurial > ec-dotfiles

diff rc/vimrc @ 636:8812b9230a68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author nanaya <me@nanaya.pro>
date Tue, 14 Jan 2020 11:09:50 +0900
parents 5d3ce722285a ced2ee9efd9f
children 758ced52ee62
line wrap: on
line diff
--- a/rc/vimrc	Mon Jan 13 00:19:42 2020 +0900
+++ b/rc/vimrc	Tue Jan 14 11:09:50 2020 +0900
@@ -117,8 +117,7 @@
   " stolen from https://github.com/leafgarland/typescript-vim/blob/master/ftdetect/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
+  autocmd BufNewFile,BufRead *.tsx set filetype=typescriptreact
 
   autocmd BufRead,BufNewFile *.nginx set ft=nginx
   autocmd BufRead,BufNewFile */etc/nginx/* set ft=nginx
@@ -136,6 +135,7 @@
   autocmd FileType json call In2()
   autocmd FileType javascript call In2()
   autocmd FileType typescript call In2()
+  autocmd FileType typescript.tsx call In2()
   autocmd FileType nginx setlocal commentstring=#\ %s
   autocmd FileType nginx setlocal iskeyword&
 endif