patch 9.0.1082: some jsonc files are not recognized

Problem:    Some jsonc files are not recognized.
Solution:   Add patterns for jsonc and move some from json to jsonc.
            (closes #11711)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 588244c8de82320ac6efbf637ec584575f81ddd5..cbbe87504efd76db35b7fa7339aafd3c67ade6c1 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -993,23 +993,24 @@ au BufNewFile,BufRead *.jgr                       setf jgraph
 " Jovial
 au BufNewFile,BufRead *.jov,*.j73,*.jovial     setf jovial
 
-" JSON
-au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest     setf json
-
 " JSON5
 au BufNewFile,BufRead *.json5                  setf json5
 
 " JSON Patch (RFC 6902)
-au BufNewFile,BufRead *.json-patch                     setf json
+au BufNewFile,BufRead *.json-patch             setf json
 
 " Jupyter Notebook is also json
-au BufNewFile,BufRead *.ipynb                          setf json
+au BufNewFile,BufRead *.ipynb                  setf json
 
 " Other files that look like json
-au BufNewFile,BufRead .babelrc,.eslintrc,.prettierrc,.firebaserc  setf json
+au BufNewFile,BufRead .prettierrc,.firebaserc  setf json
 
-" JSONC
-au BufNewFile,BufRead *.jsonc                  setf jsonc
+" JSONC (JSON with comments)
+au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc      setf jsonc
+au BufNewFile,BufRead .jshintc,.hintrc,.swrc,[jt]sconfig*.json         setf jsonc
+
+" JSON
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest     setf json
 
 " Jsonnet
 au BufNewFile,BufRead *.jsonnet,*.libsonnet    setf jsonnet

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1cc3c29655dd50f793362d88efb9d5757b989ffb..d3ca2ae4bbc4dd0047e1e3d81fc82cf38592ed93 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -287,9 +287,9 @@ let s:filename_checks = {
     \ 'jgraph': ['file.jgr'],
     \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
     \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
-    \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'],
+    \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', 'file.slnf'],
     \ 'json5': ['file.json5'],
-    \ 'jsonc': ['file.jsonc'],
+    \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
     \ 'jsonnet': ['file.jsonnet', 'file.libsonnet'],
     \ 'jsp': ['file.jsp'],
     \ 'julia': ['file.jl'],

diff --git a/src/version.c b/src/version.c
index 90522fdd20db6963d3d79ce9e7b9fec450a302b0..4baa1b39b01dbb4d42630820198e9edf83fcff38 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1082,
 /**/
     1081,
 /**/