To: vim_dev@googlegroups.com
Subject: Patch 9.0.1268
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.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)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.1267/runtime/filetype.vim	2023-01-30 15:19:53.221000796 +0000
--- runtime/filetype.vim	2023-01-31 18:55:45.040162981 +0000
***************
*** 371,376 ****
--- 371,379 ----
  " 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,1023 ****
  au BufNewFile,BufRead *.ipynb			setf json
  
  " Other files that look like json
! au BufNewFile,BufRead .prettierrc,.firebaserc	setf json
  
  " JSONC (JSON with comments)
  au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc 	setf jsonc
--- 1020,1026 ----
  au BufNewFile,BufRead *.ipynb			setf json
  
  " Other files that look like json
! au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc	setf json
  
  " JSONC (JSON with comments)
  au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc 	setf jsonc
*** ../vim-9.0.1267/src/testdir/test_filetype.vim	2023-01-30 15:19:53.221000796 +0000
--- src/testdir/test_filetype.vim	2023-01-31 18:55:03.628163273 +0000
***************
*** 293,299 ****
      \ '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'],
      \ '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'],
--- 293,299 ----
      \ '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', '.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,662 ****
      \ 'xsd': ['file.xsd'],
      \ 'xslt': ['file.xsl', 'file.xslt'],
      \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
!     \ 'yaml': ['file.yaml', 'file.yml', '.clang-format', '.clang-tidy'],
      \ 'yang': ['file.yang'],
      \ 'z8a': ['file.z8a'],
      \ 'zig': ['file.zig'],
--- 656,662 ----
      \ 'xsd': ['file.xsd'],
      \ 'xslt': ['file.xsl', 'file.xslt'],
      \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
!     \ 'yaml': ['file.yaml', 'file.yml', '.clangd', '.clang-format', '.clang-tidy'],
      \ 'yang': ['file.yang'],
      \ 'z8a': ['file.z8a'],
      \ 'zig': ['file.zig'],
*** ../vim-9.0.1267/src/version.c	2023-01-31 13:25:55.062216292 +0000
--- src/version.c	2023-01-31 18:54:54.788163354 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1268,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
79. All of your most erotic dreams have a scrollbar at the right side.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///