diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-06-21 10:29:44 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-06-21 11:17:33 +0200 |
| commit | d82efeccc7e89230ba6673da0fdf62c09fa38c17 (patch) | |
| tree | 49d46803d6b9b2c98834f33bd2b391a3bb4264e5 | |
| parent | 5eb604c64214957dc777e77cf1cc8d19dd8d8369 (diff) | |
| download | rneovim-d82efeccc7e89230ba6673da0fdf62c09fa38c17.tar.gz rneovim-d82efeccc7e89230ba6673da0fdf62c09fa38c17.tar.bz2 rneovim-d82efeccc7e89230ba6673da0fdf62c09fa38c17.zip | |
vim-patch:9.1.0506: filetype: .envrc & .prettierignore not recognized
Problem: filetype: .envrc & .prettierignore not recognized
Solution: Detect '.envrc' as shell and '.prettierignore' as gitignore
filetype (Tyler Miller)
Support ft detection for `.envrc` files used by direnv, and
`.prettierignore` files used by prettier.
closes: vim/vim#15053
resolves: neovim/neovim#29405
https://github.com/vim/vim/commit/49012cd8c2fb0452847e5d213b07aa8a978f4762
Co-authored-by: Tyler Miller <tmillr@proton.me>
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 7373c403b5..6dd920e506 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -469,6 +469,7 @@ local extension = { gmi = 'gemtext', gemini = 'gemtext', gift = 'gift', + prettierignore = 'gitignore', gleam = 'gleam', glsl = 'glsl', gn = 'gn', @@ -953,6 +954,7 @@ local extension = { ebuild = detect.bash, eclass = detect.bash, env = detect.sh, + envrc = detect.sh, ksh = detect.ksh, sh = detect.sh, mdd = 'sh', diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index 5d9e5a8a27..da312ded8a 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -287,7 +287,7 @@ func s:GetFilenameChecks() abort \ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'] + s:WhenConfigHome('$XDG_CONFIG_HOME/git/attributes'), \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'], \ 'gitconfig': ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'] + s:WhenConfigHome('$XDG_CONFIG_HOME/git/config'), - \ 'gitignore': ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'] + s:WhenConfigHome('$XDG_CONFIG_HOME/git/ignore'), + \ 'gitignore': ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'] + s:WhenConfigHome('$XDG_CONFIG_HOME/git/ignore') + ['.prettierignore'], \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'], \ 'gitrebase': ['git-rebase-todo'], \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'], @@ -647,7 +647,7 @@ func s:GetFilenameChecks() abort \ 'sh': ['.bashrc', '.bash_profile', '.bash-profile', '.bash_logout', '.bash-logout', '.bash_aliases', '.bash-aliases', '.bash_history', '.bash-history', \ '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD', 'APKBUILD', 'file.bash', '/usr/share/doc/bash-completion/filter.sh', \ '/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf', 'file.bats', '.ash_history', 'any/etc/neofetch/config.conf', '.xprofile', - \ 'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport'], + \ 'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport', '.env', '.envrc'], \ 'sieve': ['file.siv', 'file.sieve'], \ 'sil': ['file.sil'], \ 'simula': ['file.sim'], |