Mercurial > vim
changeset 28409:e11641c05602 v8.2.4729
patch 8.2.4729: HEEx and Surface templates do not need a separate filetype
Commit: https://github.com/vim/vim/commit/fa76a24109f3c3287e4ee17b6270bfd5310c12f3
Author: Aaron Tinio <aptinio@gmail.com>
Date: Sun Apr 10 12:13:56 2022 +0100
patch 8.2.4729: HEEx and Surface templates do not need a separate filetype
Problem: HEEx and Surface templates do not need a separate filetype.
Solution: Use Eelixir for the similar filetypes. (Aaron Tinio, closes https://github.com/vim/vim/issues/10124)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 10 Apr 2022 13:15:02 +0200 |
| parents | c5c69aef2a56 |
| children | f4ee0a7c6af2 |
| files | runtime/filetype.vim src/testdir/test_filetype.vim src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 11 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 +" Elixir, also used for HEEx and Surface au BufRead,BufNewFile mix.lock,*.exs setf elixir -au BufRead,BufNewFile *.eex,*.leex setf eelixir +au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface setf eelixir " Elvish au BufRead,BufNewFile *.elv setf elvish @@ -797,9 +797,6 @@ 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 @@ -1905,9 +1902,6 @@ 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.leex'], + \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'], \ 'elm': ['file.elm'], \ 'elmfilt': ['filter-rules'], \ 'elvish': ['file.elv'], @@ -237,7 +237,6 @@ 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'], @@ -517,7 +516,6 @@ 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'],