mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0958: filetype: supertux2 config files detected as lisp

Browse Source 
Problem:  filetype: supertux2 config files detected as lisp
Solution: detect supertux2 config files as scheme instead
          (Wu, Zhenyu)

References:
https://github.com/SuperTux/supertux/wiki/S-Expression

supertux uses #t and #f as bool type, which is same as scheme, not
common lisp

closes: vim/vim#16287

e62d93ead1

Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
This commit is contained in:
Christian Clason
2024-12-24 10:31:35 +01:00
committed by Christian Clason
parent c51bf5a6b2
commit 14ee1de7e5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lua/vim/filetype.lua
View File

@@ -699,7 +699,6 @@ local extension = {
el = 'lisp', el = 'lisp',
lsp = 'lisp', lsp = 'lisp',
asd = 'lisp', asd = 'lisp',
stsg = 'lisp',
lt = 'lite', lt = 'lite',
lite = 'lite', lite = 'lite',
livemd = 'livebook', livemd = 'livebook',
@@ -1072,6 +1071,7 @@ local extension = {
ss = 'scheme', ss = 'scheme',
scm = 'scheme', scm = 'scheme',
sld = 'scheme', sld = 'scheme',
stsg = 'scheme',
sce = 'scilab', sce = 'scilab',
sci = 'scilab', sci = 'scilab',
scss = 'scss', scss = 'scss',
@@ -2159,8 +2159,8 @@ local pattern = {
['/gitolite%-admin/conf/'] = starsetf('gitolite'), ['/gitolite%-admin/conf/'] = starsetf('gitolite'),
['/%.i3/config$'] = 'i3config', ['/%.i3/config$'] = 'i3config',
['/i3/config$'] = 'i3config', ['/i3/config$'] = 'i3config',
['/supertux2/config$'] = 'lisp',
['/%.mplayer/config$'] = 'mplayerconf', ['/%.mplayer/config$'] = 'mplayerconf',
['/supertux2/config$'] = 'scheme',
['/neofetch/config%.conf$'] = 'sh', ['/neofetch/config%.conf$'] = 'sh',
['/%.ssh/config$'] = 'sshconfig', ['/%.ssh/config$'] = 'sshconfig',
['/%.sway/config$'] = 'swayconfig', ['/%.sway/config$'] = 'swayconfig',

4
test/old/testdir/test_filetype.vim
View File

@@ -426,7 +426,7 @@ func s:GetFilenameChecks() abort
\ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf', '/etc/limits.conf', '/etc/limits.d/file.conf', '/etc/some-limits.conf', '/etc/some-limits.d/file.conf', 'any/etc/limits', 'any/etc/limits.conf', 'any/etc/limits.d/file.conf', 'any/etc/some-limits.conf', 'any/etc/some-limits.d/file.conf'], \ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf', '/etc/limits.conf', '/etc/limits.d/file.conf', '/etc/some-limits.conf', '/etc/some-limits.d/file.conf', 'any/etc/limits', 'any/etc/limits.conf', 'any/etc/limits.d/file.conf', 'any/etc/some-limits.conf', 'any/etc/some-limits.d/file.conf'],
\ 'liquidsoap': ['file.liq'], \ 'liquidsoap': ['file.liq'],
\ 'liquid': ['file.liquid'], \ 'liquid': ['file.liquid'],
\ 'lisp': ['file.lsp', 'file.lisp', 'file.asd', 'file.el', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc', 'file.stsg', 'any/local/share/supertux2/config'], \ 'lisp': ['file.lsp', 'file.lisp', 'file.asd', 'file.el', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'],
\ 'lite': ['file.lite', 'file.lt'], \ 'lite': ['file.lite', 'file.lt'],
\ 'litestep': ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'], \ 'litestep': ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'],
\ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'], \ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'],
@@ -668,7 +668,7 @@ func s:GetFilenameChecks() abort
\ 'sather': ['file.sa'], \ 'sather': ['file.sa'],
\ 'sbt': ['file.sbt'], \ 'sbt': ['file.sbt'],
\ 'scala': ['file.scala'], \ 'scala': ['file.scala'],
\ 'scheme': ['file.scm', 'file.ss', 'file.sld'], \ 'scheme': ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config'],
\ 'scilab': ['file.sci', 'file.sce'], \ 'scilab': ['file.sci', 'file.sce'],
\ 'screen': ['.screenrc', 'screenrc'], \ 'screen': ['.screenrc', 'screenrc'],
\ 'scss': ['file.scss'], \ 'scss': ['file.scss'],