diff options
| author | Mark Skelton <mdskelton99@gmail.com> | 2023-01-31 18:57:17 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-01-31 18:57:17 +0000 |
| commit | 9c51798a1f3b79ace5ae0551a8bb122025ac94ed (patch) | |
| tree | a3ed359424c2c43b439b359396574ed134d7b2dc | |
| parent | d6e4c75af2d6435794f1a9259141d6d7c1923b4c (diff) | |
patch 9.0.1268: .clangd and .stylelintrc files don't get a filetypev9.0.1268
Problem: .clangd and .stylelintrc files don't get a filetype.
Solution: Use yaml for .clangd and json for .stylelintrc files. (Mark
Skelton, closes #11916)
| -rw-r--r-- | runtime/filetype.vim | 5 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 200153e75e..a06b450d0a 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -371,6 +371,9 @@ au BufNewFile,BufRead *.ch call dist#ft#FTchange() " ChordPro au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro setf chordpro +" Clangd +au BufNewFile,BufRead .clangd setf yaml + " Clang-format au BufNewFile,BufRead .clang-format setf yaml @@ -1017,7 +1020,7 @@ au BufNewFile,BufRead *.json-patch setf json au BufNewFile,BufRead *.ipynb setf json " Other files that look like json -au BufNewFile,BufRead .prettierrc,.firebaserc setf json +au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc setf json " JSONC (JSON with comments) au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc setf jsonc diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 790d98c550..6ffb46755b 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -293,7 +293,7 @@ let s:filename_checks = { \ 'jq': ['file.jq'], \ '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', '.prettierrc', '.firebaserc', 'file.slnf'], + \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'], \ 'json5': ['file.json5'], \ 'jsonc': ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'], \ 'jsonnet': ['file.jsonnet', 'file.libsonnet'], @@ -656,7 +656,7 @@ let s:filename_checks = { \ 'xsd': ['file.xsd'], \ 'xslt': ['file.xsl', 'file.xslt'], \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'], - \ 'yaml': ['file.yaml', 'file.yml', '.clang-format', '.clang-tidy'], + \ 'yaml': ['file.yaml', 'file.yml', '.clangd', '.clang-format', '.clang-tidy'], \ 'yang': ['file.yang'], \ 'z8a': ['file.z8a'], \ 'zig': ['file.zig'], diff --git a/src/version.c b/src/version.c index e06b6be03b..45dd798bf5 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1268, +/**/ 1267, /**/ 1266, |