thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.1.0401: filetype: zsh module files are not recognized

Browse Source 
Problem:  filetype: zsh module files are not recognized
Solution: Detect '*.mdh' and '*.epro' as C filetype, '*.mdd' as zsh
          filetype, determine zsh-modules '*.pro' from from it's content
          (Wu, Zhenyu)

closes: #14737

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Wu, Zhenyu 2024-05-09 20:35:13 +02:00 committed by Christian Brabandt
parent ce2ad9ffd7
commit 887a38cee7
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/autoload/dist/ft.vim vendored
View File

@ -406,14 +406,18 @@ export def FTidl()
setf idl setf idl
enddef enddef
# Distinguish between "default", Prolog and Cproto prototype file. # Distinguish between "default", Prolog, zsh module's C and Cproto prototype file.
export def ProtoCheck(default: string) export def ProtoCheck(default: string)
# zsh modules use '#include "*.pro"'
# https://github.com/zsh-users/zsh/blob/63f086d167960a27ecdbcb762179e2c2bf8a29f5/Src/Modules/example.c#L31
if getline(1) =~ '/* Generated automatically */'
setf c
# Cproto files have a comment in the first line and a function prototype in # Cproto files have a comment in the first line and a function prototype in
# the second line, it always ends in ";". Indent files may also have # the second line, it always ends in ";". Indent files may also have
# comments, thus we can't match comments to see the difference. # comments, thus we can't match comments to see the difference.
# IDL files can have a single ';' in the second line, require at least one # IDL files can have a single ';' in the second line, require at least one
# chacter before the ';'. # chacter before the ';'.
if getline(2) =~ '.;$' elseif getline(2) =~ '.;$'
setf cpp setf cpp
else else
# recognize Prolog by specific text in the first non-empty line # recognize Prolog by specific text in the first non-empty line

9
runtime/filetype.vim
View File

@ -1072,7 +1072,7 @@ au BufNewFile,BufRead */.icewm/menu setf icemenu
au BufNewFile,BufRead .indent.pro setf indent au BufNewFile,BufRead .indent.pro setf indent
au BufNewFile,BufRead indent.pro call dist#ft#ProtoCheck('indent') au BufNewFile,BufRead indent.pro call dist#ft#ProtoCheck('indent')
" IDL (Interactive Data Language) " IDL (Interactive Data Language), Prolog, Cproto or zsh module C
au BufNewFile,BufRead *.pro call dist#ft#ProtoCheck('idlang') au BufNewFile,BufRead *.pro call dist#ft#ProtoCheck('idlang')
" Indent RC " Indent RC
@ -3093,6 +3093,13 @@ au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh') au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh')
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
" Zsh module
" *.mdd will generate *.mdh, *.pro and *.epro.
" module's *.c will #include *.mdh containing module dependency information and
" *.pro containing all static declarations of *.c
" *.epro contains all external declarations of *.c
au BufNewFile,BufRead *.mdh,*.epro setf c
au BufNewFile,BufRead *.mdd setf zsh
" Help files match *.txt but should have a last line that is a modeline. " Help files match *.txt but should have a last line that is a modeline.
au BufNewFile,BufRead *.txt au BufNewFile,BufRead *.txt

4
src/testdir/test_filetype.vim
View File

@ -131,7 +131,7 @@ def s:GetFilenameChecks(): dict<list<string>>
bst: ['file.bst'], bst: ['file.bst'],
bzl: ['file.bazel', 'file.bzl', 'WORKSPACE', 'WORKSPACE.bzlmod'], bzl: ['file.bazel', 'file.bzl', 'WORKSPACE', 'WORKSPACE.bzlmod'],
bzr: ['bzr_log.any', 'bzr_log.file'], bzr: ['bzr_log.any', 'bzr_log.file'],
c: ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg'], c: ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg', 'file.mdh', 'file.epro'],
cabal: ['file.cabal'], cabal: ['file.cabal'],
cabalconfig: ['cabal.config', expand("$HOME/.config/cabal/config")] + WhenConfigHome('$XDG_CONFIG_HOME/cabal/config'), cabalconfig: ['cabal.config', expand("$HOME/.config/cabal/config")] + WhenConfigHome('$XDG_CONFIG_HOME/cabal/config'),
cabalproject: ['cabal.project', 'cabal.project.local'], cabalproject: ['cabal.project', 'cabal.project.local'],
@ -855,7 +855,7 @@ def s:GetFilenameChecks(): dict<list<string>>
zsh: ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', 'file.zsh-theme', 'file.zunit', zsh: ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', 'file.zsh-theme', 'file.zunit',
'.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zsh_history', '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zsh_history',
'.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file', '.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file',
'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'], 'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file', 'file.mdd'],
help: [$VIMRUNTIME .. '/doc/help.txt'], help: [$VIMRUNTIME .. '/doc/help.txt'],
} }

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
401,
/**/ /**/
400, 400,
/**/ /**/