Mercurial > vim
changeset 28417:bca485676073 v8.2.4733
patch 8.2.4733: HEEx and Surface do need a separate filetype
Commit: https://github.com/vim/vim/commit/4232dff815db1a727cb1aea26783267d8bd731c3
Author: Aaron Tinio <aptinio@gmail.com>
Date: Mon Apr 11 11:37:13 2022 +0100
patch 8.2.4733: HEEx and Surface do need a separate filetype
Problem: HEEx and Surface do need a separate filetype.
Solution: Revert 8.2.4729. (closes https://github.com/vim/vim/issues/10147)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 11 Apr 2022 12:45:03 +0200 |
| parents | 65c2d252fea8 |
| children | 2da2c67d0db0 |
| files | runtime/filetype.vim src/testdir/test_filetype.vim src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -416,9 +416,9 @@ au BufNewFile,BufRead *Eterm/*.cfg setf " Elixir or Euphoria au BufNewFile,BufRead *.ex call dist#ft#ExCheck() -" Elixir, also used for HEEx and Surface +" Elixir au BufRead,BufNewFile mix.lock,*.exs setf elixir -au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface setf eelixir +au BufRead,BufNewFile *.eex,*.leex setf eelixir " Elvish au BufRead,BufNewFile *.elv setf elvish @@ -797,6 +797,9 @@ au BufRead,BufNewFile *.hcl setf hcl " Hercules au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum setf hercules +" HEEx +au BufRead,BufNewFile *.heex setf heex + " HEX (Intel) au BufNewFile,BufRead *.hex,*.h32 setf hex @@ -1902,6 +1905,9 @@ au BufNewFile,BufRead */etc/sudoers,sudo " SVG (Scalable Vector Graphics) au BufNewFile,BufRead *.svg setf svg +" Surface +au BufRead,BufNewFile *.sface setf surface + " Tads (or Nroff or Perl test file) au BufNewFile,BufRead *.t \ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
--- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -166,7 +166,7 @@ let s:filename_checks = { \ 'edif': ['file.edf', 'file.edif', 'file.edo'], \ 'elinks': ['elinks.conf'], \ 'elixir': ['file.ex', 'file.exs', 'mix.lock'], - \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'], + \ 'eelixir': ['file.eex', 'file.leex'], \ 'elm': ['file.elm'], \ 'elmfilt': ['filter-rules'], \ 'elvish': ['file.elv'], @@ -237,6 +237,7 @@ let s:filename_checks = { \ 'hb': ['file.hb'], \ 'hcl': ['file.hcl'], \ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'], + \ 'heex': ['file.heex'], \ 'hex': ['file.hex', 'file.h32'], \ 'hgcommit': ['hg-editor-file.txt'], \ 'hjson': ['file.hjson'], @@ -516,6 +517,7 @@ let s:filename_checks = { \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'], \ 'stp': ['file.stp'], \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'], + \ 'surface': ['file.sface'], \ 'svg': ['file.svg'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], \ 'swift': ['file.swift'], @@ -929,6 +931,7 @@ func Test_dat_file() call assert_equal('dat', &filetype) bwipe! call delete('datfile.DAT') + unlet g:filetype_dat filetype off endfunc @@ -1523,6 +1526,7 @@ func Test_src_file() call assert_equal('src', &filetype) bwipe! call delete('srcfile.SRC') + unlet g:filetype_src filetype off endfunc