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 #5268)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index dc1ed7999fd6308669f925274f704e119fbf79b2..6fa4d28b0455ba13485b0930a3370043f43c0a0d 100644 (file)
--- 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 Nov 01
+" Last Change: 2019 Nov 26
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -800,8 +800,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 7fe7a98d8b753cff2387a5ed884f4d27f9dcb0a8..31357e7affb6c12c75d72ca768c0b4f20b1fb6de 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/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'],

diff --git a/src/version.c b/src/version.c
index 9df71b8add048d2e4708fab23f2922e94ee487ae..c35a5c05e0f9ce4d0bb414b7cc4c14c235792e90 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -737,6 +737,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2345,
 /**/
     2344,
 /**/