diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-27 09:27:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 09:27:03 +0200 |
| commit | 4cedc8444e20b5b9a558c66a96851c39abedef70 (patch) | |
| tree | 68bf29ceec922b941ec1aea243ffe40b60f1d921 /runtime | |
| parent | f3cb5297746dfd6d5686f6d142d4cfea55c81d9e (diff) | |
| parent | 41ec296640fe286541a9a842e463abbb475e0a03 (diff) | |
| download | rneovim-4cedc8444e20b5b9a558c66a96851c39abedef70.tar.gz rneovim-4cedc8444e20b5b9a558c66a96851c39abedef70.tar.bz2 rneovim-4cedc8444e20b5b9a558c66a96851c39abedef70.zip | |
Merge #10858 from janlazo/vim-8.1.1930
vim-patch:8.1.{1930,1931}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/filetype.vim | 8 | ||||
| -rw-r--r-- | runtime/ftplugin/javascriptreact.vim | 2 | ||||
| -rw-r--r-- | runtime/indent/javascriptreact.vim | 2 | ||||
| -rw-r--r-- | runtime/syntax/javascriptreact.vim | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 4cc2f49a63..43e96f2049 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -791,7 +791,10 @@ au BufNewFile,BufRead *.java,*.jav setf java au BufNewFile,BufRead *.jj,*.jjt setf javacc " JavaScript, ECMAScript -au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx,*.mjs setf javascript +au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs setf javascript + +" JavaScript with React +au BufNewFile,BufRead *.jsx setf javascriptreact " Java Server Pages au BufNewFile,BufRead *.jsp setf jsp @@ -1705,6 +1708,9 @@ au BufNewFile,BufReadPost *.twig setf twig " Typescript au BufNewFile,BufReadPost *.ts setf typescript +" TypeScript with React +au BufNewFile,BufRead *.tsx setf typescriptreact + " Motif UIT/UIL files au BufNewFile,BufRead *.uit,*.uil setf uil diff --git a/runtime/ftplugin/javascriptreact.vim b/runtime/ftplugin/javascriptreact.vim new file mode 100644 index 0000000000..ea5c9f5d99 --- /dev/null +++ b/runtime/ftplugin/javascriptreact.vim @@ -0,0 +1,2 @@ +" Placeholder for backwards compatilibity: .jsx used to stand for JavaScript. +source %:h/javascript.vim diff --git a/runtime/indent/javascriptreact.vim b/runtime/indent/javascriptreact.vim new file mode 100644 index 0000000000..ea5c9f5d99 --- /dev/null +++ b/runtime/indent/javascriptreact.vim @@ -0,0 +1,2 @@ +" Placeholder for backwards compatilibity: .jsx used to stand for JavaScript. +source %:h/javascript.vim diff --git a/runtime/syntax/javascriptreact.vim b/runtime/syntax/javascriptreact.vim new file mode 100644 index 0000000000..ea5c9f5d99 --- /dev/null +++ b/runtime/syntax/javascriptreact.vim @@ -0,0 +1,2 @@ +" Placeholder for backwards compatilibity: .jsx used to stand for JavaScript. +source %:h/javascript.vim |