aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-12-25 11:41:36 +0100
committerChristian Clason <ch.clason+github@icloud.com>2024-12-25 13:38:45 +0100
commit01e1598072249011ac2cec7318559cea6179e509 (patch)
tree196b8bd59ad0c2655707ad20924ec889719ccd41
parentb51110f4a11af114401e626cd4c1f1aec23e81c5 (diff)
downloadrneovim-01e1598072249011ac2cec7318559cea6179e509.tar.gz
rneovim-01e1598072249011ac2cec7318559cea6179e509.tar.bz2
rneovim-01e1598072249011ac2cec7318559cea6179e509.zip
vim-patch:9.1.0960: filetype: hy history files are not recognized
Problem: filetype: hy history files are not recognized Solution: detect '*.hy', '.hy-history' files as hy filetype, detect '.lips_repl_history' files are scheme filetype (Wu, Zhenyu) closes: vim/vim#16298 https://github.com/vim/vim/commit/a32daed55933df49a7aed571cc6e400ae01c7976 Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua3
-rw-r--r--test/old/testdir/test_filetype.vim3
2 files changed, 5 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 80d25fe515..2b5a201c0f 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -592,6 +592,7 @@ local extension = {
hw = detect.hw,
module = detect.hw,
pkg = detect.hw,
+ hy = 'hy',
iba = 'ibasic',
ibi = 'ibasic',
icn = 'icon',
@@ -1603,6 +1604,7 @@ local filename = {
['/etc/host.conf'] = 'hostconf',
['/etc/hosts.allow'] = 'hostsaccess',
['/etc/hosts.deny'] = 'hostsaccess',
+ ['.hy-history'] = 'hy',
['hyprland.conf'] = 'hyprlang',
['hyprpaper.conf'] = 'hyprlang',
['hypridle.conf'] = 'hyprlang',
@@ -1778,6 +1780,7 @@ local filename = {
['Rantfile'] = 'ruby',
Vagrantfile = 'ruby',
['smb.conf'] = 'samba',
+ ['.lips_repl_history'] = 'scheme',
screenrc = 'screen',
['.screenrc'] = 'screen',
['/etc/sensors3.conf'] = 'sensors',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 93fdb7fd27..e30e464fd7 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -356,6 +356,7 @@ func s:GetFilenameChecks() abort
\ 'htmlm4': ['file.html.m4'],
\ 'httest': ['file.htt', 'file.htb'],
\ 'hurl': ['file.hurl'],
+ \ 'hy': ['file.hy', '.hy-history'],
\ 'hyprlang': ['hyprlock.conf', 'hyprland.conf', 'hypridle.conf', 'hyprpaper.conf', '/hypr/foo.conf'],
\ 'i3config': ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
\ 'ibasic': ['file.iba', 'file.ibi'],
@@ -668,7 +669,7 @@ func s:GetFilenameChecks() abort
\ 'sather': ['file.sa'],
\ 'sbt': ['file.sbt'],
\ 'scala': ['file.scala'],
- \ 'scheme': ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config'],
+ \ 'scheme': ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config', '.lips_repl_history'],
\ 'scilab': ['file.sci', 'file.sce'],
\ 'screen': ['.screenrc', 'screenrc'],
\ 'scss': ['file.scss'],