summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-26 21:28:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-26 21:28:15 +0200
commit92852cee3fcff1dc6ce12387b234634e73267b22 (patch)
tree4cd717def18e5f195d56c3893322f45f304e667c /runtime
parent8e95636a282f3eac808c0e00c053b33334cc283e (diff)
patch 8.1.1930: cannot recognize .jsx and .tsx filesv8.1.1930
Problem: Cannot recognize .jsx and .tsx files. Solution: Recognize them as javascriptreact and typescriptreact. (closes #4830)
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 895ac065a3..e702be9947 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -798,7 +798,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
@@ -1709,6 +1712,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