aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2022-10-19 20:08:01 +0300
committerGitHub <noreply@github.com>2022-10-19 11:08:01 -0600
commitfad558b6affd54075654dd55922348f76a95e338 (patch)
tree8a1a6e9bb69da6a2529166d620afe2de3ad9a4c0
parent96cf385a7f4ab29f6987c10b5c3625d99b22f6fc (diff)
downloadrneovim-fad558b6affd54075654dd55922348f76a95e338.tar.gz
rneovim-fad558b6affd54075654dd55922348f76a95e338.tar.bz2
rneovim-fad558b6affd54075654dd55922348f76a95e338.zip
vim-patch:9.0.0798: clang format configuration files are not recognized (#20741)
Problem: Clang format configuration files are not recognized. Solution: Use yaml for Clang format configuration files. (Marwin Glaser, closes vim/vim#11398) https://github.com/vim/vim/commit/3c708c43908ba44f075bbaa7daf584c6b46d9723
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 7dd1d7cd25..af2617677e 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1676,6 +1676,7 @@ local filename = {
fglrxrc = 'xml',
['/etc/blkid.tab'] = 'xml',
['/etc/blkid.tab.old'] = 'xml',
+ ['.clang-format'] = 'yaml',
['.clang-tidy'] = 'yaml',
['/etc/zprofile'] = 'zsh',
['.zlogin'] = 'zsh',
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index c9ec7771f4..44711e3fcc 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -642,7 +642,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-tidy'],
+ \ 'yaml': ['file.yaml', 'file.yml', '.clang-format', '.clang-tidy'],
\ 'yang': ['file.yang'],
\ 'z8a': ['file.z8a'],
\ 'zig': ['file.zig'],