diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-26 19:49:29 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-26 20:01:16 -0500 |
| commit | d697690e24ae5ea9dc5189de504b03823f7fb0f4 (patch) | |
| tree | d16c27cb11a2397b60831e2c13b95617b460df3e | |
| parent | 5f9209389b95c03f22c660e9f36d0158b0f664e3 (diff) | |
| download | rneovim-d697690e24ae5ea9dc5189de504b03823f7fb0f4.tar.gz rneovim-d697690e24ae5ea9dc5189de504b03823f7fb0f4.tar.bz2 rneovim-d697690e24ae5ea9dc5189de504b03823f7fb0f4.zip | |
vim-patch:8.1.2345: .cjs files are not recognized as Javascript
Problem: .cjs files are not recognized as Javascript.
Solution: Add the *.cjs pattern. (closes vim/vim#5268)
https://github.com/vim/vim/commit/c1faf3dc3879e8a5e486f31445b5a5753dcbc6a3
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 8ce45b6a50..e27d234a96 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Aug 26 +" Last Change: 2019 Nov 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -796,8 +796,8 @@ au BufNewFile,BufRead *.java,*.jav setf java " JavaCC au BufNewFile,BufRead *.jj,*.jjt setf javacc -" JavaScript, ECMAScript -au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs setf javascript +" JavaScript, ECMAScript, ES module script, CommonJS script +au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs setf javascript " JavaScript with React au BufNewFile,BufRead *.jsx setf javascriptreact diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 4053746c82..e085f58e56 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -223,7 +223,7 @@ let s:filename_checks = { \ 'jam': ['file.jpl', 'file.jpr'], \ 'java': ['file.java', 'file.jav'], \ 'javacc': ['file.jj', 'file.jjt'], - \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs'], + \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'], \ 'javascriptreact': ['file.jsx'], \ 'jess': ['file.clp'], \ 'jgraph': ['file.jgr'], |