diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-09-28 02:19:06 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-09-28 02:19:06 +0200 |
| commit | 417df69667c1df5484d01ea766320324759d8718 (patch) | |
| tree | f34979cb45d0148aec93d15d785699b8a6289a30 | |
| parent | ae778bdb175f930b69facec5f3ccd1b95953bc88 (diff) | |
| download | vim-polyglot-417df69667c1df5484d01ea766320324759d8718.tar.gz vim-polyglot-417df69667c1df5484d01ea766320324759d8718.zip | |
Fix zsh missing filenames
| -rw-r--r-- | autoload/sleuth.vim | 2 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 5 | ||||
| -rw-r--r-- | packages.yaml | 3 | ||||
| -rwxr-xr-x | scripts/build | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim index 4c1ba5b8..d73e48bf 100644 --- a/autoload/sleuth.vim +++ b/autoload/sleuth.vim @@ -228,7 +228,7 @@ let s:globs = { \ 'zephir': '*.zep', \ 'zig': '*.zig,*.zir', \ 'zir': '*.zir', - \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout', + \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks', \} func! sleuth#GlobForFiletype(type) diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index b6a772b7..ad8feb24 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -427,7 +427,7 @@ if !has_key(s:disabled_packages, 'scss') endif if !has_key(s:disabled_packages, 'sh') - au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout + au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks endif if !has_key(s:disabled_packages, 'smt2') @@ -1773,6 +1773,9 @@ if !has_key(s:disabled_packages, 'sh') au BufNewFile,BufRead man set ft=sh au BufNewFile,BufRead profile set ft=sh au BufNewFile,BufRead *.zsh set ft=zsh + au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh') + au BufNewFile,BufRead {.,}zfbfmarks set ft=zsh + au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh') au BufNewFile,BufRead {.,}zlogin set ft=zsh au BufNewFile,BufRead {.,}zlogout set ft=zsh au BufNewFile,BufRead {.,}zprofile set ft=zsh diff --git a/packages.yaml b/packages.yaml index 494812f6..e0c4be4c 100644 --- a/packages.yaml +++ b/packages.yaml @@ -1504,6 +1504,9 @@ filetypes: - '.zlogin' - '.zprofile' - '.zlogout' + - '.zlog*' + - '.zcompdump*' + - '.zfbfmarks' --- name: zinit remote: zinit-zsh/zplugin-vim-syntax diff --git a/scripts/build b/scripts/build index dd0af0c0..49ae41e1 100755 --- a/scripts/build +++ b/scripts/build @@ -729,6 +729,7 @@ def show_warnings(all_filetypes, expected_filetypes) if !ENV["DEV"] return end + all_expected = process_list(expected_filetypes, false) do |f| (f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || []) end @@ -742,8 +743,11 @@ def show_warnings(all_filetypes, expected_filetypes) [a, Regexp.union(b.map { |x| Regexp.escape(x).gsub('\\*', '.*') })] end] + puts all_handled.select { |a, b| a.include?('zsh') } + + puts all_handled_regexps["zsh"] for name, e in all_expected - all_handled - if e.match?(/\/\*?\.[^\/]+$/) && all_handled.include?([name, e.split('/').last.gsub('*', '')]) + if all_handled.include?([name, e.split('/').last.gsub('*', '')]) next end if e.include?('*') && all_handled_regexps[name].match?(e) |