summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Holman <bholman.devel@gmail.com>2022-09-07 14:13:31 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-07 14:13:31 +0100
commitbb6c4073e79e86ef69c315338e00c12f0d8d6395 (patch)
tree8e451c198d72c53378d9e6a82d6ffda5f1f22482
parentbd01f476ea8751ce9787271742017b69149edc22 (diff)
downloadvim-git-bb6c4073e79e86ef69c315338e00c12f0d8d6395.tar.gz
patch 9.0.0402: javascript module files are not recoginzedv9.0.0402
Problem: Javascript module files are not recoginzed. Solution: Recognize "*.jsm" files as Javascript. (Brett Holman, closes #11069)
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c7670d08c..e79bbba35 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -940,7 +940,7 @@ au BufNewFile,BufRead *.java,*.jav setf java
au BufNewFile,BufRead *.jj,*.jjt setf javacc
" JavaScript, ECMAScript, ES module script, CommonJS script
-au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs setf javascript
+au BufNewFile,BufRead *.js,*.jsm,*.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 551602fbe..9d2677c7f 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -275,7 +275,7 @@ let s:filename_checks = {
\ 'jam': ['file.jpl', 'file.jpr', 'JAM-file.file', 'JAM.file', 'Prl-file.file', 'Prl.file'],
\ 'java': ['file.java', 'file.jav'],
\ 'javacc': ['file.jj', 'file.jjt'],
- \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
+ \ 'javascript': ['file.js', 'file.jsm', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
\ 'javascript.glimmer': ['file.gjs'],
\ 'javascriptreact': ['file.jsx'],
\ 'jess': ['file.clp'],
diff --git a/src/version.c b/src/version.c
index 3d6a344e1..c06a43cf8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 402,
+/**/
401,
/**/
400,