aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/filetype.vim8
-rw-r--r--runtime/ftplugin/javascriptreact.vim2
-rw-r--r--runtime/indent/javascriptreact.vim2
-rw-r--r--runtime/syntax/javascriptreact.vim2
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